Skip to content

Ajout d'un message paramétrable sous les cartes (fiches espèces et communes) #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Splendens wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Ajout d'un message paramétrable sous les cartes (fiches espèces et communes) #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ atlas/configuration/config.py
atlas/configuration/settings.ini
robots.txt
.htaccess
.htpasswd
venv/*
venv3/*

Expand Down
1 change: 1 addition & 0 deletions atlas/configuration/config_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class MapConfig(Schema):
BORDERS_COLOR = fields.String(missing="#000000")
BORDERS_WEIGHT = fields.Integer(missing=3)
ENABLE_SLIDER = fields.Boolean(missing=True)
INFO_MAP = fields.Boolean(missing=True)


class AtlasConfig(Schema):
Expand Down
3 changes: 3 additions & 0 deletions install_app.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ fi
if [ ! -f ./static/custom/templates/mentions-legales.html ]; then
cp ./static/custom/templates/mentions-legales.html.sample ./static/custom/templates/mentions-legales.html
fi
if [ ! -f ./static/custom/templates/info_map.html ]; then
cp ./static/custom/templates/info_map.html.sample ./static/custom/templates/info_map.html
fi
if [ ! -f ./static/custom/custom.css ]; then
cp ./static/custom/custom.css.sample ./static/custom/custom.css
fi
Expand Down
5 changes: 5 additions & 0 deletions static/css/atlas.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ a {
top: 40px;
}

.msg_map {
background-color: white !important;
border-color: var(--main-color) !important;
}

/* Navbar */

.navbar {
Expand Down
9 changes: 9 additions & 0 deletions static/custom/templates/info_map.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!-- Message d'information sous les cartes des fiches espèces et communes -->

<div class="row">
<div class="col-sm-12">
<p class="alert msg_map text-justify" style="margin:0px;">
<b>Informations importantes :</b> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</p>
</div>
</div>
9 changes: 9 additions & 0 deletions static/custom/templates/info_map.html.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!-- Message d'information sous les cartes des fiches espèces et communes -->

<div class="row">
<div class="col-sm-12">
<p class="alert msg_map text-justify" style="margin:0px;">
<b>Informations importantes :</b> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</p>
</div>
</div>
3 changes: 3 additions & 0 deletions templates/ficheCommune.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ <h4 id="titleMap"> {{configuration.NB_LAST_OBS}} dernières observations sur la
<div id="map"> </div>
</div>
</div>
{% if configuration.MAP.INFO_MAP %}
{% include 'static/custom/templates/info_map.html' %}
{% endif %}
</div>
</div>

Expand Down
4 changes: 4 additions & 0 deletions templates/ficheEspece.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ <h5 id="buttonChild"> <b>{{taxon.listTaxonsChild|length }}</b> taxon(s) agrégé
</div>
</div>

{% if configuration.MAP.INFO_MAP %}
{% include 'static/custom/templates/info_map.html' %}
{% endif %}

<div class="panel panel-default" id="otherInformationsPanel">
<div class="row" id="otherInformations">
<ul class="nav nav-tabs">
Expand Down