From 1be07149dc1ff2a69b8c1df2372e1d14964bc16f Mon Sep 17 00:00:00 2001
From: bach <bachir@figureslibres.io>
Date: Sun, 18 Jun 2023 22:59:20 +0200
Subject: [PATCH] =?UTF-8?q?#2089=20=C3=89tiquettes=20index=20de=20personne?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/app.scss                  |  8 ++++++++
 src/components/Content/Forme.vue     |  2 +-
 src/components/Content/Occurence.vue |  2 +-
 src/pages/Nominum.vue                | 30 +++++++++-------------------
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/assets/css/app.scss b/assets/css/app.scss
index 3c0ec23..34d4a97 100644
--- a/assets/css/app.scss
+++ b/assets/css/app.scss
@@ -511,6 +511,10 @@ section[role="main-content"]{
     
                     span.form{
                       font-style: italic;
+                      margin-top: 0;
+                      font-size: 1.134em;
+                      line-height: $base-line * 0.7;
+                      // margin-bottom: $base-line;
                     }
                   }
                 }
@@ -583,6 +587,10 @@ section[role="main-content"]{
               display: inline-block;
               a{
         
+                font-style: italic;
+                margin-top: 0;
+                font-size: 1.134em;
+                line-height: $base-line * 0.7;
                 span.edition{
                   font-style: italic;
                 }
diff --git a/src/components/Content/Forme.vue b/src/components/Content/Forme.vue
index eda07b6..38bbd5d 100644
--- a/src/components/Content/Forme.vue
+++ b/src/components/Content/Forme.vue
@@ -10,7 +10,7 @@
         @click.prevent="onGoToText"
         @keyup.enter="onGoToText"
       >
-        <span v-html="oc.title" /> <span v-if="oc.ed.uuid" class="edition">( {{ editionTitle }} )</span>
+        <span v-html="oc.title" /> <span v-if="oc.ed.uuid" class="edition">({{ editionTitle }})</span>
         <!-- <span v-if="oc.form" class="form">( "{{ oc.form }}" )</span> -->
       </a>
     </h4>
diff --git a/src/components/Content/Occurence.vue b/src/components/Content/Occurence.vue
index 803db82..fd5bcb9 100644
--- a/src/components/Content/Occurence.vue
+++ b/src/components/Content/Occurence.vue
@@ -10,7 +10,7 @@
         @click.prevent="onGoToText($event, ed.item, oc.uuid, oc.ids[0])"
         @keyup.enter="onGoToText($event, ed.item, oc.uuid, oc.ids[0])"
       >
-        <span v-html="oc.title" /> <span v-if="oc.form" class="form">( "{{ oc.form }}" )</span>
+        <span v-html="oc.title" /> <span v-if="oc.form" class="form" v-html="'( &laquo;'+oc.form+'&raquo; )'" />
       </a>
     </h4>
     <!-- <span
diff --git a/src/pages/Nominum.vue b/src/pages/Nominum.vue
index 5098c80..a6f7107 100644
--- a/src/pages/Nominum.vue
+++ b/src/pages/Nominum.vue
@@ -6,33 +6,21 @@
 
     <template v-if="content" v-slot:header>
       <h1 v-html="content.title" />
-      <p>
-        {{ content.birthDate }}, {{ content.birthPlace }}<br>
-        {{ content.deathDate }}, {{ content.deathPlace }}
+      <h2 v-html="content.rubrique" />
+      <p v-if="content.occupation"><em>{{ content.occupation }}</em></p>
+      <p><span class="label">Nom : </span>{{ content.surname }}, {{ content.surname }}</p>
+      <p><span class="label">Prénom : </span>{{ content.forename }}, {{ content.forename }}</p>
+      <p><span class="label">Sexe : </span>
+        <span v-if="content.sexe === 1">Masculin</span>
+        <span v-if="content.sexe === 0">Feminin</span>
       </p>
-      <section v-if="content.occupation">
-        <h3>Occupation</h3>
-        <p>{{ content.occupation }}</p>
-      </section>
-
+      <p><span class="label">Naissance : </span>{{ content.birthPlace }}, {{ content.birthDate }}</p>
+      <p><span class="label">Mort : </span>{{ content.deathPlace }}, {{ content.deathDate }}</p>
       <section v-if="content.note && content.note.length > 0" class="notes">
         <h3>Notes</h3>
         <div v-for="(note, i) in content.note" :key="i" class="note" v-html="note" />
       </section>
 
-      <section v-if="content.attestedForms && content.attestedForms.length > 0" class="attested-forms">
-        <h3>formes attestées</h3>
-        <ul>
-          <li v-for="(af, i) in content.attestedForms" :key="i">
-            <span class="form">{{ af.title }}</span>
-            <!-- <ul>
-              <li v-for="(uuid, j) in af.uuid" :key="j">
-                <a href="#">{{ uuid }}</a>
-              </li>
-            </ul> -->
-          </li>
-        </ul>
-      </section>
       <section v-if="content.autorities && content.autorities.length > 0" class="autorities">
         <h3>Autorités</h3>
         <ul>