Skip to content
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.

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

Déplacer les cartes en dessous des tableaux de données et leur ajouter un titre #787

Merged
merged 5 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,6 @@ <h3>Evolution de l'artificialisation entre {{ first_millesime }} et {{ last_mill
</div>
</div>
</div>
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col-12 fr-mt-2w">
{% url 'project:theme-my-artif' project.pk as map_url %}
{% include "project/components/map/iframe_map.html" with src=map_url title="Carte comprendre l'artificialisation" %}
</div>
</div>

<div class="fr-notice bg-white fr-mt-2w">
<div class="fr-px-2w">
Expand Down Expand Up @@ -217,6 +211,16 @@ <h6 class="fr-mt-2w">Données</h6>
</div>
</div>
</div>

<div class="fr-grid-row fr-grid-row--gutters fr-mt-2w">
<div class="fr-col-12">
<div class="bg-white fr-p-2w">
{% url 'project:theme-my-artif' project.pk as map_url %}
{% include "project/components/map/iframe_map.html" with src=map_url title="Carte comprendre l'artificialisation" %}
</div>
</div>
</div>

</div>

{% if not is_commune %}
Expand Down Expand Up @@ -260,12 +264,6 @@ <h3 id="conso-annuelle">Artificialisation nette entre {{ first_millesime }} et {
</div>
</div>
</div>
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col-12 fr-mt-2w">
{% url 'project:theme-city-artif' project.pk as map_url %}
{% include "project/components/map/iframe_map.html" with src=map_url title="Carte artificialisation des communes du territoire sur la période (en ha)" %}
</div>
</div>

<div class="fr-notice bg-white fr-mt-4w">
<div class="fr-px-2w">
Expand Down Expand Up @@ -329,6 +327,15 @@ <h6 class="fr-mt-2w">Données</h6>
</div>
</div>
</div>

<div class="fr-grid-row fr-grid-row--gutters fr-mt-2w">
<div class="fr-col-12">
<div class="bg-white fr-p-2w">
{% url 'project:theme-city-artif' project.pk as map_url %}
{% include "project/components/map/iframe_map.html" with src=map_url title="Carte artificialisation des communes du territoire sur la période (en %)" %}
</div>
</div>
</div>
</div>
{% endif %}

Expand Down
19 changes: 11 additions & 8 deletions project/templates/project/components/dashboard/consommation.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@ <h3 id="conso-annuelle">Consommation d'espace annuelle sur le territoire</h3>
</div>
</div>
</div>
{% if not is_commune %}
<div class="fr-grid-row fr-grid-row--gutters fr-mt-2w">
<div class="fr-col-12">
{% url 'project:theme-city-conso' project.pk as map_url %}
{% include "project/components/map/iframe_map.html" with src=map_url title="ECarte consommation d'espaces des communes du territoire sur la période (en ha)" %}
</div>
</div>
{% endif %}

<div class="fr-notice bg-white fr-mt-2w">
<div class="fr-px-2w">
Expand Down Expand Up @@ -87,6 +79,17 @@ <h6 class="fr-mt-2w">Données</h6>
</div>
</div>
</div>

{% if not is_commune %}
<div class="fr-grid-row fr-grid-row--gutters fr-mt-2w">
<div class="fr-col-12">
<div class="bg-white fr-p-2w">
{% url 'project:theme-city-conso' project.pk as map_url %}
{% include "project/components/map/iframe_map.html" with src=map_url title="Carte consommation d'espaces des communes du territoire sur la période (en %)" %}
</div>
</div>
</div>
{% endif %}
</div>

<div class="fr-mt-7w">
Expand Down
7 changes: 2 additions & 5 deletions project/templates/project/components/dashboard/gpu.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,11 @@ <h6 class="fr-mt-2w">Calcul</h6>
</div>
</div>

<h3>Explorateur</h3>


<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col-12">
<div class="bg-white fr-p-2w h-100">
<div class="bg-white fr-p-2w">
{% url 'project:map-urban-zones' project.pk as map_url %}
{% include "project/components/map/iframe_map.html" with src=map_url title="Explorateur des zonages d'urbanisme" height='75vh' %}
{% include "project/components/map/iframe_map.html" with src=map_url title="Carte explorateur des zonages d'urbanisme" height='75vh' %}
</div>
</div>
</div>
1 change: 1 addition & 0 deletions project/templates/project/components/map/iframe_map.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<h6 class="fr-mt-2w">{{ title }}</h6>
<iframe
title="{{ title }}"
style="height:{{ height|default:'60vh' }}"
Expand Down
22 changes: 0 additions & 22 deletions project/templates/project/components/widgets/static_map.html

This file was deleted.

Loading