wip : ordre des blocs / harmonisation avec la fiche structure

src/app/profile/structure-edition-summary/structure-edition-summary.component.html

@@ -18,41 +18,6 @@
       </p>
     </div>
 
-    <section class="nameAndAddress">
-      <div class="sectionHeader">
-        <h3>Nom et adresse</h3>
-        <app-button
-          class="hide-on-mobile"
-          [variant]="'secondary'"
-          [label]="'Modifier'"
-          [iconName]="'edit'"
-          [size]="'small'"
-          (action)="goToEdit(structureFormStep.structureNameAndAddress)"
-        />
-        <app-icon-button
-          ariaLabel="Modifier le nom et l'adresse"
-          class="hide-on-desktop"
-          [variant]="'secondary'"
-          [iconName]="'edit'"
-          (action)="goToEdit(structureFormStep.structureNameAndAddress)"
-        />
-      </div>
-      <div class="content-list">
-        <div class="inline">
-          <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'structureName'" />
-          <p>
-            {{ structure.structureName }}
-          </p>
-        </div>
-        <div class="inline">
-          <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'address'" />
-          <p>
-            {{ formatAddress() }}
-          </p>
-        </div>
-      </div>
-    </section>
-
     <section class="structureType" [ngClass]="{ warningBorder: !isFieldValid('structureType') }">
       <div class="sectionHeader">
         <div>
@@ -84,27 +49,39 @@
       </div>
     </section>
 
-    <section class="description">
+    <section class="nameAndAddress">
       <div class="sectionHeader">
-        <h3>Description</h3>
+        <h3>Nom et adresse</h3>
         <app-button
           class="hide-on-mobile"
           [variant]="'secondary'"
           [label]="'Modifier'"
           [iconName]="'edit'"
           [size]="'small'"
-          (action)="goToEdit(structureFormStep.structureDescription)"
+          (action)="goToEdit(structureFormStep.structureNameAndAddress)"
         />
         <app-icon-button
-          ariaLabel="Modifier la description"
+          ariaLabel="Modifier le nom et l'adresse"
           class="hide-on-desktop"
           [variant]="'secondary'"
           [iconName]="'edit'"
-          (action)="goToEdit(structureFormStep.structureDescription)"
+          (action)="goToEdit(structureFormStep.structureNameAndAddress)"
         />
       </div>
-      <app-no-information *ngIf="!structure.description" />
-      <p *ngIf="structure.description">{{ structure.description }}</p>
+      <div class="content-list">
+        <div class="inline">
+          <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'structureName'" />
+          <p>
+            {{ structure.structureName }}
+          </p>
+        </div>
+        <div class="inline">
+          <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'address'" />
+          <p>
+            {{ formatAddress() }}
+          </p>
+        </div>
+      </div>
     </section>
 
     <section class="phoneAndMail" [ngClass]="{ warningBorder: requiredPhoneOrMailError() }">
@@ -231,6 +208,29 @@
       </div>
     </section>
 
+    <section class="description">
+      <div class="sectionHeader">
+        <h3>Description</h3>
+        <app-button
+          class="hide-on-mobile"
+          [variant]="'secondary'"
+          [label]="'Modifier'"
+          [iconName]="'edit'"
+          [size]="'small'"
+          (action)="goToEdit(structureFormStep.structureDescription)"
+        />
+        <app-icon-button
+          ariaLabel="Modifier la description"
+          class="hide-on-desktop"
+          [variant]="'secondary'"
+          [iconName]="'edit'"
+          (action)="goToEdit(structureFormStep.structureDescription)"
+        />
+      </div>
+      <app-no-information *ngIf="!structure.description" />
+      <p *ngIf="structure.description">{{ structure.description }}</p>
+    </section>
+
     <section class="hours">
       <div class="sectionHeader">
         <h3>Horaires</h3>
@@ -264,7 +264,6 @@
       <div class="sectionHeader">
         <h3>Offres de service</h3>
       </div>
-
       <div *ngFor="let offerHolder of offerHolders">
         <section class="innerSection">
           <app-collapse>
@@ -366,7 +365,7 @@
 
               <section class="learning" id="learning">
                 <div class="sectionHeader">
-                  <h4>Accompagnements numériques</h4>
+                  <h4>Accompagnements aux usages numériques</h4>
                   <app-button
                     class="hide-on-mobile"
                     [variant]="'secondary'"
@@ -450,30 +449,6 @@
       </div>
     </section>
 
-    <section class="wifi">
-      <div class="sectionHeader">
-        <h3>Wifi</h3>
-        <app-button
-          class="hide-on-mobile"
-          [variant]="'secondary'"
-          [label]="'Modifier'"
-          [iconName]="'edit'"
-          [size]="'small'"
-          (action)="goToEdit(structureFormStep.structureWifi)"
-        />
-        <app-icon-button
-          ariaLabel="Modifier l'accès au wifi"
-          class="hide-on-desktop"
-          [variant]="'secondary'"
-          [iconName]="'edit'"
-          (action)="goToEdit(structureFormStep.structureWifi)"
-        />
-      </div>
-      <p>
-        {{ hasWifi(structure.categories.selfServiceMaterial) ? 'Oui' : 'Non' }}
-      </p>
-    </section>
-
     <section class="equipements">
       <div class="sectionHeader">
         <h3>Matériel en accès libre</h3>
@@ -515,9 +490,33 @@
       </div>
     </section>
 
+    <section class="wifi">
+      <div class="sectionHeader">
+        <h3>Wifi</h3>
+        <app-button
+          class="hide-on-mobile"
+          [variant]="'secondary'"
+          [label]="'Modifier'"
+          [iconName]="'edit'"
+          [size]="'small'"
+          (action)="goToEdit(structureFormStep.structureWifi)"
+        />
+        <app-icon-button
+          ariaLabel="Modifier l'accès au wifi"
+          class="hide-on-desktop"
+          [variant]="'secondary'"
+          [iconName]="'edit'"
+          (action)="goToEdit(structureFormStep.structureWifi)"
+        />
+      </div>
+      <p>
+        {{ hasWifi(structure.categories.selfServiceMaterial) ? 'Oui' : 'Non' }}
+      </p>
+    </section>
+
     <section class="solidarityMaterial">
       <div class="sectionHeader">
-        <h3>Achat de matériel à tarif solidaire</h3>
+        <h3>Vente de matériel à tarif solidaire</h3>
         <app-button
           class="hide-on-mobile"
           [variant]="'secondary'"
@@ -617,7 +616,7 @@
 
     <section class="publics">
       <div class="sectionHeader">
-        <h3>Public spécifique admis</h3>
+        <h3>Âge</h3>
         <app-button
           class="hide-on-mobile"
           [variant]="'secondary'"
@@ -627,7 +626,7 @@
           (action)="goToEdit(structureFormStep.structurePublicTargetOptional)"
         />
         <app-icon-button
-          ariaLabel="Modifier les publics spécifiques admis"
+          ariaLabel="Modifier les publics spécifiques admis (âge)"
           class="hide-on-desktop"
           [variant]="'secondary'"
           [iconName]="'edit'"
@@ -672,34 +671,6 @@
       </div>
     </section>
 
-    <section class="PMR" [ngClass]="{ warningBorder: structure.pmrAccess === null }">
-      <div class="sectionHeader">
-        <div>
-          <h3>Accessibilité pour les personnes à mobilité réduite</h3>
-          <app-missing-information *ngIf="structure.pmrAccess === null" />
-        </div>
-        <app-button
-          class="hide-on-mobile"
-          [variant]="'secondary'"
-          [label]="'Modifier'"
-          [iconName]="'edit'"
-          [size]="'small'"
-          (action)="goToEdit(structureFormStep.structurePmr)"
-        />
-        <app-icon-button
-          ariaLabel="Modifier l'accessibilité pour les personnes à mobilité réduite"
-          class="hide-on-desktop"
-          [variant]="'secondary'"
-          [iconName]="'edit'"
-          (action)="goToEdit(structureFormStep.structurePmr)"
-        />
-      </div>
-      <app-no-information *ngIf="structure.pmrAccess === null" />
-      <p *ngIf="structure.pmrAccess !== null">
-        {{ structure.pmrAccess ? 'Oui' : 'Non' }}
-      </p>
-    </section>
-
     <section *ngIf="this.members?.length !== 0" class="members">
       <div class="sectionHeader">
         <h3>Membres</h3>
@@ -754,6 +725,34 @@
       </div>
     </section>
 
+    <section class="PMR" [ngClass]="{ warningBorder: structure.pmrAccess === null }">
+      <div class="sectionHeader">
+        <div>
+          <h3>Accessibilité pour les personnes à mobilité réduite</h3>
+          <app-missing-information *ngIf="structure.pmrAccess === null" />
+        </div>
+        <app-button
+          class="hide-on-mobile"
+          [variant]="'secondary'"
+          [label]="'Modifier'"
+          [iconName]="'edit'"
+          [size]="'small'"
+          (action)="goToEdit(structureFormStep.structurePmr)"
+        />
+        <app-icon-button
+          ariaLabel="Modifier l'accessibilité pour les personnes à mobilité réduite"
+          class="hide-on-desktop"
+          [variant]="'secondary'"
+          [iconName]="'edit'"
+          (action)="goToEdit(structureFormStep.structurePmr)"
+        />
+      </div>
+      <app-no-information *ngIf="structure.pmrAccess === null" />
+      <p *ngIf="structure.pmrAccess !== null">
+        {{ structure.pmrAccess ? 'Oui' : 'Non' }}
+      </p>
+    </section>
+
     <section class="dataShare">
       <div class="sectionHeader">
         <h3>Partage de données sur data.grandlyon.com</h3>