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.

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

Jump to bottom

Titre simu sur une ligne partout #423

Merged
merged 3 commits into from
Sep 30, 2024
+115 −110
Merged

Titre simu sur une ligne partout #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7965e55
extract title from container
pyDez Sep 25, 2024
8b5dcd8
max width
pyDez Sep 30, 2024
2570ad9
Merge remote-tracking branch 'origin/main' into feature/display-title
pyDez Sep 30, 2024
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
5 changes: 5 additions & 0 deletions envergo/static/sass/project.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1853,6 +1853,11 @@ main.demonstrateur_2150 {
}
}

#moulinette-title {
max-width: 700px;
margin: 1.5rem auto;
}

#moulinette-submit-button {
min-width: 8em;
}
118 changes: 64 additions & 54 deletions envergo/templates/amenagement/moulinette/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,63 +1,73 @@
{% load utils %}

{% if display_title %}<h1 class="fr-h2 centered">Simulez votre projet en phase amont !</h1>{% endif %}

<form class="fr-mb-3w"
method="post"
novalidate
autocomplete="off"
action="{% url "moulinette_result" %}"
id="moulinette-form">
{% csrf_token %}

{% include '_form_header.html' with form=form %}

<div id="form-section-coords" class="form-section">

{{ form.lng.as_hidden }}
{{ form.lat.as_hidden }}

{% include '_field_snippet.html' with field=form.address %}

<div class="fr-input-group fr-input-group-map">
<label class="step">
Double-cliquez ou déplacez le marqueur sur la carte pour ajuster
l'emplacement du projet.
</label>
<figure class="fr-content-media">
<div id="map-container" class="ratio-16x9 fr-mt-1w fr-mb-2w fr-raw-link">
<div class="ratio-content">
<div class="leaflet-container">
<div id="map"></div>
</div>
{% if display_title %}
<h1 id="moulinette-title" class="fr-h2 centered">Simulez votre projet en phase amont !</h1>
{% endif %}

<div id="moulinette-grid">
<div id="moulinette-col" class="fr-col">
<div id="moulinette" class="moulinette">
<form class="fr-mb-3w"
method="post"
novalidate
autocomplete="off"
action="{% url "moulinette_result" %}"
id="moulinette-form">
{% csrf_token %}

{% include '_form_header.html' with form=form %}

<div id="form-section-coords" class="form-section">

{{ form.lng.as_hidden }}
{{ form.lat.as_hidden }}

{% include '_field_snippet.html' with field=form.address %}

<div class="fr-input-group fr-input-group-map">
<label class="step">
Double-cliquez ou déplacez le marqueur sur la carte pour ajuster
l'emplacement du projet.
</label>
<figure class="fr-content-media">
<div id="map-container" class="ratio-16x9 fr-mt-1w fr-mb-2w fr-raw-link">
<div class="ratio-content">
<div class="leaflet-container">
<div id="map"></div>
</div>
</div>
</div>
</figure>

{% if form.lat.errors or form.lng.errors %}
<p class="fr-error-text">
↑
Les coordonnées saisies sont incorrectes
↑
</p>

{% endif %}
</div>
</div>
</figure>

{% if form.lat.errors or form.lng.errors %}
<p class="fr-error-text">
↑
Les coordonnées saisies sont incorrectes
↑
</p>
<div id="form-section-surface" class="form-section">
<div class="fr-mb-3w">
<label class="step">Complétez les informations décrivant le projet</label>
</div>
<p class="hint-header">
<span class="fr-icon-info-fill" aria-hidden="true"></span>
Surfaces à prendre en compte : bâti, voirie, espaces verts, remblais et bassins — impacts définitifs et
temporaires (travaux).
</p>
{% include '_field_snippet.html' with field=form.created_surface %}
{% include '_field_snippet.html' with field=form.final_surface %}
</div>

{% endif %}
</div>
</div>
{% include 'amenagement/moulinette/_form_footer.html' %}
</form>

{% include 'amenagement/moulinette/_form_help_sidebars.html' %}

<div id="form-section-surface" class="form-section">
<div class="fr-mb-3w">
<label class="step">Complétez les informations décrivant le projet</label>
</div>
<p class="hint-header">
<span class="fr-icon-info-fill" aria-hidden="true"></span>
Surfaces à prendre en compte : bâti, voirie, espaces verts, remblais et bassins — impacts définitifs et temporaires (travaux).
</p>
{% include '_field_snippet.html' with field=form.created_surface %}
{% include '_field_snippet.html' with field=form.final_surface %}
</div>

{% include 'amenagement/moulinette/_form_footer.html' %}
</form>

{% include 'amenagement/moulinette/_form_help_sidebars.html' %}
</div>
8 changes: 1 addition & 7 deletions envergo/templates/amenagement/pages/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,7 @@ <h2>
</section>

<section id="simulateur" class="fr-pt-8w fr-pb-5w">
<div class="fr-container">
<div id="moulinette-grid">
<div id="moulinette-col">
<div id="moulinette" class="moulinette">{% show_moulinette_form %}</div>
</div>
</div>
</div>
<div class="fr-container">{% show_moulinette_form %}</div>
</section>

{% endblock %}
Expand Down
9 changes: 0 additions & 9 deletions envergo/templates/haie/moulinette/_form_header.html
View file
Open in desktop

This file was deleted.

53 changes: 35 additions & 18 deletions envergo/templates/haie/moulinette/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,42 @@
{% load utils %}

{% include 'haie/moulinette/_form_header.html' %}
{% if display_title %}
<h2 id="moulinette-title" class="centered">Commencez à décrire votre projet de travaux sur haies</h2>
{% endif %}
<div id="moulinette-grid">
<div id="moulinette-col" class="fr-col">
<div id="moulinette" class="moulinette">
{% if display_title %}
<p class="fr-text--lead">
Ce simulateur vous permet de connaître instantanément les autorisations à obtenir de l’administration, les
procédures et les délais.
Il est anonyme et sans création de compte.
Département : Indre (36)
</p>
<p class="fr-text--light">Tous les champs sont obligatoires.</p>
{% endif %}
<form class="fr-mb-3w"
method="post"
novalidate
autocomplete="off"
action="{% url 'moulinette_result' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
id="moulinette-form">
{% csrf_token %}

<form class="fr-mb-3w"
method="post"
novalidate
autocomplete="off"
action="{% url 'moulinette_result' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
id="moulinette-form">
{% csrf_token %}
{% include '_form_header.html' with form=form %}

{% include '_form_header.html' with form=form %}
<!-- Include current query parameters as hidden fields to keep Triage inputs -->
{% for key, value in request.GET.items %}<input type="hidden" name="{{ key }}" value="{{ value }}">{% endfor %}

<!-- Include current query parameters as hidden fields to keep Triage inputs -->
{% for key, value in request.GET.items %}<input type="hidden" name="{{ key }}" value="{{ value }}">{% endfor %}
<div class="form-section">
{% include '_radio_snippet.html' with field=form.profil %}
{% include '_radio_snippet.html' with field=form.motif %}
{% include '_radio_snippet.html' with field=form.reimplantation %}
</div>

<div class="form-section">
{% include '_radio_snippet.html' with field=form.profil %}
{% include '_radio_snippet.html' with field=form.motif %}
{% include '_radio_snippet.html' with field=form.reimplantation %}
</div>
{% include 'haie/moulinette/_form_footer.html' %}
</form>

{% include 'haie/moulinette/_form_footer.html' %}
</form>
</div>
</div>
</div>
10 changes: 7 additions & 3 deletions envergo/templates/haie/moulinette/triage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@
<div id="moulinette-grid">
<div id="moulinette-col" class="fr-col">
<div id="triage">

<h2 id="moulinette-title" class="centered">Commencez à décrire votre projet de travaux sur haies</h2>
<p class="fr-text--lead">
Ce simulateur vous permet de connaître instantanément les autorisations à obtenir de l’administration, les procédures et les délais.
Il est anonyme et sans création de compte.
Département : Indre (36)
</p>
<p class="fr-text--light">Tous les champs sont obligatoires.</p>
<form class="fr-mb-3w" method="post" novalidate>

{% csrf_token %}
{{ form.department.as_hidden }}
{% include 'haie/moulinette/_form_header.html' with display_title=True %}

{% include '_radio_snippet.html' with field=form.element %}
{% include '_radio_snippet.html' with field=form.travaux %}

Expand Down
8 changes: 1 addition & 7 deletions envergo/templates/haie/pages/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,7 @@ <h2 class="fr-h6">Quels types de projets ce simulateur couvre-t-il actuellement
</section>

<section id="simulateur" class="fr-pt-8w fr-pb-5w">
<div class="fr-container">
<div id="moulinette-grid">
<div id="moulinette-col">
<div id="moulinette" class="moulinette">{% show_moulinette_form %}</div>
</div>
</div>
</div>
<div class="fr-container">{% show_moulinette_form %}</div>
</section>
{% endblock %}

Expand Down
6 changes: 1 addition & 5 deletions envergo/templates/moulinette/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@
{% block main-classes %}contrast-bg{% endblock %}

{% block content %}
<div id="moulinette-grid">
<div id="moulinette-col" class="fr-col">
<div id="moulinette" class="moulinette">{% show_moulinette_form %}</div>
</div>
</div>
{% show_moulinette_form %}
{% endblock %}
8 changes: 1 addition & 7 deletions envergo/templates/pages/geometricians.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,7 @@ <h2>{{ title }}</h2>
</section>

<section id="simulateur" class="fr-pt-8w fr-pb-5w">
<div class="fr-container">
<div id="moulinette-grid">
<div id="moulinette-col">
<div id="moulinette" class="moulinette">{% show_moulinette_form %}</div>
</div>
</div>
</div>
<div class="fr-container">{% show_moulinette_form %}</div>
</section>

<section class="fr-container fr-pt-8w fr-pb-5w">
Expand Down
Loading