remerge develop

Author: TheoLechemia

.gitignore

@@ -3,34 +3,17 @@
 atlas/configuration/config.py
 atlas/configuration/settings.ini
 
-# Atlas custom files
-atlas/static/custom/custom.css
-atlas/static/custom/glossaire.json
-atlas/static/custom/maps-custom.js
-atlas/static/custom/territoire.json
 
-atlas/static/custom/images/accueil-intro.jpg
-atlas/static/custom/images/external-website.png
-atlas/static/custom/images/favicon.ico
-atlas/static/custom/images/logo_*
-atlas/static/custom/images/logo-*
-atlas/static/custom/images/picto*.png
-
-atlas/static/custom/templates/bandeaulogoshome.html
-atlas/static/custom/templates/credits.html
-atlas/static/custom/templates/footer.html
-atlas/static/custom/templates/introduction.html
-atlas/static/custom/templates/mentions-legales.html
-atlas/static/custom/templates/navbar.html
-atlas/static/custom/templates/presentation.html
-atlas/static/custom/templates/personal-data.html
-atlas/static/custom/templates/statuts.html
-atlas/static/custom/templates/presentation.html
-atlas/static/custom/templates/personal-data.html
+# Atlas static files
+atlas/static/node_modules/
+atlas/static/custom/*
+!atlas/static/custom/images/
+!atlas/static/custom/templates/
+!atlas/static/custom/**/.gitignore
 
 # Directories to ignore
 .idea/
-atlas/static/node_modules/
+geonature_atlas.egg-info/
 log/*
 venv/*
 venv3/*
@@ -46,6 +29,6 @@ venv3/*
 *.swo
 *.swp
 atlas/debug.py
-geonature_atlas.egg-info/
 Makefile.perso.mk
 robots.txt
+!atlas/static/sample/robots.txt

atlas/atlasRoutes.py

@@ -435,7 +435,7 @@ def sitemap():
 
 @main.route("/robots.txt", methods=["GET"])
 def robots():
-    robots_template = render_template("static/custom/templates/robots.txt")
+    robots_template = render_template("static/custom/robots.txt")
     response = make_response(robots_template)
     response.headers["Content-type"] = "text/plain"
 

atlas/babel.cfg

@@ -1,3 +1,2 @@
 [python: **.py]
 [jinja2: **/templates/**/**.html]
-[jinja2: **/static/custom/templates/**.sample]

atlas/configuration/config.py.example

@@ -101,7 +101,8 @@ LANGUAGES = {
 #####################
 #####################
 
-# Utiliser et afficher le glossaire (static/custom/glossaire.json.sample)
+# Utiliser et afficher le glossaire (static/custom/glossaire.json)
+# Le fichier par défaut est présente dans static/sample/glossaire.json.
 GLOSSAIRE = False
 
 ###########################

atlas/messages.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-10-21 11:50+0200\n"
+"POT-Creation-Date: 2025-10-20 15:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -42,108 +42,110 @@ msgid "search.area"
 msgstr ""
 
 #: static/custom/templates/bandeaulogoshome.html:6
-#: static/custom/templates/bandeaulogoshome.html.sample:7
+#: static/sample/templates/bandeaulogoshome.html:7
 msgid "home.partners"
 msgstr ""
 
-#: static/custom/templates/footer.html:2
-#: static/custom/templates/footer.html.sample:2 templates/home/_main.html:3
+#: static/custom/templates/footer.html:2 static/sample/templates/footer.html:2
+#: templates/home/_main.html:3
 msgid "home"
 msgstr ""
 
 #: static/custom/templates/footer.html:5 static/custom/templates/footer.html:30
-#: static/custom/templates/footer.html.sample:4
-#: static/custom/templates/footer.html.sample:26
+#: static/sample/templates/footer.html:4 static/sample/templates/footer.html:26
 msgid "credits"
 msgstr ""
 
 #: static/custom/templates/footer.html:7 static/custom/templates/footer.html:47
-#: static/custom/templates/footer.html.sample:5
-#: static/custom/templates/footer.html.sample:41
+#: static/sample/templates/footer.html:5 static/sample/templates/footer.html:41
 msgid "legal"
 msgstr ""
 
 #: static/custom/templates/footer.html:11
-#: static/custom/templates/footer.html:65
-#: static/custom/templates/footer.html.sample:7
-#: static/custom/templates/footer.html.sample:57
+#: static/custom/templates/footer.html:65 static/sample/templates/footer.html:7
+#: static/sample/templates/footer.html:57
 msgid "personal_data"
 msgstr ""
 
-#: static/custom/templates/footer.html:12
-#: static/custom/templates/footer.html.sample:8
+#: static/custom/templates/footer.html:12 static/sample/templates/footer.html:8
 msgid "preferences_cookies"
 msgstr ""
 
 #: static/custom/templates/footer.html:18
-#: static/custom/templates/footer.html.sample:14
+#: static/sample/templates/footer.html:14
 msgid "atlas.fauna.flora"
 msgstr ""
 
 #: static/custom/templates/footer.html:18
-#: static/custom/templates/footer.html.sample:14
-#: static/custom/templates/introduction.html.sample:7
+#: static/sample/templates/footer.html:14
+#: static/sample/templates/introduction.html:7
 msgid "from1"
 msgstr ""
 
 #: static/custom/templates/footer.html:20
-#: static/custom/templates/footer.html.sample:16
+#: static/sample/templates/footer.html:16
 msgid "powered.by"
 msgstr ""
 
 #: static/custom/templates/footer.html:20
-#: static/custom/templates/footer.html.sample:17
+#: static/sample/templates/footer.html:17
 msgid "developed.by"
 msgstr ""
 
 #: static/custom/templates/footer.html:21
-#: static/custom/templates/footer.html.sample:17
+#: static/sample/templates/footer.html:17
 msgid "ecrins.national.park"
 msgstr ""
 
 #: static/custom/templates/introduction.html:6
-#: static/custom/templates/introduction.html.sample:6
+#: static/sample/templates/introduction.html:6
 msgid "welcome.message"
 msgstr ""
 
 #: static/custom/templates/introduction.html:10
-#: static/custom/templates/introduction.html.sample:10
+#: static/sample/templates/introduction.html:10
 msgid "home.introduction.message"
 msgstr ""
 
-#: static/custom/templates/introduction.html.sample:7
-msgid "from2"
+#: static/custom/templates/navbar.html:37
+#: static/sample/templates/navbar.html:37 templates/home/globalStats.html:36
+#: templates/photoGalery/_main.html:73
+msgid "search.species"
 msgstr ""
 
-#: static/custom/templates/introduction.html.sample:7
-msgid "from3"
+#: static/custom/templates/presentation.html:4
+#: static/sample/templates/presentation.html:4
+msgid "atlas.presentation"
 msgstr ""
 
-#: static/custom/templates/introduction.html.sample:7
-msgid "from4"
+#: templates/areaSheet/_main.html:29 templates/speciesSheet/_main.html:53
+msgid "obs.number.s"
 msgstr ""
 
-#: static/custom/templates/introduction.html.sample:7
-msgid "from5"
+#: templates/areaSheet/_main.html:30 templates/areaSheet/statArea.html:8
+#: templates/core/statHierarchy.html:7 templates/core/taxon.html:69
+#: static/sample/templates/introduction.html:7
+msgid "from2"
 msgstr ""
 
-#: static/custom/templates/navbar.html:37
-#: static/custom/templates/navbar.html.sample:37
-#: templates/home/globalStats.html:36 templates/photoGalery/_main.html:73
-msgid "search.species"
+#: static/sample/templates/introduction.html:7
+msgid "from3"
 msgstr ""
 
-#: static/custom/templates/presentation.html:4
-#: static/custom/templates/presentation.html.sample:4
-msgid "atlas.presentation"
+#: static/sample/templates/introduction.html:7
+msgid "from4"
 msgstr ""
 
-#: templates/areaSheet/_main.html:29 templates/speciesSheet/_main.html:53
+#: static/sample/templates/introduction.html:7
+msgid "from5"
+msgstr ""
+
+#: templates/areaSheet/_main.html:32 templates/speciesSheet/_main.html:53
 msgid "obs.number.s"
 msgstr ""
 
-#: templates/areaSheet/_main.html:30 templates/areaSheet/statArea.html:8
-#: templates/core/statHierarchy.html:7 templates/core/taxon.html:69
+#: templates/areaSheet/_main.html:33 templates/areaSheet/statArea.html:8
+#: templates/core/statHierarchy.html:7 templates/core/taxon.html:85
 #: templates/home/globalStats.html:16 templates/home/taxoRank.html:49
 #: templates/organismSheet/statsInfos.html:15
 #: templates/organismSheet/topSpecies.html:44
@@ -166,13 +168,13 @@ msgstr ""
 #: templates/home/globalStats.html:28 templates/home/taxoRank.html:32
 #: templates/organismSheet/statsInfos.html:29
 msgid "species"
-msgstr ""
+msgstr "Espèces"
 
 #: templates/areaSheet/_main.html:34 templates/areaSheet/moreZoneInfo.html:17
 #: templates/areaSheet/moreZoneInfo.html:67
 #: templates/areaSheet/statArea.html:56
 msgid "threatened.species"
-msgstr ""
+msgstr "Menacés"
 
 #: templates/areaSheet/_main.html:35
 msgid "other.species"
@@ -248,7 +250,7 @@ msgid "by.taxonomic.group"
 msgstr ""
 
 #: templates/areaSheet/statArea.html:8 templates/core/statHierarchy.html:7
-#: templates/core/taxon.html:69 templates/organismSheet/topSpecies.html:42
+#: templates/core/taxon.html:85 templates/organismSheet/topSpecies.html:42
 #: templates/speciesSheet/map.html:15
 #: templates/speciesSheet/otherInformations.html:145
 msgid "observation"
@@ -325,14 +327,14 @@ msgstr ""
 msgid "asearch.remove.selection"
 msgstr ""
 
-#: templates/core/advanced_search.html:406 templates/core/taxon.html:79
+#: templates/core/advanced_search.html:406 templates/core/taxon.html:95
 #: templates/home/lastObs.html:32 templates/home/mostViewNow.html:33
 #: templates/home/newSpecies.html:48 templates/home/taxoRank.html:61
 #: templates/organismSheet/topSpecies.html:76
 msgid "species.sheet"
 msgstr ""
 
-#: templates/core/advanced_search.html:407 templates/core/taxon.html:77
+#: templates/core/advanced_search.html:407 templates/core/taxon.html:93
 #: templates/organismSheet/topSpecies.html:75
 #: templates/speciesSheet/identityCard.html:171
 msgid "check.species.sheet"
@@ -443,11 +445,39 @@ msgstr ""
 msgid "this.taxon.has.a.protected.status"
 msgstr ""
 
-#: templates/core/taxon.html:46
+#: templates/core/taxon.html:46 templates/core/taxon.html:47
+msgid "threatened.CR"
+msgstr "Critique"
+
+#: templates/core/taxon.html:48
+msgid "threatened.EN"
+msgstr "En danger"
+
+#: templates/core/taxon.html:49
+msgid "threatened.VU"
+msgstr "Vulnérable"
+
+#: templates/core/taxon.html:54
+msgid "protected.LRR"
+msgstr "Liste rouge régionale"
+
+#: templates/core/taxon.html:55
+msgid "protected.LRN"
+msgstr "Liste rouge nationale"
+
+#: templates/core/taxon.html:56
+msgid "protected.LRE"
+msgstr "Liste rouge européenne"
+
+#: templates/core/taxon.html:57
+msgid "protected.LRM"
+msgstr "Liste rouge mondilae"
+
+#: templates/core/taxon.html:62
 msgid "threatened"
 msgstr ""
 
-#: templates/core/taxon.html:72
+#: templates/core/taxon.html:88
 msgid "last.obs.in"
 msgstr ""
 

atlas/modeles/entities/vmAltitudes.py

@@ -1,6 +1,6 @@
 from itertools import pairwise
 from flask import current_app
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import mapped_column
 from sqlalchemy import Integer
 from atlas.env import db
 

atlas/modeles/entities/vmAreas.py

@@ -32,14 +32,6 @@ class VmAreas(db.Model):
     type: Mapped["VmBibAreasTypes"] = relationship("VmBibAreasTypes", back_populates="areas")
 
 
-class VmCorAreaObservation(db.Model):
-    __tablename__ = "vm_cor_area_observation"
-    __table_args__ = {"schema": "atlas"}
-
-    id_observation: Mapped[int] = mapped_column(primary_key=True)
-    id_area: Mapped[int] = mapped_column(primary_key=True)
-
-
 class VmCorAreas(db.Model):
     __tablename__ = "vm_cor_areas"
     __table_args__ = {"schema": "atlas"}

atlas/static/css/areaSheet.css

@@ -75,7 +75,6 @@ img.statut_icon {
 
 .specie_list_map_block {
     display: flex;
-    height: 100%;
 }
 
 .stats_block {

atlas/static/custom/images/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

atlas/static/custom/templates/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore