From 5528f81895e9c6e862fa8f9ad6016ec8824a7beb Mon Sep 17 00:00:00 2001
From: Rachel Gaubil <rachel.gaubil@univ-grenoble-alpes.fr>
Date: Fri, 7 Jun 2024 10:53:00 +0200
Subject: [PATCH] [edit] reorganize site menu
---
data/xml/CreNum_presentation_de_la_CF.xml | 2 +-
static/css/main.css | 2 +-
templates/htm/presentation_de_la_CF.htm | 2 +-
templates/navbar_menu.html.j2 | 62 ++++++++++++++++-------
4 files changed, 46 insertions(+), 22 deletions(-)
diff --git a/data/xml/CreNum_presentation_de_la_CF.xml b/data/xml/CreNum_presentation_de_la_CF.xml
index 47a04b12..8da279b4 100644
--- a/data/xml/CreNum_presentation_de_la_CF.xml
+++ b/data/xml/CreNum_presentation_de_la_CF.xml
@@ -22,7 +22,7 @@
<text>
<body>
<div>
- <head>Présentation de la <title>Chronique française</title></head>
+ <head>Relire la <title>Chronique française</title></head>
<div>
<figure place="inline right">
<graphic url="https://gallica.bnf.fr/ark:/12148/btv1b105090110/f26.highres"/>
diff --git a/static/css/main.css b/static/css/main.css
index 1aafcf92..d8a56603 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -129,7 +129,7 @@ h4 {
border: none;
}
-.dropdown-books > .dropend > .dropdown-toggle.dropdown-item::after {
+.dropend > .dropdown-toggle.dropdown-item::after {
margin: auto;
margin-right: 0;
font: var(--fa-font-solid);
diff --git a/templates/htm/presentation_de_la_CF.htm b/templates/htm/presentation_de_la_CF.htm
index 5fb44024..4d10ee7f 100644
--- a/templates/htm/presentation_de_la_CF.htm
+++ b/templates/htm/presentation_de_la_CF.htm
@@ -1,4 +1,4 @@
-<h2 xmlns="http://www.w3.org/1999/xhtml" class="title">Présentation de la <i>Chronique française</i></h2>
+<h2 xmlns="http://www.w3.org/1999/xhtml" class="title">Relire la <i>Chronique française</i></h2>
<div xmlns="http://www.w3.org/1999/xhtml"><img alt="" src="https://gallica.bnf.fr/ark:/12148/btv1b105090110/f26.highres" class="inline-right"></img><h4>Une œuvre injustement oubliée</h4>
<p><i>Le recueil sommaire de la Chronique Françoyse</i> figure dans six
riches volumes manuscrits, pourvus de miniatures, conservés à la Bibliothèque
diff --git a/templates/navbar_menu.html.j2 b/templates/navbar_menu.html.j2
index ee959184..2755b580 100644
--- a/templates/navbar_menu.html.j2
+++ b/templates/navbar_menu.html.j2
@@ -9,10 +9,45 @@
<li class="nav-item dropdown">
<a class="dropdown-toggle btn btn-menu me-3" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
- <i class="fa-solid fa-address-card"></i> Présentation</a>
+ <i class="fa-solid fa-address-card"></i> Introduction</a>
<ul class="dropdown-menu dropdown-pres" aria-labelledby="navbarDropdown">
+ <li class="dropend">
+ <a class="dropdown-toggle dropdown-item btn-summary disabled" id="cretinDropdown" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false"></i>Guillaume Cretin</a>
+ <ul class="dropdown-menu dropdown-cretin" aria-labelledby="cretinDropdown">
+ <li>
+ <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='archives') }}"></i>Cretin dans les archives</a>
+ </li>
+ <li>
+ <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='annexe1') }}"></i>Annexe 1</a>
+ </li>
+ <li>
+ <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='annexe2') }}"></i>Annexe 2</a>
+ </li>
+ <li>
+ <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='annexe3') }}"></i>Annexe 3</a>
+ </li>
+ <li>
+ <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='annexe4') }}"></i>Annexe 4</a>
+ </li>
+ <li>
+ <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='annexe5') }}"></i>Annexe 5</a>
+ </li>
+ <li>
+ <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='annexe6') }}"></i>Annexe 6</a>
+ </li>
+ <li>
+ <a class="dropdown-item btn-summary disabled" href="{{ url_for('vue', vueName='annexe7') }}"></i>Annexe 7</a>
+ </li>
+ </ul>
+ </li>
+ <li>
+ <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='presentation') }}"></i><span>Relire la <i>Chronique française</i></span></a>
+ </li>
<li>
- <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='presentation') }}"></i><span>Présentation de la <i>Chronique française</i></span></a>
+ <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='manuscripts') }}"></i>Manuscrits</a>
+ </li>
+ <li>
+ <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='bibliography') }}"></i>Bibliographie</a>
</li>
<li>
<a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='edit_principles') }}"></i>Principes éditoriaux</a>
@@ -67,9 +102,9 @@
</ul>
</li>
- <li class="nav-item">
+ <!--<li class="nav-item">
<a class="btn btn-menu me-3" href="{{ url_for('vue', vueName='manuscripts') }}"><i class="fa-solid fa-scroll"></i> Manuscrits</a>
- </li>
+ </li>-->
<li class="nav-item">
<a class="btn btn-menu me-3" href="{{ url_for('vue', vueName='index_person') }}"><i class="fa-solid fa-bars"></i> Index</a>
@@ -77,31 +112,20 @@
<li class="nav-item dropdown">
<a class="dropdown-toggle btn btn-menu me-3" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
- <i class="fa-solid fa-landmark"></i> Ressources</a>
+ <i class="fa-solid fa-landmark"></i> Repères</a>
<ul class="dropdown-menu dropdown-ress" aria-labelledby="navbarDropdown">
<li>
- <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='bibliography') }}"></i>Bibliographie</a>
- </li>
- <li>
- <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='timeline') }}"></i>Repères chronologiques</a>
+ <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='timeline') }}"></i>Chronologie</a>
</li>
<li>
- <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='genealogy') }}"></i>Repères généalogiques</a>
+ <a class="dropdown-item btn-summary" href="{{ url_for('vue', vueName='genealogy') }}"></i>Généalogie</a>
</li>
<li>
- <a class="dropdown-item btn-summary disabled" href="{{ url_for('vue', vueName='map') }}"></i>Repères cartographiques</a>
+ <a class="dropdown-item btn-summary disabled" href="{{ url_for('vue', vueName='map') }}"></i>Cartographie</a>
</li>
</ul>
</li>
- <!-- <li class="nav-item">
- <a class="btn btn-menu me-3" href="{{ url_for('vue', vueName='genealogy') }}"><i class="fa-solid fa-people-roof"></i> Généalogie</a>
- </li>
-
- <li class="nav-item">
- <a class="btn btn-menu me-3" href="{{ url_for('vue', vueName='map') }}"><i class="fa-solid fa-map-location-dot"></i> Carte</a>
- </li> -->
-
<li class="nav-item">
<a class="btn btn-menu me-3" href="{{ url_for('vue', vueName='team') }}"><i class="fa-solid fa-people-group"></i> Équipe</a>
</li>
--
GitLab