From 3bdb11bb3375c8592e4170c3e4cea98778e7bfbf Mon Sep 17 00:00:00 2001 From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com> Date: Thu, 21 Jan 2021 18:36:17 +0100 Subject: [PATCH] feat(structure-details): add description and lockdown activity --- .../components/search/search.component.html | 4 +-- .../structure-details.component.html | 30 +++++++++++-------- .../structure-details.component.scss | 4 +++ src/styles.scss | 2 ++ 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/app/structure-list/components/search/search.component.html b/src/app/structure-list/components/search/search.component.html index b12adaecf..fe3bc0e48 100644 --- a/src/app/structure-list/components/search/search.component.html +++ b/src/app/structure-list/components/search/search.component.html @@ -88,7 +88,7 @@ [text]="'Filtres'" (action)="openModal(TypeModal.accompaniment)" ></app-button> - <a (click)="openConfirmationModal()" class="primary" tabindex="0">Ajouter une structure</a> + <a (click)="openConfirmationModal()" class="primary right" tabindex="0">Ajouter une structure</a> </div> </div> <div class="footerSearchSection isntPhoneContent" fxLayout="row" fxLayoutAlign="space-between center"> @@ -106,7 +106,7 @@ </label> </div> </div> - <a (click)="openConfirmationModal()" class="primary" tabindex="0">Ajouter une structure</a> + <a (click)="openConfirmationModal()" class="primary right" tabindex="0">Ajouter une structure</a> </div> <app-modal [openned]="isConfirmationModalOpen" diff --git a/src/app/structure-list/components/structure-details/structure-details.component.html b/src/app/structure-list/components/structure-details/structure-details.component.html index d9dcb9b6d..7cce092a5 100644 --- a/src/app/structure-list/components/structure-details/structure-details.component.html +++ b/src/app/structure-list/components/structure-details/structure-details.component.html @@ -8,19 +8,6 @@ ></app-structureForm> <div class="structrue-details-container" *ngIf="structure && !isLoading"> <!-- Header info --> - <div fxLayout="row" fxLayoutAlign="center center" *ngIf="!isClaimed"> - <a (click)="claimStructure()" class="primary" tabindex="0">Revendiquer</a> - </div> - <div fxLayout="row" fxLayoutAlign="center center"> - <a - *ngIf="profileService.isLinkedToStructure(structure._id) || profileService.isAdmin()" - (click)="editStructure()" - class="primary" - tabindex="0" - > - Modifier la structure - </a> - </div> <div fxLayout="row" fxLayoutAlign="end center"> <div (click)="close()" class="ico-close-details"></div> </div> @@ -95,6 +82,23 @@ </div> </div> </div> + <div fxLayout="row" fxLayoutAlign="center center"> + <a *ngIf="!isClaimed" (click)="claimStructure()" class="primary" tabindex="0">Revendiquer cette structure</a> + <a + *ngIf="profileService.isLinkedToStructure(structure._id) || profileService.isAdmin()" + (click)="editStructure()" + class="primary" + tabindex="0" + > + Modifier cette structure + </a> + </div> + <div> + {{ structure.description }} + </div> + <div class="info"> + {{ structure.lockdownActivity }} + </div> </div> </div> <!-- Démarches en ligne --> diff --git a/src/app/structure-list/components/structure-details/structure-details.component.scss b/src/app/structure-list/components/structure-details/structure-details.component.scss index 9cfee3599..1717dc347 100644 --- a/src/app/structure-list/components/structure-details/structure-details.component.scss +++ b/src/app/structure-list/components/structure-details/structure-details.component.scss @@ -5,6 +5,10 @@ @import '../../../../assets/scss/layout'; @import '../../../../assets/scss/breakpoint'; +a { + padding: unset; +} + .structrue-details-container { border-right: solid 1px $grey-4; background-color: $white; diff --git a/src/styles.scss b/src/styles.scss index ccd176182..a4441224a 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -39,6 +39,8 @@ a { &.primary { @include hyperlink; width: 100%; + } + &.right { text-align: right; } } -- GitLab