Merge branch 'main' into wip/73285-toulouse-2022-maelis-enfant-agenda

static/dataview.js

@@ -1,6 +0,0 @@
-$(function() {
-  $('.section.foldable h2').click(function() {
-    $(this).parent('.section').toggleClass('folded');
-    $('.qommon-map').trigger('qommon:invalidate');
-  });
-});

static/lille-metropole-2022/_custom.scss

@@ -379,7 +379,7 @@ li.external-link, li.is-redirection {
 }
 
 /* customize upload color */
-div.file-upload-widget div.file-button div.widget-message::after {
+div.file-upload-widget div.file-button div.widget-message.upload-done::after {
 	color: green;
 }
 

static/montpellier-ville/_chantiers.scss

@@ -0,0 +1,85 @@
+$cell-map-height: calc(100vh - 265px);
+$cell-map-mobile-height: calc(100vh - 108px);
+
+.page-template-roadworks-map {
+	#main-content {
+		min-height: auto;
+	}
+	#main-content, #columns-wrapper {
+		padding: 0;
+		overflow: hidden;
+		position: relative;
+	}
+	div.combo-cell-map.leaflet-container {
+		height: $cell-map-height;
+	}
+	@media ($max-mobile-viewport) {
+		footer {
+			display: none;
+		}
+		div.combo-cell-map.leaflet-container {
+			height: $cell-map-mobile-height;
+		}
+		&.has-pwa-navigation div.combo-cell-map.leaflet-container {
+			height: calc(#{$cell-map-mobile-height} - 64px);
+		}
+	}
+	div.cell {
+		margin-bottom: 0;
+	}
+	div.config-json-cell {
+		border: none;
+	}
+}
+
+.chantier {
+	position: absolute;
+	border: $cell-border;
+	background: $cell-background;
+	right: 0;
+	top: 0;
+	z-index: 100000;
+	height: calc(#{$cell-map-height} + 2px);
+	overflow-x: hidden;
+	overflow-y: scroll;
+	width: 25vw;
+	transform: translateX(25vw);
+	transition: transform linear 250ms;
+	padding: 1em;
+	h3 {
+		@extend %title;
+		padding: 0;
+		margin-bottom: 0.5em;
+	}
+	p {
+		margin: 0.5em 0;
+		&.chantier--localisations {
+			font-size: 105%;
+			@media ($max-mobile-viewport) {
+				font-size: 100%;
+			}
+		}
+	}
+	.chantier--dates {
+		font-size: 80%;
+	}
+	.chantier--libelle {
+		display: block;
+		color: #333;
+	}
+	&.shown {
+		transform: translateX(0vw);
+	}
+	@media ($max-mobile-viewport) {
+		top: unset;
+		right: unset;
+		bottom: 0;
+		width: 100vw;
+		height: 250px;
+		max-height: calc(100vh - 180px);
+		transform: translateY(250px);
+		&.shown {
+			transform: translateY(0px);
+		}
+	}
+}

static/montpellier-ville/_custom.scss

@@ -1,3 +1,5 @@
+@import 'chantiers';
+
 // page picture
 body {
 	background-color: $blue-light;

static/montpellier-ville/config.json

@@ -11,6 +11,33 @@
         "header:logo": { "label": "Têtière : logo" },
         "emails:logo": {"label": "Emails : logo"},
         "page:background" : {"label": "Page : image d'arrière plan"}
+      },
+      "COMBO_PUBLIC_TEMPLATES.update": {
+        "roadworks-map": {
+          "name": "Une colonne (spéciale carte travaux)",
+          "template": "combo/page_template.html"
+        }
+      },
+      "JSON_CELL_TYPES.update": {
+        "chantiers-genants": {
+          "cache_duration": 3600,
+          "force_async": false,
+          "name": "Chantiers gênants",
+          "url": "{{url}}",
+          "form": [
+            {"label": "Adresse du GEOJSON des chantiers gênants", "varname": "url", "required": true}
+          ]
+        },
+        "chantiers-majeurs": {
+          "cache_duration": 3600,
+          "force_async": false,
+          "name": "Chantiers majeurs",
+          "url": "{{url}}",
+          "form": [
+            {"label": "Adresse de récupération des fiches des chantiers majeurs", "varname": "url", "required": true}
+          ]
+        }
+
       }
     }
   }

static/montpellier-ville/extra.js

@@ -0,0 +1,17 @@
+$(function() {
+  $('.page-template-roadworks-map div.cell.map').on('combo:map-feature-prepare', function(ev, info) {
+    info.layer.on('click', function(ev) {
+      var marker = info.layer;
+      var chantier_id = marker.feature.properties.IDCHANTIER || marker.feature.properties.id;
+      var $cell = $('[data-chantier-id=' + chantier_id + ']');
+      if ($cell.hasClass('shown')) {
+        $('.chantier').removeClass('shown');
+      } else {
+        $('.chantier[data-chantier-id!=' + chantier_id + ']').removeClass('shown');
+        $('.chantier').show();
+        $cell.addClass('shown');
+      }
+    });
+  });
+  $('.chantier').on('click', function() { $(this).toggleClass('shown'); });
+});

static/rochefort-agglo/_vars.scss

@@ -23,4 +23,4 @@ $title-padding: 1ex 1ex 1ex 0;
 $title-weight: normal;
 $cell-background: #E7F0F6;
 $footer-color: #333;
-$buttons-order: previous, cancel (grow), submit;
+$buttons-order: previous (grow), cancel (grow), submit;

templates/variants/fontenay-sous-bois-2018/theme.html

@@ -3,7 +3,7 @@
 
 {% block header-pre %}
   <div id="header-pre"><div>
-    <a id="logo-ville" href="{{website_url}}"><img width="165" height="78" src="{{ site_base }}{% static 'fontenay-sous-bois-2018/img/logo-fontenay.png' %}" alt="fontenay-sous-bois.fr"/></a>
+    <a id="logo-ville" href="{{website_url}}"><img width="243" height="77" src="{{ site_base }}{% static 'fontenay-sous-bois-2018/img/logo-fontenay.png' %}" alt="fontenay-sous-bois.fr"/></a>
     <a id="home-link" href="{{portal_url}}">Mes démarches</a>
   </div></div>
 {% endblock %}

templates/variants/montpellier-ville/combo/json/chantiers-genants.html

@@ -0,0 +1,27 @@
+{% for feature in json.features %}
+<div class="chantier" data-chantier-id="{{feature.properties.IDCHANTIER}}" style="display: none">
+<h3>{{ feature.properties.TYPE }}<br>
+<span class="chantier--dates">
+{% with year=feature.properties.DEBUT|slice:":4" month=feature.properties.DEBUT|slice:"4:6" day=feature.properties.DEBUT|slice:"6:8" %}
+{% with date=year|add:"-"|add:month|add:"-"|add:day|date %}
+du {{date}}
+{%endwith %}
+{% endwith %}
+{% with year=feature.properties.FIN|slice:":4" month=feature.properties.FIN|slice:"4:6" day=feature.properties.FIN|slice:"6:8" %}
+{% with date=year|add:"-"|add:month|add:"-"|add:day|date %}
+au {{date}}
+{%endwith %}
+{%endwith %}
+</span>
+</h3>
+<div>
+<p class="chantier--localisations">{{ feature.properties.LOCALISATIONS|safe }}</p>
+
+{% if feature.properties.INCIDENCE_CIRCULATION %}<p><span class="chantier--libelle">Incidence circulation :</span> {{feature.properties.INCIDENCE_CIRCULATION}}</p>{% endif %}
+{% if feature.properties.INCIDENCE_STATIONNEMENT %}<p><span class="chantier--libelle">Incidence sur le stationnement :</span> {{feature.properties.INCIDENCE_STATIONNEMENT}}</p>{% endif %}
+{% if feature.properties.NATURE %}<p><span class="chantier--libelle">Nature :</span> {{feature.properties.NATURE }}</p>{% endif %}
+{% if feature.properties.MOUVRAGE %}<p><span class="chantier--libelle">Maîtrise d’ouvrage :</span> {{feature.properties.MOUVRAGE }}</p>{% endif %}
+
+</div>
+</div>
+{% endfor %}

templates/variants/montpellier-ville/combo/json/chantiers-majeurs.html

@@ -0,0 +1,26 @@
+{% for feature in json.data %}
+<div class="chantier" data-chantier-id="{{feature.display_id}}" style="display: none">
+<h3>{{ feature.fields.chantier }}<br>
+<span class="chantier--dates">
+{% with date=feature.fields.debutchantier|date %}
+du {{date}}
+{% endwith %}
+{% with date=feature.fields.finchantier|date %}
+au {{date}}
+{% endwith %}
+</span>
+</h3>
+<div>
+<p class="chantier--localisations">{{ feature.fields.numero|default:"" }} {{ feature.fields.rue }}, {{ feature.fields.commune }}</p>
+
+<p>{{feature.fields.descriptifchantier|safe}}</p>
+
+{% if feature.fields.contacts %}<p><span class="chantier--libelle">Contacts :</span> {{feature.fields.contacts }}</p>{% endif %}
+{% if feature.fields.categoriechantier %}<p><span class="chantier--libelle">Catégorie :</span> {{feature.fields.categoriechantier }}</p>{% endif %}
+{% if feature.fields.emploisgeneres %}<p><span class="chantier--libelle">Emplois générés :</span> {{feature.fields.emploisgeneres }}</p>{% endif %}
+{% if feature.fields.montanttravaux %}<p><span class="chantier--libelle">Montant des travaux :</span> {{feature.fields.montanttravaux }}</p>{% endif %}
+
+{% if feature.fields.url %}<p><a class="pk-button" href="{{ feature.fields.url }}">Plus d’infos</a></p>{% endif %}
+</div>
+</div>
+{% endfor %}

templates/variants/pre-saint-gervais/wcs/base.html

@@ -3,7 +3,6 @@
 
 {% block extra-top-head %}
   {{script|safe}}
-  <script src="{% static 'dataview.js' %}"></script>
 {% endblock %}
 
 {% block extra-body-class %}

templates/variants/rouen/wcs/base.html

@@ -3,7 +3,6 @@
 
 {% block extra-top-head %}
   {{script|safe}}
-  <script src="{% static 'dataview.js' %}"></script>
 {% endblock %}
 
 {% block extra-body-class %}

templates/variants/toodego/wcs/base.html

@@ -3,7 +3,6 @@
 
 {% block extra-top-head %}
   {{script|safe}}
-  <script src="{% static 'dataview.js' %}"></script>
 {% endblock %}
 
 {% block extra-body-class %}

templates/variants/toulouse-metropole/wcs/base.html

@@ -3,7 +3,6 @@
 
 {% block extra-top-head %}
   {{script|safe}}
-  <script src="{% static 'dataview.js' %}"></script>
 {% endblock %}
 
 {% block extra-body-class %}

templates/variants/toulouse/wcs/base.html

@@ -3,7 +3,6 @@
 
 {% block extra-top-head %}
   {{script|safe}}
-  <script src="{% static 'dataview.js' %}"></script>
 {% endblock %}
 
 {% block extra-body-class %}

templates/wcs/base.html

@@ -3,7 +3,6 @@
 
 {% block extra-top-head %}
   {{script|safe}}
-  <script src="{% static 'dataview.js' %}"></script>
 {% endblock %}
 
 {% block extra-body-class %}