From 7f0eae05254af8328e11b7dbad56415efb3b7f82 Mon Sep 17 00:00:00 2001 From: Joaquim Nallar Date: Fri, 27 Sep 2024 10:32:57 +0200 Subject: [PATCH] feat: add personal data link in footer --- .gitignore | 1 + atlas/configuration/config.py.example | 3 +++ atlas/configuration/config_schema.py | 1 + atlas/messages.pot | 18 +++++++------ atlas/static/css/atlas.css | 12 ++++++++- .../custom/templates/footer.html.sample | 24 ++++++++++++++++++ .../templates/personal-data.html.sample | 9 +++++++ atlas/translations/en/LC_MESSAGES/messages.mo | Bin 5758 -> 5802 bytes atlas/translations/en/LC_MESSAGES/messages.po | 20 ++++++++------- atlas/translations/fr/LC_MESSAGES/messages.mo | Bin 6147 -> 6199 bytes atlas/translations/fr/LC_MESSAGES/messages.po | 20 ++++++++------- atlas/translations/it/LC_MESSAGES/messages.mo | Bin 6009 -> 6054 bytes atlas/translations/it/LC_MESSAGES/messages.po | 20 ++++++++------- docs/changelog.rst | 4 +++ install_app.sh | 3 +++ 15 files changed, 99 insertions(+), 36 deletions(-) create mode 100644 atlas/static/custom/templates/personal-data.html.sample diff --git a/.gitignore b/.gitignore index e1cbc420d..dc84c23ff 100644 --- 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/personal-data.html atlas/static/custom/templates/navbar.html data/ref/emprise_territoire.* diff --git a/atlas/configuration/config.py.example b/atlas/configuration/config.py.example index 90e55e361..bd7da925e 100644 --- a/atlas/configuration/config.py.example +++ b/atlas/configuration/config.py.example @@ -155,6 +155,9 @@ AFFICHAGE_INTRODUCTION = True # Afficher le Footer sur toutes les pages (static/custom/templates/footer.html) AFFICHAGE_FOOTER = True +# Afficher le lien "données personnelles" dans le footer +AFFICHAGE_RGPD = True + # Bloc de statistiques globales. Affichage True/False AFFICHAGE_STAT_GLOBALES = True diff --git a/atlas/configuration/config_schema.py b/atlas/configuration/config_schema.py index dbdca924b..e1e292cd1 100644 --- a/atlas/configuration/config_schema.py +++ b/atlas/configuration/config_schema.py @@ -130,6 +130,7 @@ class Meta: AFFICHAGE_INTRODUCTION = fields.Boolean(load_default=True) AFFICHAGE_LOGOS_HOME = fields.Boolean(load_default=True) AFFICHAGE_FOOTER = fields.Boolean(load_default=True) + AFFICHAGE_RGPD = fields.Boolean(load_default=True) AFFICHAGE_STAT_GLOBALES = fields.Boolean(load_default=True) AFFICHAGE_DERNIERES_OBS = fields.Boolean(load_default=True) AFFICHAGE_EN_CE_MOMENT = fields.Boolean(load_default=True) diff --git a/atlas/messages.pot b/atlas/messages.pot index 5368f728c..c36bb800d 100644 --- a/atlas/messages.pot +++ b/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: 2024-09-27 10:27+0200\n" +"POT-Creation-Date: 2024-09-27 10:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,45 +29,47 @@ msgstr "" #: static/custom/templates/footer.html:5 static/custom/templates/footer.html:29 #: static/custom/templates/footer.html.sample:5 -#: static/custom/templates/footer.html.sample:24 +#: static/custom/templates/footer.html.sample:29 msgid "credits" msgstr "" #: static/custom/templates/footer.html:7 static/custom/templates/footer.html:46 #: static/custom/templates/footer.html.sample:7 -#: static/custom/templates/footer.html.sample:41 +#: static/custom/templates/footer.html.sample:46 msgid "legal" msgstr "" #: static/custom/templates/footer.html:11 #: static/custom/templates/footer.html:64 +#: static/custom/templates/footer.html.sample:11 +#: static/custom/templates/footer.html.sample:64 msgid "personal_data" msgstr "" #: static/custom/templates/footer.html:17 -#: static/custom/templates/footer.html.sample:12 +#: static/custom/templates/footer.html.sample:17 msgid "atlas.fauna.flora" msgstr "" #: static/custom/templates/footer.html:17 -#: static/custom/templates/footer.html.sample:12 +#: static/custom/templates/footer.html.sample:17 #: static/custom/templates/introduction.html:7 #: static/custom/templates/introduction.html.sample:7 msgid "from1" msgstr "" #: static/custom/templates/footer.html:19 -#: static/custom/templates/footer.html.sample:14 +#: static/custom/templates/footer.html.sample:19 msgid "powered.by" msgstr "" #: static/custom/templates/footer.html:19 -#: static/custom/templates/footer.html.sample:14 +#: static/custom/templates/footer.html.sample:19 msgid "developed.by" msgstr "" #: static/custom/templates/footer.html:20 -#: static/custom/templates/footer.html.sample:15 +#: static/custom/templates/footer.html.sample:20 msgid "ecrins.national.park" msgstr "" diff --git a/atlas/static/css/atlas.css b/atlas/static/css/atlas.css index 076b6fa10..0513c98d0 100644 --- a/atlas/static/css/atlas.css +++ b/atlas/static/css/atlas.css @@ -457,6 +457,16 @@ footer { text-align: left; } +.personal-data-body { + display: flex; + flex-wrap: wrap; + text-align: justify; + + > span { + padding-top: 1rem; + } +} + /*END FOOTER*/ /* Galerie Photo et fiche par groupe */ @@ -705,4 +715,4 @@ footer { .spinner-border { animation-duration: 3s; -} \ No newline at end of file +} diff --git a/atlas/static/custom/templates/footer.html.sample b/atlas/static/custom/templates/footer.html.sample index 13a70ccf8..4ce976035 100644 --- a/atlas/static/custom/templates/footer.html.sample +++ b/atlas/static/custom/templates/footer.html.sample @@ -5,6 +5,11 @@ data-target="#modalCredits">{{ _('credits') }} | {{ _('legal') }} + {% if configuration.AFFICHAGE_RGPD %} + | + {{ _('personal_data') }} + {% endif %}
@@ -50,6 +55,25 @@
+{% if configuration.AFFICHAGE_RGPD %} + +{% endif %} + {% if configuration.ID_GOOGLE_ANALYTICS != "UA-xxxxxxx-xx" %}