Skip to content

Commit

Permalink
Merge pull request #1240 from StartupsPoleEmploi/accessibilite
Browse files Browse the repository at this point in the history
Accessibilite
  • Loading branch information
JulienPerrin authored Jul 22, 2024
2 parents c1835a3 + 4b41804 commit 0f626be
Show file tree
Hide file tree
Showing 31 changed files with 167 additions and 143 deletions.
2 changes: 1 addition & 1 deletion backend/src/core/components/emails/common/contact.mjml.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<mj-button
href="mailto:<%= utils.getRegionEmail(region) %>"
background-color="#FDF2E7"
color="#F28017"
color="#BC4E02"
font-size="16px"
font-weight="bold"
text-transform="uppercase">
Expand Down
2 changes: 1 addition & 1 deletion backend/src/core/components/emails/common/head.mjml.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}

.text-highlighted div {
color: #F28017 !important;
color: #BC4E02 !important;
font-weight: bold !important;
opacity: 1 !important;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<mj-button
href="<%= link %>"
background-color="#FDF2E7"
color="#F28017"
color="#BC4E02"
font-size="16px"
font-weight="bold"
text-transform="uppercase">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<mj-button
href="mailto:<%= utils.getRegionEmail(region) %>"
background-color="#FDF2E7"
color="#F28017"
color="#BC4E02"
font-size="16px"
font-weight="bold"
text-transform="uppercase">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<mj-button
href="<%= link %>"
background-color="#FDF2E7"
color="#F28017"
color="#BC4E02"
font-size="16px"
font-weight="bold"
text-transform="uppercase">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ export default class AvisStats extends React.Component {
return (
<div className="Stats">
<div className="main with-details d-flex flex-column">
<h2 className="title" >
<h3 className="title" >
<span aria-hidden="true" className="far fa-comment-alt a-icon"></span>
Avis
<span className="asterisque" style={{"marginLeft":"10px"}}>
{debut ? " (depuis le: "+new Date(debut).toLocaleDateString() : '(depuis le: 01/01/2018 -' /*getFullYear*/}
{fin ? " jusqu'au: "+new Date(fin).toLocaleDateString()+")" : "jusqu'à: Aujourd'hui)"}
</span>
</h2>
</h3>
<div className="d-flex justify-content-between flex-wrap">
<div className="stats" >
<div className="name">Total avis déposés</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default class FormationStats extends React.Component {
return (
<div className="Stats">
<div className="main with-details d-flex flex-column">
<h2 className="title" >
<h3 className="title" >
<div>
<span aria-hidden="true" className="fas fa-graduation-cap a-icon"></span>
Formations
Expand All @@ -31,7 +31,7 @@ export default class FormationStats extends React.Component {
</span>
</div>
<div className="description">(source Intercarif)</div>
</h2>
</h3>
<div className="d-flex justify-content-between flex-wrap">
<div className="stats" >
<div className="name">Formations en ligne</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ export default class HistoryLines extends React.Component {
let content = this.nextElementSibling;
if (content.style.display === "block") {
content.style.display = "none";
this.setAttribute("aria-expanded", false);
} else {
content.style.display = "block";
this.setAttribute("aria-expanded", true);
}
});
}
Expand Down Expand Up @@ -130,7 +132,7 @@ export default class HistoryLines extends React.Component {

return Object.keys(years).map(year => (
<div key={year} className="sr-only">
<button type="button" className="collapsible">Ouvrir les données nationales de {year}</button>
<button type="button" className="collapsible" aria-expanded="false">Ouvrir les données nationales de {year}</button>
<div style={{ display: "none"}}>
{years[year].national.map((item, index) => (
<div key={index}>
Expand All @@ -143,7 +145,7 @@ export default class HistoryLines extends React.Component {
</div>
{lines.length > 1 && (
<>
<button type="button" className="collapsible">Ouvrir les données régionales de {year}</button>
<button type="button" className="collapsible" aria-expanded="false">Ouvrir les données régionales de {year}</button>
<div style={{ display: "none"}}>
{years[year].regional.map((item, index) => (
<div key={index}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ export default class ModerationStats extends React.Component {
return (
<div className="Stats">
<div className="main with-details d-flex flex-column">
<h2 className="title" >
<h3 className="title" >
<span aria-hidden="true" className="far fa-comment-alt a-icon"></span>
Modération
<span className="asterisque" style={{"marginLeft":"10px"}}>
{'(depuis le: 01/01/2018 -'}
{fin ? " jusqu'au: "+new Date(fin).toLocaleDateString()+")" : "jusqu'à: Aujourd'hui)"}
</span>
</h2>
</h3>
<div className="d-flex justify-content-between flex-wrap">
<div className="stats" >
<div className="name">Avis à modérer</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ export default class OrganismeStats extends React.Component {
return (
<div className="Stats">
<div className="main with-details d-flex flex-column">
<h2 className="title" >
<h3 className="title" >
<span aria-hidden="true" className="far fa-comment-alt a-icon"></span>
Organismes
<span className="asterisque" style={{"marginLeft":"10px"}}>
{'(depuis le: 01/01/2018 -'}
{fin ? " jusqu'au: "+new Date(fin).toLocaleDateString()+")" : "jusqu'à: Aujourd'hui)"}
</span>
</h2>
</h3>
<div className="d-flex justify-content-between flex-wrap">
<div className="stats" >
<div className="name">Organismes actifs</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ export default class StagiairesStats extends React.Component {
<div className="Stats">
<div className="main d-flex justify-content-center justify-content-lg-between">
<div className="d-flex flex-column">
<h2 className="title" >
<h3 className="title" >
<span aria-hidden="true" className="far fa-user a-icon"></span>
Stagiaires
<span className="asterisque" style={{"marginLeft":"10px"}}>
{debut ? " (depuis le: "+new Date(debut).toLocaleDateString() : '(depuis le: 01/01/2018 -' /*getFullYear*/}
{fin ? " jusqu'au: "+new Date(fin).toLocaleDateString()+")" : "jusqu'à: aujourd'hui)"}
</span>
</h2>
</h3>
<div className="d-flex justify-content-around flex-wrap">
<div className="stats" >
<div className="name">Nombre de stagiaires contactés</div>
Expand Down
27 changes: 13 additions & 14 deletions ui/src/backoffice/components/anonymous/components/StatsForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,20 @@ export default class StatsForm extends React.Component {
<Form className="a-width-50">
<div className="d-flex justify-content-between align-items-end">
<div className="flex-grow-1 mr-2">
<label for="choix-region" style={{fontSize: "1.125rem", fontWeight: 700}}>Filtrer par région</label>
<Select
id="choix-region"
placeholder={'Toutes les régions'}
trackingId="Regions"
loading={store.loading}
value={codeRegion}
options={store.regions}
optionKey="codeRegion"
optionLabel="nom"
onChange={(option) => this.setState({ codeRegion: option ? option.codeRegion : null })}
/>
<fieldset>
<label style={{fontSize: "1.125rem", fontWeight: 700}}>Filtrer par région</label>
<Select
placeholder={'Toutes les régions'}
trackingId="Regions"
loading={store.loading}
value={codeRegion}
options={store.regions}
optionKey="codeRegion"
optionLabel="nom"
onChange={(option) => this.setState({ codeRegion: option ? option.codeRegion : null })}
/>
</fieldset>
<fieldset>
<label>Période</label>
<legend>Période</legend>
<Periode
periode={{ debut: this.state.debut, fin: this.state.fin }}
min={moment('2019-08-01').toDate()}
Expand Down
2 changes: 1 addition & 1 deletion ui/src/backoffice/components/common/avis/Avis.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export default class Avis extends React.Component {

return (
<div className="Avis">
<h2 className="sr-only">Commentaire {index}</h2>
<h3 className="sr-only">Commentaire {index}</h3>
{message &&
<LocalMessage message={message} onClose={async () => await this.state.propagateChanges()} />
}
Expand Down
10 changes: 7 additions & 3 deletions ui/src/backoffice/components/common/header/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@ const Header = ({ items, defaultPath, onLogout }) => {
<div className="row">
<div className="col-sm-12">
<div className="d-flex flex-column flex-md-row justify-content-between align-items-center">
<NavLink to={defaultPath}>
<img src={logo} ref={logoRef} className="logo" alt="Anotéa" tabIndex="-1" />
</NavLink>
{account.profile === 'anonymous' ?
<a href="https://anotea.francetravail.fr">
<img src={logo} ref={logoRef} className="logo" alt="Anotéa accueil" tabIndex="-1" />
</a> : <NavLink to={defaultPath}>
<img src={logo} ref={logoRef} className="logo" alt="Anotéa accueil backoffice" tabIndex="-1" />
</NavLink>
}

{items}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

.Backoffice .CenteredForm {

legend {
font-size: 1rem;
font-weight: $font-weight-bold;
}

label {
font-size: 1rem;
font-weight: $font-weight-bold;
Expand All @@ -23,6 +28,7 @@

.contactez-nous {
color: $color-blue;
text-decoration: underline;
}
}
}
5 changes: 5 additions & 0 deletions ui/src/backoffice/components/common/page/form/Form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

@include box();

legend {
font-size: 1.125rem;
font-weight: $font-weight-bold;
}

label {
font-size: 1.125rem;
font-weight: $font-weight-bold;
Expand Down
5 changes: 3 additions & 2 deletions ui/src/backoffice/components/common/page/form/Periode.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,22 @@ export default class Periode extends React.Component {
return (
<div className="Periode d-flex justify-content-around align-items-center">
<i className="fas fa-map-marker-alt pl-1"></i>
<span className="sr-only">de</span>
<Date
value={periode.debut}
min={min}
max={max}
depth={depth || 'days'}
onChange={date => this.onDateChange('debut', date)}
label="date de début"
/>
<span className="au">à</span>
<span className="au" aria-hidden="true">à</span>
<Date
value={periode.fin}
min={min}
max={max}
depth={depth || 'days'}
onChange={date => this.onDateChange('fin', date)}
label="date de fin"
/>
<span className="clear" onClick={() => this.onReset()}>
<svg
Expand Down
5 changes: 3 additions & 2 deletions ui/src/backoffice/components/common/page/form/date/Date.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export default class Date extends React.Component {
min: PropTypes.object,
max: PropTypes.object,
depth: PropTypes.string,
label: PropTypes.string,
};

static defaultProps = {
Expand Down Expand Up @@ -70,11 +71,11 @@ export default class Date extends React.Component {
}

render() {
let { pattern } = this.props;
let { pattern, label } = this.props;

return (
<div className={'Date'}>
<input ref={this.reference} placeholder={"jj/mm/aaaa"} />
<input ref={this.reference} placeholder={"jj/mm/aaaa"} aria-label={label}/>
</div>
);
}
Expand Down
1 change: 1 addition & 0 deletions ui/src/backoffice/components/common/page/panel/Panel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const Panel = props => {
{props.loading ?
<Loader centered={true} /> :
<div className="container">
{props.pagination ? <h2 className="sr-only">Liste des avis</h2> : ''}
<div className="summary-holder">
{props.summary}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const Filters = ({ children }) => {

return (
<div className="Filters d-flex justify-content-center">
<nav className="nav justify-content-center">
<nav className="nav justify-content-center" aria-label="Type d'avis">
{children}
</nav>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default class Pagination extends React.Component {
<div className="offset-4 col-4 d-flex justify-content-center">
<ul className="pagination">
<li className={`page-item ${isFirstPage ? 'active' : ''}`}>
<a href="/#" className="page-link" onClick={e => this.onClick(e, 1)} aria-label="page 1">1</a>
<a href="/#" className="page-link" onClick={e => this.onClick(e, 1)} aria-label="page 1" title="page 1">1</a>
</li>
{
(totalPages > 5 && currentPage > 3) &&
Expand All @@ -54,6 +54,7 @@ export default class Pagination extends React.Component {
href="/#"
className="page-link"
onClick={e => this.onClick(e, previousPage)}
title={`page ${previousPage}`}
aria-label={`page ${previousPage}`}>{previousPage}
</a>
</li>
Expand All @@ -65,6 +66,7 @@ export default class Pagination extends React.Component {
href="/#"
className="page-link"
onClick={e => this.onClick(e, currentPage)}
title={`page ${currentPage}`}
aria-label={`page ${currentPage}`}>{currentPage}
</a>
</li>
Expand All @@ -73,7 +75,7 @@ export default class Pagination extends React.Component {
(nextPage < lastPage) &&
<li className="page-item">
<a href="/#" className="page-link" onClick={e => this.onClick(e, nextPage)}
aria-label={`page ${nextPage}`}>{nextPage}</a>
title={`page ${nextPage}`} aria-label={`page ${nextPage}`}>{nextPage}</a>
</li>
}
{
Expand All @@ -84,7 +86,7 @@ export default class Pagination extends React.Component {
}
<li className={`page-item ${isLastPage && 'active'}`}>
<a href="/#" className="page-link" onClick={e => this.onClick(e, lastPage)}
aria-label={`page ${lastPage}`}>{lastPage}</a>
title={`page ${lastPage}`} aria-label={`page ${lastPage}`}>{lastPage}</a>
</li>
</ul>
</div>
Expand Down
9 changes: 5 additions & 4 deletions ui/src/backoffice/components/common/page/tabs/Tab.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ const Tab = ({ label, isActive, onClick, isDisabled = () => false }) => {
return (
<li className={`Tab nav-item ${isActive() ? 'active' : ''} ${isDisabled() ? 'disabled' : ''}`}>
<a href="/#" className={`nav-link ${isActive() ? 'active' : ''}`} onClick={e => {
e.preventDefault();
trackClick(label);
onClick(e);
}}>
e.preventDefault();
trackClick(label);
onClick(e);
}}
aria-current={isActive() ? 'true' : 'false'}>
<span>{label}</span>
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/backoffice/components/common/page/tabs/Tabs.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export { default as Tab } from './Tab';
export const Tabs = ({ children }) => {
return (
<div className="Tabs d-flex justify-content-center">
<nav className="nav justify-content-center">
<nav className="nav justify-content-center" aria-label="secondaire">
{children}
</nav>
</div>
Expand Down
Loading

0 comments on commit 0f626be

Please sign in to comment.