deplacement de navbar dans le dossier custom

PnX-SI · Oct 16, 2023 · aac2c24 · aac2c24
1 parent 4034443
commit aac2c24
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,6 +40,7 @@ atlas/static/custom/templates/footer.html
 atlas/static/custom/templates/introduction.html
 atlas/static/custom/templates/credits.html
 atlas/static/custom/templates/mentions-legales.html
+atlas/static/custom/templates/navbar.html
 
 data/ref/emprise_territoire.*
 data/ref/communes.dbf

diff --git a/atlas/messages.pot b/atlas/messages.pot
@@ -201,12 +201,12 @@ msgstr ""
 msgid "loading"
 msgstr ""
 
-#: templates/core/navbar.html:34 templates/home/globalStats.html:28
+#: static/custom/templates/core/navbar.html:34 templates/home/globalStats.html:28
 #: templates/photoGalery/_main.html:76
 msgid "search.species"
 msgstr ""
 
-#: templates/core/navbar.html:47 templates/home/globalStats.html:47
+#: static/custom/templates/core/navbar.html:47 templates/home/globalStats.html:47
 msgid "search.city"
 msgstr ""
 

diff --git a/atlas/templates/core/navbar.html → ...tatic/custom/templates/navbar.html.sample b/atlas/templates/core/navbar.html → ...tatic/custom/templates/navbar.html.sample
diff --git a/atlas/templates/core/layout.html b/atlas/templates/core/layout.html
@@ -19,7 +19,7 @@
 
 <body>
 <header id="navbar">
-    {% include "templates/core/navbar.html" %}
+    {% include "static/custom/templates/navbar.html" %}
 </header>
 
 <sidebar id="sideBar">

diff --git a/atlas/translations/en/LC_MESSAGES/messages.po b/atlas/translations/en/LC_MESSAGES/messages.po
@@ -211,12 +211,12 @@ msgstr "Latest observations within"
 msgid "loading"
 msgstr "Loading..."
 
-#: templates/core/navbar.html:34 templates/home/globalStats.html:28
+#: static/custom/templates/core/navbar.html:34 templates/home/globalStats.html:28
 #: templates/photoGalery/_main.html:76
 msgid "search.species"
 msgstr "Search by species"
 
-#: templates/core/navbar.html:47 templates/home/globalStats.html:47
+#: static/custom/templates/core/navbar.html:47 templates/home/globalStats.html:47
 msgid "search.city"
 msgstr "Search by municipality"
 

diff --git a/atlas/translations/fr/LC_MESSAGES/messages.po b/atlas/translations/fr/LC_MESSAGES/messages.po
@@ -213,12 +213,12 @@ msgstr "Dernière observation en "
 msgid "loading"
 msgstr "Chargement..."
 
-#: templates/core/navbar.html:34 templates/home/globalStats.html:28
+#: static/custom/templates/core/navbar.html:34 templates/home/globalStats.html:28
 #: templates/photoGalery/_main.html:76
 msgid "search.species"
 msgstr "Recherche par espèce"
 
-#: templates/core/navbar.html:47 templates/home/globalStats.html:47
+#: static/custom/templates/core/navbar.html:47 templates/home/globalStats.html:47
 msgid "search.city"
 msgstr "Recherche par commune"
 

diff --git a/atlas/translations/it/LC_MESSAGES/messages.po b/atlas/translations/it/LC_MESSAGES/messages.po
@@ -212,12 +212,12 @@ msgstr "Ultime osservazioni "
 msgid "loading"
 msgstr "Caricamento in corso..."
 
-#: templates/core/navbar.html:34 templates/home/globalStats.html:28
+#: static/custom/templates/core/navbar.html:34 templates/home/globalStats.html:28
 #: templates/photoGalery/_main.html:76
 msgid "search.species"
 msgstr "Cerca per species"
 
-#: templates/core/navbar.html:47 templates/home/globalStats.html:47
+#: static/custom/templates/core/navbar.html:47 templates/home/globalStats.html:47
 msgid "search.city"
 msgstr "Ricerca per comune"
 

diff --git a/docker_startup.sh b/docker_startup.sh
@@ -54,6 +54,7 @@ for custom_file in "templates/footer.html" \
     "templates/credits.html" \
     "templates/mentions-legales.html" \
     "templates/bandeaulogoshome.html" \
+    "templates/navbar.html" \
     "templates/robots.txt" \
     "custom.css" \
     "glossaire.json" \

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -10,18 +10,24 @@ CHANGELOG
 - Ajout d'un linter pour le code python (``black``)
 - possibilité de surcoucher les éléments du dossier ``static`` en les plaçant dans le dossier ``custom``
    -par exemple mettre un nouveau picto pour les mammifères : ``custom/images/picto_Mammiferes.png``
+- possibilité de cutomiser le fichier ``navbar.html`` (déplacement dans le dossier ``static/custom/templates``)
+
 **Note de version**
 
 - apache:
-  - Si l'application n'est pas à la racine du serveur la configuration apache devient:
-
+  - Si l'application n'est pas à la racine du serveur (par exemple avec ``/atlas``) la configuration apache devient:
 ::
 
     <Location /atlas>
         ProxyPass  http://127.0.0.1:8080/atlas
         ProxyPassReverse  http://127.0.0.1:8080/atlas
     </Location>
 
+- s'il n'est pas présent copier le fichier ``navbar.html``.
+
+::
+
+    cp atlas/static/custom/templates/navbar.html.sample atlas/static/custom/templates/navbar.html
 
 
 

diff --git a/install_app.sh b/install_app.sh
@@ -94,8 +94,13 @@ fi
 if [ ! -f ./atlas/static/custom/templates/bandeaulogoshome.html ]; then
   cp ./atlas/static/custom/templates/bandeaulogoshome.html.sample ./atlas/static/custom/templates/bandeaulogoshome.html
 fi
+
+if [ ! -f ./atlas/static/custom/templates/navbar.html ]; then
+  cp ./atlas/static/custom/templates/navbar.html.sample ./atlas/static/custom/templates/navbar.html
+fi
+
 if [ ! -f ./atlas/static/custom/templates/robots.txt ]; then
-  cp ./atlas/static/custom/templates/robots.txt.sample  ./atlas/static/custom/templates/robots.txt 
+  cp ./atlas/static/custom/templates/robots.txt.sample  ./atlas/static/custom/templates/robots.txt
 fi
 
 if [ ! -f ./atlas/static/custom/custom.css ]; then