diff --git a/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.html b/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.html index d3469292ef676dff0f65d923ad7f7c27f2fdb915..cfb11872ef1f831c02c26d2e2c9902286b558179 100644 --- a/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.html +++ b/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.html @@ -1,6 +1,6 @@ <div class="orientationForm"> <div class="title"> - <h2>Quels est le besoin de la personne ?</h2> + <h2>Quel est le besoin de la personne ?</h2> <p>Un seul choix possible</p> </div> <div class="formGroup"> diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index 1796a6a309a71ba043675cbaf987e2f5ae59a16c..523e6611f942476bb61eb4e3d35c98e09ae4576f 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -1,113 +1,115 @@ <header class="hide-on-print"> - <div class="containerIconMenu"> - <app-svg-icon - [asButton]="true" - [ariaLabel]="'Ouvrir le menu'" - [folder]="'ico'" - [icon]="'menu'" - [iconClass]="'icon-32'" - (action)="toggleMenu()" - /> - </div> - <div - #clickableLogo - class="logo clickable" - aria-label="Retour accueil" - role="button" - tabindex="0" - (click)="goToHome()" - (keyup.enter)="goToHome()" - > - <img - *ngIf="displayLogo(); else customTitle" - class="logo-grand-lyon" - width="108" - height="37" - src="/assets/logos/resin.svg" - alt - /> - </div> - <div class="containerIconMenu profile"> - <app-svg-icon - [asButton]="true" - [ariaLabel]="isLoggedIn ? 'Ouvrir le menu Mon compte' : 'Se connecter'" - [folder]="'ico'" - [icon]="'profile'" - [iconClass]="'icon-32'" - (action)="clickProfileButton()" - /> - </div> - <div class="rightHeader"> - <div class="menuItems" role="menu"> - <a - routerLink="/actualites" - role="menuitem" - title="Actualités" - [routerLinkActive]="'active'" - i18n - [attr.aria-current]="isActive('/actualites')" - > - Actualités - </a> - <a - routerLink="/acteurs" - role="menuitem" - title="Cartographie" - [routerLinkActive]="'active'" - i18n - [attr.aria-current]="isActive('/acteurs')" - > - Cartographie - </a> - <a - routerLink="/orientation" - role="menuitem" - title="Orienter des bénéficiaires" - [routerLinkActive]="'active'" - i18n - [attr.aria-current]="isActive('/orientation')" - > - Orienter des bénéficiaires - </a> - <a - routerLink="/annuaire" - role="menuitem" - title="Annuaire" - [routerLinkActive]="'active'" - i18n - [attr.aria-current]="isActive('/annuaire')" - > - Annuaire - </a> - <a - *ngIf="isAdmin" - routerLink="/admin" - role="menuitem" - title="Administration" - [routerLinkActive]="'active'" - [attr.aria-current]="isActive('/admin')" - > - Administration - </a> + <nav aria-label="Site"> + <div class="containerIconMenu"> + <app-svg-icon + [asButton]="true" + [ariaLabel]="'Ouvrir le menu'" + [folder]="'ico'" + [icon]="'menu'" + [iconClass]="'icon-32'" + (action)="toggleMenu()" + /> </div> - <app-button - *ngIf="isLoggedIn" - class="connected" - ariaLabel="Ouvrir le menu Mon compte - {{ displayName }}" - [variant]="'primary'" - [label]="displayName" - [size]="'small'" - (action)="clickProfileButton()" - /> - <app-button - *ngIf="!isLoggedIn" - ariaLabel="Se connecter" - [variant]="'primaryBlack'" - [label]="'Se connecter'" - [size]="'small'" - (action)="clickProfileButton()" - /> - </div> + <div + #clickableLogo + class="logo clickable" + aria-label="Retour accueil" + role="button" + tabindex="0" + (click)="goToHome()" + (keyup.enter)="goToHome()" + > + <img + *ngIf="displayLogo(); else customTitle" + class="logo-grand-lyon" + width="108" + height="37" + src="/assets/logos/resin.svg" + alt + /> + </div> + <div class="containerIconMenu profile"> + <app-svg-icon + [asButton]="true" + [ariaLabel]="isLoggedIn ? 'Ouvrir le menu Mon compte' : 'Se connecter'" + [folder]="'ico'" + [icon]="'profile'" + [iconClass]="'icon-32'" + (action)="clickProfileButton()" + /> + </div> + <div class="rightHeader"> + <div class="menuItems" role="menu"> + <a + routerLink="/actualites" + role="menuitem" + title="Actualités" + [routerLinkActive]="'active'" + i18n + [attr.aria-current]="isActive('/actualites')" + > + Actualités + </a> + <a + routerLink="/acteurs" + role="menuitem" + title="Cartographie" + [routerLinkActive]="'active'" + i18n + [attr.aria-current]="isActive('/acteurs')" + > + Cartographie + </a> + <a + routerLink="/orientation" + role="menuitem" + title="Orienter des bénéficiaires" + [routerLinkActive]="'active'" + i18n + [attr.aria-current]="isActive('/orientation')" + > + Orienter des bénéficiaires + </a> + <a + routerLink="/annuaire" + role="menuitem" + title="Annuaire" + [routerLinkActive]="'active'" + i18n + [attr.aria-current]="isActive('/annuaire')" + > + Annuaire + </a> + <a + *ngIf="isAdmin" + routerLink="/admin" + role="menuitem" + title="Administration" + [routerLinkActive]="'active'" + [attr.aria-current]="isActive('/admin')" + > + Administration + </a> + </div> + <app-button + *ngIf="isLoggedIn" + class="connected" + ariaLabel="Ouvrir le menu Mon compte - {{ displayName }}" + [variant]="'primary'" + [label]="displayName" + [size]="'small'" + (action)="clickProfileButton()" + /> + <app-button + *ngIf="!isLoggedIn" + ariaLabel="Se connecter" + [variant]="'primaryBlack'" + [label]="'Se connecter'" + [size]="'small'" + (action)="clickProfileButton()" + /> + </div> + </nav> </header> <div *ngIf="showMenu" role="menu" class="mobileMenu" [@slideInOut]> diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss index 3c99a406f3e0d6c392b1676e0244816e42bce04b..927939a3412393fc878bcdbc6afbc4f2b540b42d 100644 --- a/src/app/header/header.component.scss +++ b/src/app/header/header.component.scss @@ -4,7 +4,7 @@ @import 'breakpoint'; @import 'z-index'; -header { +header > nav { height: $header-height; display: flex; align-items: center; diff --git a/src/app/shared/components/modal/modal.component.html b/src/app/shared/components/modal/modal.component.html index 9c8d15368229e20a5a4f55e966931442fddd7c80..8b043aa0d48109d410dd04819a52aaaba0685b57 100644 --- a/src/app/shared/components/modal/modal.component.html +++ b/src/app/shared/components/modal/modal.component.html @@ -11,7 +11,7 @@ (action)="closeModal(false)" /> </div> - <p><ng-content /></p> + <div class="content"><ng-content /></div> <div class="footerModal"> <app-button *ngIf="!singleButton" diff --git a/src/app/shared/components/modal/modal.component.scss b/src/app/shared/components/modal/modal.component.scss index b0cf2d3575b54bb66f84037672a98a91ca383965..e06ba6ff7480aac0e24c1b3752dad4e55c79dfc4 100644 --- a/src/app/shared/components/modal/modal.component.scss +++ b/src/app/shared/components/modal/modal.component.scss @@ -42,7 +42,7 @@ text-align: center; } } - p { + .content { text-align: center; margin: 0; } diff --git a/src/app/shared/components/nav-bar/nav-bar.component.html b/src/app/shared/components/nav-bar/nav-bar.component.html index 0e708821dccc86f69d1700ad77945a92df83ff33..f7e954f427293091c12b9807906126b09c9b35df 100644 --- a/src/app/shared/components/nav-bar/nav-bar.component.html +++ b/src/app/shared/components/nav-bar/nav-bar.component.html @@ -1,4 +1,4 @@ -<nav> +<nav aria-label="Page"> <div role="tablist" class="navigation" [attr.aria-label]="ariaLabel" [ngClass]="{ expand: shouldExpand }"> <div *ngFor="let tab of tabs; let i = index"