From 4cd2d78e07a288c37ab08ab850abf68588b8adae Mon Sep 17 00:00:00 2001
From: bach <bachir@figureslibres.io>
Date: Sat, 15 Jul 2023 22:11:30 +0200
Subject: [PATCH] marge en haut des contenus #2229

---
 src/assets/main.scss                      | 10 ++--
 src/components/contents/TerrainDeVie.vue  | 11 ++---
 src/components/layout/CartoucheLayout.vue | 59 ++++++++++++-----------
 3 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/src/assets/main.scss b/src/assets/main.scss
index acefe75..1f53c1a 100644
--- a/src/assets/main.scss
+++ b/src/assets/main.scss
@@ -142,11 +142,11 @@ body{
         // height: 8rem;
         flex-direction: column;
         justify-content: flex-end;
-        div.pre-header{
-          min-height: 10em;
-          display: flex;
-          flex-direction: column;
-          justify-content: flex-end;
+        div.entite{
+          // min-height: 10em;
+          // display: flex;
+          // flex-direction: column;
+          // justify-content: flex-end;
           label, h3{
             // height: 70px;
             box-sizing: border-box;
diff --git a/src/components/contents/TerrainDeVie.vue b/src/components/contents/TerrainDeVie.vue
index 7c9c999..027cb98 100644
--- a/src/components/contents/TerrainDeVie.vue
+++ b/src/components/contents/TerrainDeVie.vue
@@ -93,15 +93,12 @@ export default {
 <template>
   <CartoucheLayout>
     <template v-slot:header>
-      <div class="pre-header">
-        <!-- concernement -->
-        <label v-if="display_concernement">{{ ct_concernement.title.description }}</label>
-        <!-- entite -->
+      <div class="entite">
+        <!-- TODO update entite with revisions -->
+        <span v-if="entite && opened_concernement.entites_byid[eid].menacemaintien < 0" class="menacemaintient">est menacé par</span>
+        <span v-if="entite && opened_concernement.entites_byid[eid].menacemaintien > 0" class="menacemaintient">est maintienu par</span>
         <h3 v-if="entite">{{ entite.title }}</h3>
-        <span v-if="entite && opened_concernement.entites_byid[eid].menacemaintien < 0" class="menacemaintient">menace</span>
-        <span v-if="entite && opened_concernement.entites_byid[eid].menacemaintien > 0" class="menacemaintient">maintient</span>
       </div>
-      
     </template>
     
     <template v-slot:main>
diff --git a/src/components/layout/CartoucheLayout.vue b/src/components/layout/CartoucheLayout.vue
index 470d752..7795ec4 100644
--- a/src/components/layout/CartoucheLayout.vue
+++ b/src/components/layout/CartoucheLayout.vue
@@ -14,7 +14,7 @@ export default {
     }
   },
   computed: {
-    ...mapState(ConcernementsStore,['opened_concernement']),
+    ...mapState(ConcernementsStore,['opened_concernement', 'ct_concernement']),
   },
   methods: {
     ...mapActions(ConcernementsStore,['setMapMode'])
@@ -27,36 +27,37 @@ export default {
 
 <template>
   <header>
-    <slot name="header"></slot>
     <div class="concernement-cartouche-icons">
-        <h2>{{ opened_concernement.title }}</h2>
-        <nav class="icons">
-          <ul>
-            <li v-if="opened_concernement.has_recit" >
-              <svg-icon type="mdi" :path="headphones_path"></svg-icon>
-            </li>
-            <li>
-              <a href="#terraindevie" @click="setMapMode('terraindevie')"><span class="icon terraindevie"></span></a>
-            </li>
-            <li v-if="opened_concernement.has_puissancedagir" >
-              <a href="#puissanceagir" @click="setMapMode('puissancedagir')"><span class="icon puissancedagir"></span></a>
-            </li>
-            <li v-if="opened_concernement.has_proximite" >
-              <a href="#proximite" @click="setMapMode('proximite')"><span class="icon proximite"></span></a>
-            </li>
-            <li v-if="opened_concernement.has_superposition" >
-              <a href="#superposition" @click="setMapMode('superposition')"><span class="icon superposition"></span></a>
-            </li>
-            <li v-if="opened_concernement.has_agissantes" >
-              <a href="#action" @click="setMapMode('action')"><span class="icon action"></span></a>
-            </li>
-            <li v-if="opened_concernement.has_doleance" >
-              <a href="#doleancer" @click="setMapMode('doleancer')"><span class="icon doleancer"></span></a>
-            </li>
-          </ul>
-        </nav>
+      <label>{{ ct_concernement.title.description }}</label>
+      <h2>{{ opened_concernement.title }}</h2>
+      <nav class="icons">
+        <ul>
+          <li v-if="opened_concernement.has_recit" >
+            <svg-icon type="mdi" :path="headphones_path"></svg-icon>
+          </li>
+          <li>
+            <a href="#terraindevie" @click="setMapMode('terraindevie')"><span class="icon terraindevie"></span></a>
+          </li>
+          <li v-if="opened_concernement.has_puissancedagir" >
+            <a href="#puissanceagir" @click="setMapMode('puissancedagir')"><span class="icon puissancedagir"></span></a>
+          </li>
+          <li v-if="opened_concernement.has_proximite" >
+            <a href="#proximite" @click="setMapMode('proximite')"><span class="icon proximite"></span></a>
+          </li>
+          <li v-if="opened_concernement.has_superposition" >
+            <a href="#superposition" @click="setMapMode('superposition')"><span class="icon superposition"></span></a>
+          </li>
+          <li v-if="opened_concernement.has_agissantes" >
+            <a href="#action" @click="setMapMode('action')"><span class="icon action"></span></a>
+          </li>
+          <li v-if="opened_concernement.has_doleance" >
+            <a href="#doleancer" @click="setMapMode('doleancer')"><span class="icon doleancer"></span></a>
+          </li>
+        </ul>
+      </nav>
 
-      </div>
+    </div>
+    <slot name="header"></slot>
   </header>
   <main>
     <slot name="main"></slot>