PnX-SI · juggler31 · Oct 17, 2024 · Jan 15, 2025 · Jan 16, 2025 · Jan 16, 2025
diff --git a/atlas/atlasRoutes.py b/atlas/atlasRoutes.py
@@ -207,12 +207,18 @@ def index():
     connection.close()
     session.close()
 
+    personal_data = False
+    args_personal_data = request.args.get("personal_data")
+    if args_personal_data and args_personal_data.lower() == "true":
+        personal_data = True
+
     return render_template(
         "templates/home/_main.html",
         observations=observations,
         mostViewTaxon=mostViewTaxon,
         customStatMedias=customStatMedias,
         lastDiscoveries=lastDiscoveries,
+        personal_data=personal_data,
     )
 
 

diff --git a/atlas/configuration/config.py.example b/atlas/configuration/config.py.example
@@ -84,9 +84,6 @@ LANGUAGES = {
 #####################
 #####################
 
-# Code de suivi des statistiques Google Analytics (si AFFICHAGE_FOOTER = True)
-ID_GOOGLE_ANALYTICS = "UA-xxxxxxx-xx"
-
 # Utiliser et afficher le glossaire (static/custom/glossaire.json.sample)
 GLOSSAIRE = False
 
@@ -261,6 +258,12 @@ PATRIMONIALITE = {
     }
 }
 
+# liste des application dont "orejime" controle la dépose de cookie
+OREJIME_APPS = []
+
+# traduction orejime (voir la doc cookie et RGPD pour comment le remplir)
+OREJIME_TRANSLATIONS = {}
+
 #############################
 #### Lien custom du logo ####
 #############################

diff --git a/atlas/configuration/config_schema.py b/atlas/configuration/config_schema.py
@@ -77,6 +77,21 @@
     },
 }
 
+orijime_default_translations = {
+    "fr": {
+        "consentModal": {
+            "description": "",
+        },
+        "purposes": {"analytics": "Analyse", "security": "Sécurité"},
+    },
+    "en": {
+        "consentModal": {
+            "description": "This is an example of how to override an existing translation already used by Orejime",
+        },
+        "purposes": {"analytics": "Analytics", "security": "Security"},
+    },
+}
+
 
 class SecretSchemaConf(Schema):
     class Meta:
@@ -122,7 +137,6 @@ class Meta:
     URL_APPLICATION = fields.String(load_default="")
     DEFAULT_LANGUAGE = fields.String(load_default="fr")
     MULTILINGUAL = fields.Boolean(load_default=False)
-    ID_GOOGLE_ANALYTICS = fields.String(load_default="UA-xxxxxxx-xx")
     ORGANISM_MODULE = fields.Boolean(load_default=False)
     DISPLAY_OBSERVERS = fields.Boolean(load_default=True)
     GLOSSAIRE = fields.Boolean(load_default=False)
@@ -131,6 +145,8 @@ class Meta:
     AFFICHAGE_LOGOS_HOME = fields.Boolean(load_default=True)
     AFFICHAGE_FOOTER = fields.Boolean(load_default=True)
     AFFICHAGE_RGPD = fields.Boolean(load_default=True)
+    OREJIME_APPS = fields.List(fields.Dict(), load_default=[])
+    OREJIME_TRANSLATIONS = fields.Dict(load_default=orijime_default_translations)
     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/static/custom/templates/footer.html.sample b/atlas/static/custom/templates/footer.html.sample
@@ -5,10 +5,11 @@
        data-target="#modalCredits">{{ _('credits') }}</a> |
     <a data-toggle="modal" href="#"
        data-target="#modalMentions">{{ _('legal') }}</a>
-    {% if configuration.AFFICHAGE_RGPD %}
+    {% if configuration.AFFICHAGE_RGPD and configuration.OREJIME_APPS | length > 0 %}
     |
     <a data-toggle="modal" href="#"
        data-target="#modalPersonalData">{{ _('personal_data') }}</a>
+        | <a id="preferences-cookies" href="#" onclick="orejime.show()">{{ _('preferences_cookies') }}</a>
     {% endif %}
 </small>
 
@@ -74,22 +75,5 @@
 </div>
 {% endif %}
 
-{% if configuration.ID_GOOGLE_ANALYTICS != "UA-xxxxxxx-xx" %}
-    <!-- Script Google Analytics -->
-    <script>
-        (function (i, s, o, g, r, a, m) {
-            i['GoogleAnalyticsObject'] = r;
-            i[r] = i[r] || function () {
-                (i[r].q = i[r].q || []).push(arguments)
-            }, i[r].l = 1 * new Date();
-            a = s.createElement(o),
-                m = s.getElementsByTagName(o)[0];
-            a.async = 1;
-            a.src = g;
-            m.parentNode.insertBefore(a, m)
-        })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
+    <!-- BLOC TRACEURS / ANALYSES VIZA COOKIES -->
 
-        ga('create', '{{configuration.ID_GOOGLE_ANALYTICS}}', 'auto');
-        ga('send', 'pageview');
-    </script>
-{% endif %}
diff --git a/atlas/static/main.js b/atlas/static/main.js
@@ -139,3 +139,24 @@ if (configuration.GLOSSAIRE) {
     });
   });
 }
+
+if (configuration.OREJIME_APPS.length > 0) {
+    var orejimeConfig = {
+        elementID: "orejime",
+        appElement: "main",
+        cookieName: "orejime",
+        cookieExpiresAfterDays: 365,
+        privacyPolicy: "/?personal_data=true",
+        default: true,
+        mustConsent: false,
+        mustNotice: false,
+        lang: configuration.DEFAULT_LANGUAGE,
+        logo: false,
+        debug: configuration.modeDebug,
+        apps: configuration.OREJIME_APPS,
+        categories: configuration.OREJIME_CATEGORIES
+    }
+  if (configuration.OREJIME_TRANSLATIONS && configuration.OREJIME_TRANSLATIONS != {}) {
+      orejimeConfig.translations = configuration.OREJIME_TRANSLATIONS
+  }
+}
diff --git a/atlas/static/package-lock.json b/atlas/static/package-lock.json
diff --git a/atlas/static/package.json b/atlas/static/package.json
@@ -33,6 +33,7 @@
     "leaflet.snogylop": "^0.4.0",
     "leaflet.zoomhome": "^1.0.0",
     "lightbox2": "^2.8.2",
+    "orejime": "^2.3.0",
     "popper.js": "^1.16.0",
     "raphael": "^2.2.0",
     "slick": "^1.12.2",

diff --git a/atlas/templates/core/assets_header.html b/atlas/templates/core/assets_header.html
@@ -38,4 +38,8 @@
     <link rel="SHORTCUT ICON" href="{{ url_for('static', filename='custom/images/favicon.ico') }}">
     <link rel="stylesheet" href="{{url_for('static', filename='css/atlas.css') }}" />
 
+    <!-- GDPR -->
+    <script src="{{url_for('static', filename='node_modules/orejime/dist/orejime.js') }}"></script>
+    <link rel="stylesheet" href="{{url_for('static', filename='node_modules/orejime/dist/orejime.css') }}" />
+
     {% endblock %}
diff --git a/atlas/templates/home/_main.html b/atlas/templates/home/_main.html
@@ -28,6 +28,12 @@
     </script>
 <script src="{{ url_for('static', filename='index.js') }}"></script>
 
+    {% if personal_data %}
+        <script>
+            $("#modalPersonalData").modal('show');
+        </script>
+    {% endif %}
+
 {% endblock %}
 
 

diff --git a/atlas/translations/en/LC_MESSAGES/messages.mo b/atlas/translations/en/LC_MESSAGES/messages.mo
diff --git a/atlas/translations/en/LC_MESSAGES/messages.po b/atlas/translations/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-09-27 10:32+0200\n"
+"POT-Creation-Date: 2024-11-27 10:43+0100\n"
 "PO-Revision-Date: 2021-07-12 12:12+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -47,6 +47,10 @@ msgstr "Legal mentions"
 msgid "personal_data"
 msgstr "Personal data"
 
+#: static/custom/templates/footer.html:12
+msgid "preferences_cookies"
+msgstr "Changing cookie preferences"
+
 #: static/custom/templates/footer.html:17
 #: static/custom/templates/footer.html.sample:17
 msgid "atlas.fauna.flora"

diff --git a/atlas/translations/fr/LC_MESSAGES/messages.mo b/atlas/translations/fr/LC_MESSAGES/messages.mo
diff --git a/atlas/translations/fr/LC_MESSAGES/messages.po b/atlas/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-09-27 10:32+0200\n"
+"POT-Creation-Date: 2024-11-27 10:38+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: fr\n"
@@ -47,7 +47,11 @@ msgstr "Mentions légales"
 msgid "personal_data"
 msgstr "Données personnelles"
 
-#: static/custom/templates/footer.html:17
+#: static/custom/templates/footer.html:12
+msgid "preferences_cookies"
+msgstr "Modifier les préférences de cookies"
+
+#: static/custom/templates/footer.html:18
 #: static/custom/templates/footer.html.sample:17
 msgid "atlas.fauna.flora"
 msgstr "Atlas de la faune et de la flore"

diff --git a/atlas/translations/it/LC_MESSAGES/messages.mo b/atlas/translations/it/LC_MESSAGES/messages.mo
diff --git a/atlas/translations/it/LC_MESSAGES/messages.po b/atlas/translations/it/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-09-27 10:32+0200\n"
+"POT-Creation-Date: 2024-11-27 10:43+0100\n"
 "PO-Revision-Date: 2021-07-19 09:53+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: it\n"
@@ -47,6 +47,10 @@ msgstr "Nota legale"
 msgid "personal_data"
 msgstr "Dati personali"
 
+#: atlas/static/custom/templates/footer.html:12
+msgid "preferences_cookies"
+msgstr ""
+
 #: static/custom/templates/footer.html:17
 #: static/custom/templates/footer.html.sample:17
 msgid "atlas.fauna.flora"

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -8,6 +8,7 @@ CHANGELOG
 🚀 **Nouveautés**
 
 - Ajout du lien "Données personelles" dans le pied de page (#527 @juggler31)
+- Ajout de la librairie Orijeme pour recueillir le consentement de l'utilisateur sur l'utilisation des cookies
 - Suppression du support des installations sans TaxHub
 
 🐛 **Corrections**
@@ -26,6 +27,8 @@ CHANGELOG
 
 ⚠️ **Notes de version**
 
+- Le paramètre `ID_GOOGLE_ANALYTICS` et la façon d'integrer un script google analytic sont dépréciés. Se référer à la documentation sur le RGPD et la collecte de cookies : https://github.com/PnX-SI/GeoNature-atlas/blob/master/docs/cookies_rgpd.rst
+
 Si vous mettez à jour GeoNature-atlas :
 
 - Ajouter l'extension unaccent à la base de données `CREATE EXTENSION IF NOT EXISTS unaccent SCHEMA "public";` (#531, #532)