Skip to content

Commit

Permalink
feat: add personal data link in footer
Browse files Browse the repository at this point in the history
  • Loading branch information
juggler31 committed Sep 27, 2024
1 parent 168c9c1 commit 30c094c
Show file tree
Hide file tree
Showing 13 changed files with 86 additions and 36 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
3 changes: 3 additions & 0 deletions atlas/configuration/config.py.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
FOOTER_RGPD = True

# Bloc de statistiques globales. Affichage True/False
AFFICHAGE_STAT_GLOBALES = True

Expand Down
1 change: 1 addition & 0 deletions atlas/configuration/config_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
FOOTER_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)
Expand Down
18 changes: 10 additions & 8 deletions atlas/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -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 ""

Expand Down
12 changes: 11 additions & 1 deletion atlas/static/css/atlas.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -705,4 +715,4 @@ footer {

.spinner-border {
animation-duration: 3s;
}
}
24 changes: 24 additions & 0 deletions atlas/static/custom/templates/footer.html.sample
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
data-target="#modalCredits">{{ _('credits') }}</a> |
<a data-toggle="modal" href="#"
data-target="#modalMentions">{{ _('legal') }}</a>
{% if configuration.FOOTER_RGPD %}
|
<a data-toggle="modal" href="#"
data-target="#modalPersonalData">{{ _('personal_data') }}</a>
{% endif %}
</small>

<div>
Expand Down Expand Up @@ -50,6 +55,25 @@
</div>
</div>

{% if configuration.FOOTER_RGPD %}
<div class="modal fade text-justify" id="modalPersonalData">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">

<h3>{{ _('personal_data') }}</h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true" class="text-white">&times;</span>
</button>
</div>
<div class="modal-body">
{% include 'static/custom/templates/personal-data.html' %}
</div>
</div>
</div>
</div>
{% endif %}

{% if configuration.ID_GOOGLE_ANALYTICS != "UA-xxxxxxx-xx" %}
<!-- Script Google Analytics -->
<script>
Expand Down
Binary file modified atlas/translations/en/LC_MESSAGES/messages.mo
Binary file not shown.
20 changes: 11 additions & 9 deletions atlas/translations/en/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -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:27+0200\n"
"POT-Creation-Date: 2024-09-27 10:32+0200\n"
"PO-Revision-Date: 2021-07-12 12:12+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
Expand All @@ -30,45 +30,47 @@ msgstr "Home"

#: 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 "Conception and credits"

#: 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 "Legal mentions"

#: 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 ""
msgstr "Personal data"

#: 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 "Faune and flora atlas"

#: 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 "from"

#: static/custom/templates/footer.html:19
#: static/custom/templates/footer.html.sample:14
#: static/custom/templates/footer.html.sample:19
msgid "powered.by"
msgstr "Powered by"

#: static/custom/templates/footer.html:19
#: static/custom/templates/footer.html.sample:14
#: static/custom/templates/footer.html.sample:19
msgid "developed.by"
msgstr "developed by the"

#: 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 "Ecrins national park"

Expand Down
Binary file modified atlas/translations/fr/LC_MESSAGES/messages.mo
Binary file not shown.
20 changes: 11 additions & 9 deletions atlas/translations/fr/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -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: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 <EMAIL@ADDRESS>\n"
"Language: fr\n"
Expand All @@ -30,45 +30,47 @@ msgstr "Accueil"

#: 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 "Conception et crédits"

#: 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 "Mentions légales"

#: 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 ""
msgstr "Données personnelles"

#: 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 "Atlas de la faune et de la flore"

#: 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 "du"

#: static/custom/templates/footer.html:19
#: static/custom/templates/footer.html.sample:14
#: static/custom/templates/footer.html.sample:19
msgid "powered.by"
msgstr "Réalisé avec"

#: static/custom/templates/footer.html:19
#: static/custom/templates/footer.html.sample:14
#: static/custom/templates/footer.html.sample:19
msgid "developed.by"
msgstr "développé par le"

#: 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 "Parc national des Écrins"

Expand Down
Binary file modified atlas/translations/it/LC_MESSAGES/messages.mo
Binary file not shown.
20 changes: 11 additions & 9 deletions atlas/translations/it/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -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:27+0200\n"
"POT-Creation-Date: 2024-09-27 10:32+0200\n"
"PO-Revision-Date: 2021-07-19 09:53+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: it\n"
Expand All @@ -30,45 +30,47 @@ msgstr "Home"

#: 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 "Concezione e crediti"

#: 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 "Nota legale"

#: 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 ""
msgstr "Dati personali"

#: 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 "Atlante della flora e della fauna"

#: 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 "di"

#: static/custom/templates/footer.html:19
#: static/custom/templates/footer.html.sample:14
#: static/custom/templates/footer.html.sample:19
msgid "powered.by"
msgstr "Realizzato da"

#: static/custom/templates/footer.html:19
#: static/custom/templates/footer.html.sample:14
#: static/custom/templates/footer.html.sample:19
msgid "developed.by"
msgstr "sviluppato da il"

#: 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 "Parco Nazionale degli Ecrins"

Expand Down
3 changes: 3 additions & 0 deletions install_app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ fi
if [ ! -f ./atlas/static/custom/templates/mentions-legales.html ]; then
cp ./atlas/static/custom/templates/mentions-legales.html.sample ./atlas/static/custom/templates/mentions-legales.html
fi
if [ ! -f ./atlas/static/custom/templates/personal-data.html ]; then
cp ./atlas/static/custom/templates/personal-data.html.sample ./atlas/static/custom/templates/personal-data.html
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
Expand Down

0 comments on commit 30c094c

Please sign in to comment.