toulouse-2022: [parsifal] use catalog cell in backoffice too (#86843)

static/bouches-du-rhone/config.json

@@ -298,6 +298,36 @@
                "url" : "{{ passerelle_url }}rsa13/{% firstof slug rsa13_slug \"rsa\" %}/platform/{{ plateforme_id }}/beneficiaire/{{ brsa_id }}/transport/?email={{ user_email }}&ip={{ request.META.REMOTE_ADDR }}",
                "varnames" : []
             },
+            "rsa13-beneficiaire-evenement" : {
+               "cache_duration" : 0,
+               "force_async" : true,
+               "form" : [
+                  {
+                     "label" : "Identifiant du connecteur",
+                     "required" : false,
+                     "varname" : "slug"
+                  }
+               ],
+               "log_errors" : false,
+               "name" : "RSA Extranet : bénéficiaire - évènement",
+               "url" : "{{ passerelle_url }}rsa13/{% firstof slug rsa13_slug \"rsa\" %}/platform/{{ plateforme_id }}/beneficiaire/{{ brsa_id }}/evenement/{{ evenement_id }}/?email={{ user_email }}&ip={{ request.META.REMOTE_ADDR }}",
+               "varnames" : []
+            },
+            "rsa13-beneficiaire-evenements" : {
+               "cache_duration" : 0,
+               "force_async" : true,
+               "form" : [
+                  {
+                     "label" : "Identifiant du connecteur",
+                     "required" : false,
+                     "varname" : "slug"
+                  }
+               ],
+               "log_errors" : false,
+               "name" : "RSA Extranet : bénéficiaire - évènements",
+               "url" : "{{ passerelle_url }}rsa13/{% firstof slug rsa13_slug \"rsa\" %}/platform/{{ plateforme_id }}/beneficiaire/{{ brsa_id }}/evenement/?email={{ user_email }}&ip={{ request.META.REMOTE_ADDR }}",
+               "varnames" : []
+            },
             "rsa13-coordinateurs" : {
                "additional-data" : [
                   {

static/caen/_custom.scss

@@ -94,20 +94,18 @@ label {
 }
 
 %cancel-button {
-	&, &:hover {
-		padding: 1.1em 2em 1em;
-		background-color: #fff;
-		color: black;
-		border-color: $gray;
-	}
+	--background: #fff;
+	--color: black;
+	padding: 1.1em 2em 1em;
+	border-color: $gray;
 }
 
 %orange-button {
-	@extend %cancel-button;
-	&, &:hover {
-		background-color: $orange !important;
-		border-color: $orange;
-	}
+	padding: 1.1em 2em 1em;
+	--color: black;
+	--background: #{$orange};
+	--hover-background: #{$orange};
+	border-color: $orange;
 }
 	
 //
@@ -492,7 +490,7 @@ $topmessage-alt :
 	}
 }
 
-div.tracking-code-input-cell {
+.gru-content div.tracking-code-input-cell {
 	@extend .cell-with-dash;
 	@extend .cell-blue;
 	p {
@@ -507,20 +505,20 @@ div.tracking-code-input-cell {
 		display: flex;
 		flex-wrap: wrap;
 		align-items: stretch;
-	}
-	input.tracking-code--input {
-		flex: 1 1 0;
-		margin: 0;
-		min-width: 8em;
-	}
-	button {
-		margin-right: 0;
-		border-radius: 3px;
-		margin-left: 0.25em;
-		&:hover {
-			background: $orange;
-			color: black;
-			box-shadow: none;
+		input.tracking-code--input {
+			flex: 1 1 0;
+			margin: 0;
+			min-width: 8em;
+		}
+		button {
+			@extend %button;
+			--hover-background: #{$orange};
+			margin-right: 0;
+			border-radius: 3px;
+			margin-left: 0.25em;
+			&:hover {
+				box-shadow: none;
+			}
 		}
 	}
 	&.cell h2 + div {
@@ -619,10 +617,6 @@ div#rub_service {
 	}
 }
 
-div.gru-content .submit-button button,
-div.gru-content button.submit-button  {
-	@extend %orange-button;
-}
 div.gru-content .previous-button button {
 	@extend %cancel-button;
 }

static/caen/_vars.scss

@@ -68,6 +68,7 @@ $button-background: black;
 $buttons-order: cancel (grow), previous, submit;
 $button-hover-color: black;
 $button-hover-background: white;
+$submit-button-style: "%orange-button";
 
 $form-sidebar-gutter: $columns-gutter;
 $form-sidebar-width: 25.5%;

static/cnil-2023/_custom.scss

@@ -395,6 +395,7 @@ div.cell.foldable > div > h2:first-child {
 			margin-top: 0;
 		}	
 		button {
+			@extend %button;
 			vertical-align: baseline;
 			margin-bottom: 1rem;
 		}

static/includes/_layout.scss

@@ -205,10 +205,13 @@ body.pk-mini-page {
 		background: white;
 		max-width: 30em;
 		margin: 4em auto;
-		padding: 1em;
+		padding: 0em;
 		text-align: center;
 		border-bottom: 5px solid var(--primary-color);
 	}
+	.pk-mini-page--content {
+		padding: 1em
+	}
 	.loader {
 		margin: 2em auto;
 		width: 40px;

static/includes/wcs/_bulk.scss

@@ -539,22 +539,19 @@ div.file-upload-widget {
 			font-size: 0;
 			cursor: pointer;
 		}
-		div.upload-done {
-			display: none;
-		}
-		div.click-to-upload {
-			display: block;
-		}
 		div.widget-message {
 			padding-top: 20px;
 			&::before {
 				pointer-events: none;
-				content: "\f016";  // file-o
 				font-family: FontAwesome;
+				content: "\f016";  // file-o
+				box-sizing: content-box;
 				font-size: 40px;
+				height: 1em;
 				display: block;
-				padding-top: 20px;
-				padding-bottom: 10px;
+				margin-top: 10px;
+				margin-bottom: 10px;
+				line-height: 1;
 			}
 			&::after {
 				pointer-events: none;
@@ -564,7 +561,8 @@ div.file-upload-widget {
 				display: block;
 				position: absolute;
 				left: calc(50% + 10px);
-				top: 30px;
+				top: 20px;
+				line-height: 1;
 				@if ($button-background == $widget-background) {
 					color: $button-color;
 				} @else {
@@ -578,13 +576,35 @@ div.file-upload-widget {
 		&.file-image div.widget-message::before {
 			content: "\f1c5";  // file-image-o
 		}
+		&.file-image div.upload-done {
+			background-color: $zebra-color;
+			padding-top: 10px;
+			&::before {
+				content: "";
+				background-image: var(--image-preview-url);
+				background-repeat: no-repeat;
+				background-size: contain;
+				background-position: center;
+				font-size: 80px;
+				margin-top: 0;
+				margin-bottom: 0;
+
+			}
+			&::after {
+				content: none;
+			}
+		}
 	}
 	&.has-file {
 		div.file-button {
-			div.upload-done {
-				display: block;
+			.widget-message.click-to-upload {
+				display: none;
 			}
-			div.click-to-upload {
+		}
+	}
+	&.has-no-file {
+		div.file-button {
+			.widget-message.upload-done {
 				display: none;
 			}
 		}
@@ -642,28 +662,44 @@ div.file-upload-widget {
 	&.pk-compact-file,
 	&.short {
 		div.file-button {
-			min-height: 50px;
-		}
-		div.widget-message.click-to-upload {
-			display: flex;
-		}
-		div.widget-message.upload-done,
-		div.widget-message.click-to-upload {
-			align-items: center;
-			padding: 5px 10px;
-			text-align: left;
-			&::before {
-				padding-top: 10px;
-				padding-right: 20px;
+			min-height: 70px;
+			div.widget-message {
+				display: flex;
+				align-items: center;
+				padding: 5px 10px;
+				text-align: left;
+				&::before {
+					margin-right: 20px;
+					font-size: 40px;
+				}
+				&::after {
+					top: 5px;
+					left: 38px;
+				}
 			}
-			&::after {
-				top: 2px;
-				left: 38px;
+			div.fileinfo {
+				text-align: left;
+				padding-left: 55px;
+				min-height: 1.5em;
+				margin-top: -1.5em;
 			}
+			&.file-image {
+				div.widget-message.upload-done {
+					padding-top: 5px;
+					&::before {
+						width: 2em;
+						font-size: 60px;
+						margin-top: 0;
+					}
+				}	
+				div.fileinfo {
+					padding-left: 140px;
+				}
+			} 
 		}
 		&.widget-readonly div.file-button {
 			height: 70px;
-			div.widget-message.upload-done {
+			div.widget-message {
 				display: none;
 			}
 			.filename {
@@ -681,17 +717,6 @@ div.file-upload-widget {
 				margin-top: 0;
 			}
 		}
-		&.has-file {
-			div.widget-message.upload-done {
-				display: flex;
-			}
-		}
-		div.fileinfo {
-			text-align: left;
-			padding-left: 55px;
-			min-height: 1.5em;
-			margin-top: -1.5em;
-		}
 	}
 	div.fileprogress {
 		position: absolute;

static/montpellier-2023/_custom.scss

@@ -330,6 +330,11 @@ div#main-content {
 //	CELLS
 //
 
+%cell {
+	&:not(.pk-information, .pk-attention, .pk-error, .pk-success) {
+		padding: 0.5em;
+	}
+}
 // Links list
 %cell-links-list {
 	& > li {
@@ -748,6 +753,11 @@ label {
 		transform: scale(1.4);
 		transform-origin: left;
 	}
+	// change default map size
+	div.qommon-map {
+		height: 450px;
+		max-height: calc(100vh - #{$nav-mobile-bottom-bar-height * 2});
+	}
 }
 .previous-button button {
 	@extend %gray-button;

static/montpellier-2023/config.json

@@ -15,13 +15,14 @@
       },
       "JSON_CELL_TYPES.update" : {
         "montpellier_reporting_links" : {
-          "name" : "Liste de liens signalements",
+          "name" : "Liste de liens fiches",
           "url" : "{{eservices_url}}api/cards/{{cards_id}}/list/{{list_filter}}?full=on",
           "form": [
             {
               "varname": "cell_title",
               "type": "string",
-              "label": "Titre de la cellule"
+              "label": "Titre de la cellule",
+              "required": false
             },
             {
               "varname": "cell_desc",

static/sables-d-olonne-2022/_custom.scss

@@ -379,6 +379,10 @@ div.gru-nav {
 			background-position: 95% 50%;
 			background-repeat: no-repeat;
 			padding-right: 1.75em;
+			&:not(:hover) {
+				background-color: #{$button-background};
+				color: #{$button-color};
+			}
 			&:hover {
 				background-image: url('img/fleche-hover.svg');
 			}

static/toodego/_forms.scss

@@ -9,6 +9,7 @@ div.file-upload-widget {
 		}
 	}
 	&.has-file div.file-button {
+		background-image:  linear-gradient(rgba(250, 250, 250, 0.8), rgba(250, 250, 250, 0.8)), var(--image-preview-url);
 		background-size: contain;
 	}
 	div.file-button.file-image {
@@ -19,15 +20,15 @@ div.file-upload-widget {
 			&::before {
 				content: "";
 				background: url(img/photo-add.png) 50% 0px no-repeat;
-				box-sizing: content-box;
-				height: 40px;
+				height: 70px;
+			}
+			&.upload-done {
+				background-color: transparent;
+				padding-top: 30px;
 			}
 		}
 	}
 	&.has-file div.file-button.file-image {
-		div.widget-message {
-			background: rgba(250, 250, 250, 0.8);
-		}
 		div.widget-message::before {
 			background-image: url(img/photo-done.png);
 		}
@@ -40,9 +41,6 @@ div.file-upload-widget {
 			background: $red;
 		}
 	}
-	div.fileinfo {
-		background: rgba(250, 250, 250, 0.8);
-	}
 }
 div.xtemplate-photo {
 	div.hint {

static/toodego/extra.js

@@ -898,18 +898,6 @@ $(function() {
     $('div.buttons div.cancel-button button').text('Continuer').css('margin-right', '0');
   }
 
-  /* photo upload, add a preview */
-  $('.file-button.file-image').on('wcs:image-blob', function(ev, file) {
-    var $widget = $(this);
-    if (file) {
-      var reader = new FileReader();
-      reader.onload = function(e) {
-        $widget[0].style.backgroundImage = 'url(' + e.target.result + ')';
-      }
-      reader.readAsDataURL(file);
-    }
-  });
-
   /* custom checkboxes intertitles for publik notification */
   $('.template-pn-thematiques').each(function(idx, elem) {
     const titles = Array();

static/toulouse-2022/backoffice.scss

@@ -1 +1,22 @@
+$cell-close-foldable-icon: "\f106";
+$cell-open-foldable-icon: "\f107";
+$cell-entry-border: 1px solid #ccc;
+$cell-entry-border-color: #ccc;
+$mobile-limit: 760px;
+$max-mobile-viewport: "max-width: #{$mobile-limit}";
+$min-desktop-viewport: "min-width: #{$mobile-limit + 1}";
+$title-color: #161c2a;
+$title-font-size: 200%;
+$very-small-limit: 560px;
+
+.cancel-button {}
+.cell-items-pagination {}
+
 @import 'encombrants';
+@import 'json_cells';
+
+.theme-activities {
+    &--item-label {
+	padding-right: 0
+    }
+};

templates/mini-base.html

@@ -20,7 +20,13 @@
   </head>
   <body class="pk-mini-page">
     <main>
-      {% block content %}
+      {% block content-top %}
+      {% endblock %}
+      <div class="pk-mini-page--content">
+        {% block content %}
+        {% endblock %}
+      </div>
+      {% block content-bottom %}
       {% endblock %}
     </main>
   </body>

templates/qommon/forms/widgets/nearby-forms.html

@@ -16,9 +16,7 @@
       {% endlocalize %}
     ></div>
     {% block list-header %}
-      <h3>Si votre signalement figure dans la liste ci-dessous, cliquez sur le
-        bouton +1. Dans le cas contraire, poursuivez votre demande.
-      </h3>
+      <h3>{{ nearby_forms_intro_text|default:"Si votre signalement figure dans la liste ci-dessous, cliquez sur le bouton +1. Dans le cas contraire, poursuivez votre demande." }}</h3>
     {% endblock %}
     <ul class="nearby-forms">
       {% with distance=global_context.form_option_distance|default:100|add:50 %}

templates/variants/bouches-du-rhone/combo/json/rsa13-beneficiaire-evenement.html

@@ -0,0 +1,39 @@
+{% load combo i18n %}
+
+{% if json.data and not json.err %}
+  {% with json.data as data %}
+
+    <h2>Évènement</h2>
+    <div class="cell--body">
+
+      <div class="grid-1-2">
+        <p><a href="{{ eservices_url }}extranet-rsa/modification-d-un-evenement/?plateforme={{ plateforme_id }}&brsa={{ brsa_id }}&evenement={{ data.id }}&cancelurl={{ portal_url }}portail-extranet-rsa/plateforme/{{ plateforme_id }}/beneficiaire-rsa/{{ brsa_id }}/evenements/evenement/{{ data.id }}/">✎ Modifier</a></p>
+      </div>
+      <div class="grid-1-2">
+        <p><a href="{{ eservices_url }}extranet-rsa/suppression-d-un-evenement/?plateforme={{ plateforme_id }}&brsa={{ brsa_id }}&evenement={{ data.id }}&cancelurl={{ portal_url }}portail-extranet-rsa/plateforme/{{ plateforme_id }}/beneficiaire-rsa/{{ brsa_id }}/evenements/evenement/{{ data.id }}/&next={{ portal_url }}portail-extranet-rsa/plateforme/{{ plateforme_id }}/beneficiaire-rsa/{{ brsa_id }}/evenements/">❌ Supprimer</a></p>
+      </div>
+
+      <div class="grid-1-1">
+        <p>Type : <strong>{{ data.type.text|default:"" }}</strong></p>
+        <p>Date : <strong>{{ data.datetime|date:"l d/m/Y H:i"|default:"" }}</strong></p>
+        <p>Durée : <strong>{{ data.duree|default:""|duration:"long" }}</strong></p>
+        <p>Nom : <strong>{{ data.nom|default:"" }}</strong></p>
+        <p>Lieu : <strong>{{ data.lieu|default:"" }}</strong></p>
+        <p>Type intervenant : <strong>{{ data.intervenant.type.text|default:"" }}</strong></p>
+        <p>Nom intervenant : <strong>{{ data.intervenant.text|default:"" }}</strong></p>
+        <p>Résultat : <strong>{{ data.resultat.text|default:"" }}</strong></p>
+      </div>
+
+      {% if data.commentaire %}
+        <div class="grid-1-1">
+          <div class="infonotice">
+            <p><strong>Commentaire</strong></p>
+            <p>{{ data.commentaire|linebreaks }}</p>
+          </div>
+        </div>
+      {% endif %}
+
+    </div>
+
+  {% endwith %}
+{% endif %}

templates/variants/bouches-du-rhone/combo/json/rsa13-beneficiaire-evenements.html

@@ -0,0 +1,44 @@
+{% load combo %}
+
+<h2>Évènements</h2>
+<div class="cell--body clearfix">
+  {% if json.data and not json.err %}
+
+    {% with json.data as data %}
+
+      <div class="grid-1-1">
+        <div class="pk-table-wrapper">
+          <table class="pk-data-table pk-table-headers pk-table-borders pk-table-zebra" style="width:100%;">
+            <tr>
+              <th></th>
+              <th>Date</th>
+              <th>Type</th>
+              <th>Nom</th>
+              <th>Type intervenant</th>
+              <th>Nom intervenant</th>
+              <th>Résultat</th>
+              <th></th>
+            </tr>
+            {% for evt in data %}
+              <tr>
+                <td><a href="evenement/{{ evt.id }}">🔎</a></td>
+                <td>{{ evt.datetime|date:"d/m/Y H:i"|default:"" }}</td>
+                <td>{{ evt.type|default:"" }}</td>
+                <td>{{ evt.text|default:"" }}</td>
+                <td>{{ evt.intervenant.type.text|default:"" }}</td>
+                <td>{{ evt.intervenant.text|default:"" }}</td>
+                <td>{{ evt.resultat|default:"" }}</td>
+                <td><a href="{{ eservices_url }}extranet-rsa/suppression-d-un-evenement/?plateforme={{ plateforme_id }}&brsa={{ brsa_id }}&evenement={{ evt.id }}&cancelurl={{ portal_url }}portail-extranet-rsa/plateforme/{{ plateforme_id }}/beneficiaire-rsa/{{ brsa_id }}/evenements/">❌</a></td>
+              </tr>
+            {% endfor %}
+          </table>
+        </div>
+      </div>
+
+    {% endwith %}
+
+  {% else %}
+    <p>Aucune information.</p>
+  {% endif %}
+
+</div>

templates/variants/bouches-du-rhone/combo/json/rsa13-menu-beneficiaire.html

@@ -2,6 +2,7 @@
 <div class="links-list">
   <ul>
     <li><a href="{{ from }}affectations/">Affectations</a></li>
+    <li><a href="{{ from }}evenements/">Évènements</a></li>
     <li><a href="{{ from }}contrats/">Contrats</a></li>
     <li><a href="{{ from }}actions/">Actions</a></li>
     <li><a href="{{ from }}transport/">Transport</a></li>

templates/variants/bouches-du-rhone/theme.html

@@ -3,6 +3,6 @@
 
 {% block header-pre %}
   <div id="header-pre"><div>
-    <a href="{{ portal_url }}"><img width="285" height="65" src="{{ site_base }}{% static 'bouches-du-rhone/img/logo-desktop.svg' %}" alt="Bouches du Rhône"/></a>
+    <a href="{% firstof logo_link_url portal_url '/' %}"><img width="285" height="65" src="{{ site_base }}{% static 'bouches-du-rhone/img/logo-desktop.svg' %}" alt="Bouches du Rhône"/></a>
   </div></div>
 {% endblock %}

templates/variants/braine-l-alleud/combo/page_template.html

@@ -5,3 +5,8 @@
   <link rel="stylesheet" href="https://use.typekit.net/vxm7rsn.css">
   {{ block.super }}
 {% endblock %}
+
+{% block extra_scripts %}
+  {{ block.super }}
+  {% if queuefair in "True true" %}<script data-queue-fair-client="imio" src="https://files.queue-fair.net/queue-fair-adapter.js"></script>{% endif %}
+{% endblock %}

templates/variants/montpellier-2023/combo/json/montpellier_reporting_links.html

@@ -1,10 +1,14 @@
-<h2 class="cell--title">
-  {{parameters.cell_title}}
-</h2>
+{% if parameters.cell_title %}
+  <h2 class="cell--title">
+    {{ parameters.cell_title }}
+  </h2>
+{% endif %}
 <div class="cell--body">
-  <p>
-    {{parameters.cell_desc}}
-  </p>
+  {% if parameters.cell_desc %}
+    <p>
+      {{ parameters.cell_desc }}
+    </p>
+  {% endif %}
 
   <div class="reporting-links">
     <ul class="content">