Skip to content

Commit

Permalink
fix: footer structure without action of button (#431)
Browse files Browse the repository at this point in the history
* fix: footer structure without action of button

* fix: remove bandeau erreur
  • Loading branch information
LAU-MG committed Jan 22, 2024
1 parent 282ad5e commit a4b425f
Show file tree
Hide file tree
Showing 14 changed files with 41 additions and 45 deletions.
2 changes: 1 addition & 1 deletion src/assets/fonts/remixicon/collection.remixicon
Original file line number Diff line number Diff line change
@@ -1 +1 @@
wifi-line,computer-line,printer-line,phone-line,map-pin-2-line,add-line,check-line,checkbox-blank-circle-line,calendar-check-line,mail-line,arrow-right-s-line,arrow-left-s-line,notification-3-line,mouse-line,group-line,wheelchair-line,parent-line,mail-line,user-3-line,tools-line,error-warning-line,service-line,checkbox-blank-circle-fill,equalizer-fill,account-pin-circle-fill,arrow-right-circle-fill,arrow-left-circle-fill,external-link-line,arrow-go-back-line,file-text-line,link,list-check,mail-send-line,skip-forward-line,map-pin-5-line,settings-4-line,calendar-todo-line,road-map-line,subtract-line,smartphone-line,user-line,user-star-line,slideshow-line,stethoscope-line,shopping-cart-line,settings-5-line,contacts-line,medal-line,image-2-line,pen-nib-line,map-pin-4-line,map-2-line,focus-3-line,sound-module-line,arrow-left-right-line,arrow-down-s-line,account-circle-fill,close-line,close-circle-fill,edit-line,information-line,close-circle-line,alert-line,compass-3-line,arrow-drop-right-fill,search-line,question-line,menu-line,map-pin-2-fill,pie-chart-2-fill,bank-fill,medal-2-line,community-line,timer-fill,arrow-down-line,smartphone-fill,mouse-fill,calendar-fill,vip-crown-fill,image-fill,medal-2-fill,parent-fill,palette-fill,stethoscope-fill,user-star-fill,wifi-fill,lifebuoy-fill,settings-5-fill,shopping-cart-fill,calendar-event-fill,arrow-right-line,arrow-left-line,user-fill,slideshow-2-fill,service-fill,group-fill,book-marked-line
wifi-line,computer-line,printer-line,phone-line,map-pin-2-line,add-line,check-line,checkbox-blank-circle-line,calendar-check-line,mail-line,arrow-right-s-line,arrow-left-s-line,notification-3-line,mouse-line,group-line,wheelchair-line,parent-line,mail-line,user-3-line,tools-line,error-warning-line,service-line,checkbox-blank-circle-fill,equalizer-fill,account-pin-circle-fill,arrow-right-circle-fill,arrow-left-circle-fill,external-link-line,arrow-go-back-line,file-text-line,link,list-check,mail-send-line,skip-forward-line,map-pin-5-line,settings-4-line,calendar-todo-line,road-map-line,subtract-line,smartphone-line,user-line,user-star-line,slideshow-line,stethoscope-line,shopping-cart-line,settings-5-line,contacts-line,medal-line,image-2-line,pen-nib-line,map-pin-4-line,map-2-line,focus-3-line,sound-module-line,arrow-left-right-line,arrow-down-s-line,account-circle-fill,close-line,close-circle-fill,edit-line,information-line,close-circle-line,alert-line,compass-3-line,arrow-drop-right-fill,search-line,question-line,menu-line,map-pin-2-fill,pie-chart-2-fill,bank-fill,medal-2-line,community-line,timer-fill,arrow-down-line,smartphone-fill,mouse-fill,calendar-fill,vip-crown-fill,image-fill,medal-2-fill,parent-fill,palette-fill,stethoscope-fill,user-star-fill,wifi-fill,lifebuoy-fill,settings-5-fill,shopping-cart-fill,calendar-event-fill,arrow-right-line,arrow-left-line,user-fill,slideshow-2-fill,service-fill,group-fill,star-line,book-marked-line
Binary file modified src/assets/fonts/remixicon/remixicon.eot
Binary file not shown.
4 changes: 3 additions & 1 deletion src/assets/fonts/remixicon/remixicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/fonts/remixicon/remixicon.symbol.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/fonts/remixicon/remixicon.ttf
Binary file not shown.
Binary file modified src/assets/fonts/remixicon/remixicon.woff
Binary file not shown.
Binary file modified src/assets/fonts/remixicon/remixicon.woff2
Binary file not shown.
2 changes: 0 additions & 2 deletions src/features/cartographie/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import {
PublicPrisEnChargeComponent,
ServicesComponent,
AccessibiliteComponent,
BandeauErreurComponent,
ErreurFormModalComponent,
ImpressionChoiceModalComponent,
SourceDonneesComponent,
Expand Down Expand Up @@ -67,7 +66,6 @@ export const components = [
ModifierOrientationComponent,
LabelModalComponent,
HubModalComponent,
BandeauErreurComponent,
ErreurFormModalComponent,
ImpressionChoiceModalComponent,
SourceDonneesComponent,
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export * from './aidants/aidants.component';
export * from './lieux-mediation-numerique-details.component';
export * from './lieux-mediation-numerique-details-print.component';
export * from './accessibilite/accessibilite.component';
export * from './bandeau-erreur/bandeau-erreur.component';
export * from './erreur-form-modal/erreur-form-modal.component';
export * from './impression-choice-modal/impression-choice-modal.component';
export * from './source-donnees/source-donnees.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,21 @@ <h2 class="h5 text-muted text-uppercase text-center">Une erreur sur les données
<small class="fst-italic text-muted">Dernière mise à jour {{ lieuMediationNumerique.date_maj | date : 'dd/MM/y' }}</small>
</div>
</div>
<div class="bg-primary p-2">
<app-bandeau-erreur
(openImpressionChoiceModal)="impressionChoiceModal.control.toggle($event)"
(closeDetails)="closeDetails.emit(lieuMediationNumerique)"></app-bandeau-erreur>
<div class="bg-white py-4">
<div class="d-flex ms-4 p-0">
<button
(click)="impressionChoiceModal.control.toggle($event); onPrintFromBandeau()"
class="btn btn-primary btn-sm my-auto">
<span role="img" class="ri-printer-line me-2" aria-hidden="true"></span>
Imprimer
</button>
</div>
</div>
<div class="bg-primary p-3">
<button class="btn text-white fw-normal" (click)="closeDetails.emit(lieuMediationNumerique)">
<span role="img" class="ri-arrow-left-s-line" aria-hidden="true"></span>
Revenir à la liste
</button>
</div>
</div>
<app-impression-choice-modal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
import { ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core';
import {
ChangeDetectionStrategy,
Component,
ElementRef,
EventEmitter,
Input,
Output,
ViewChild,
Optional
} from '@angular/core';
import { LabelNational } from '@gouvfr-anct/lieux-de-mediation-numerique';
import { LieuMediationNumeriqueDetailsPresentation } from '../../presenters';
import { OrientationSheetForm, SendLieuByEmail } from '../../models';
import { FilterPresentation } from '../../../core/presenters';
import { FormGroup } from '@angular/forms';
import { MatomoTracker } from 'ngx-matomo';

@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
Expand Down Expand Up @@ -38,7 +48,13 @@ export class LieuxMediationNumeriqueDetailsComponent {

@Output() public showLabelInvokingContext: EventEmitter<MouseEvent> = new EventEmitter<MouseEvent>();

public constructor(@Optional() private readonly _matomoTracker?: MatomoTracker) {}

onScrollToSource = (): void => {
this.sourceRef.nativeElement.scrollIntoView({ behavior: 'instant', block: 'start', inline: 'start' });
};

public onPrintFromBandeau(): void {
this._matomoTracker?.trackEvent('fiche détail', 'bandeau footer', `impression fiche`);
}
}
4 changes: 4 additions & 0 deletions src/scss/components/_icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -529,3 +529,7 @@ $font-family-icons-lower: string.to-lower-case($font-family-icons);
.ri-book-marked-line::before {
content: '\ead9';
}

.ri-star-line::before {
content: '\f18b';
}

0 comments on commit a4b425f

Please sign in to comment.