alpes-maritimes-2018: typo fix (#35704 )

arles: hide portal agent link (#35673 )
alpes-maritimes-2018: remove bottom margin only on file widget (#35690 )
2019-08-30 15:44:00 +02:00 · 2019-08-30 14:22:27 +02:00 · 2019-08-30 14:22:14 +02:00 · 2019-08-30 14:21:57 +02:00 · 2019-08-30 11:13:06 +02:00 · 2019-08-30 11:12:57 +02:00
6 changed files with 69 additions and 38 deletions
--- a/static/alpes-maritimes-2018/_custom.scss
+++ b/static/alpes-maritimes-2018/_custom.scss
@ -323,6 +323,9 @@ div.large div#rub_service, div#rub_service {
 	}
 	div.widget {
 		margin-bottom: 3ex;
+		&.FileWidget {
+			margin-bottom: 0;
+		}
 		div.title {
 			font-weight: bold;
 			margin-bottom: 1ex;
--- a/static/alpes-maritimes-2018/config.json
+++ b/static/alpes-maritimes-2018/config.json
@ -14,22 +14,26 @@
              "desappairage": {
                  "cache_duration": 1,
                  "name": "D\u00e9sappairage",
-                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{request.GET.dossier}}"
+                  "varnames": ["dossier"],
+                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{ dossier }}"
              },
              "detail-dune-demande-ad": {
                  "cache_duration": 1,
                  "name": "D\u00e9tail d'une demande AD",
-                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{request.GET.dossier}}"
+                  "varnames": ["dossier"],
+                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{dossier }}"
              },
              "detail-dune-demande-ph": {
                  "cache_duration": 1,
                  "name": "D\u00e9tail d'une demande PH",
-                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{request.GET.dossier}}"
+                  "varnames": ["dossier"],
+                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{ dossier }}"
              },
              "enlever-un-dossier-avec-preselection": {
                  "cache_duration": 1,
                  "name": "Enlever un dossier avec pr\u00e9s\u00e9lection",
-                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{request.GET.dossier}}"
+                  "varnames": ["dossier"],
+                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{ dossier }}"
              },
              "enlever-un-dossier-sans-preselection": {
                  "cache_duration": 1,
@ -39,27 +43,32 @@
              "informations-generales-dun-dossier": {
                  "cache_duration": 1,
                  "name": "Informations g\u00e9n\u00e9rales d'un dossier",
-                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{request.GET.dossier}}"
+                  "varnames": ["dossier"],
+                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{ dossier }}"
              },
              "lien-retour-dans-dossier": {
                  "cache_duration": 1,
                  "name": "Lien retour dans dossier",
-                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{request.GET.dossier}}"
+                  "varnames": ["dossier"],
+                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{ dossier }}"
              },
              "lien-signalement-changement-coordonnees": {
                  "cache_duration": 1,
                  "name": "Lien vers le signalement de changement de coordonn\u00e9es pr\u00e9remplie",
-                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{request.GET.dossier}}"
+                  "varnames": ["dossier"],
+                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{ dossier }}"
              },
              "lien-vers-demande-de-revision-apa-preremplie": {
                  "cache_duration": 1,
                  "name": "Lien vers demande de r\u00e9vision APA pr\u00e9remplie",
-                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{request.GET.dossier}}"
+                  "varnames": ["dossier"],
+                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{ dossier }}"
              },
              "liens-vers-les-sous-dossiers": {
                  "cache_duration": 1,
                  "name": "Liens vers les sous-dossiers",
-                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{request.GET.dossier}}"
+                  "varnames": ["dossier"],
+                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{ dossier }}"
              },
              "liste-des-dossiers": {
                  "cache_duration": 1,
@ -74,27 +83,44 @@
              "sous-dossier-autonomie": {
                  "cache_duration": 1,
                  "name": "Sous-dossier Autonomie",
-                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{request.GET.dossier}}"
+                  "varnames": ["dossier"],
+                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{ dossier }}"
              },
              "sous-dossier-handicap": {
                  "cache_duration": 1,
                  "name": "Sous-dossier Handicap",
-                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{request.GET.dossier}}"
-              },
-              "contacts-association": {
-                  "cache_duration": 1,
-                  "name": "Contacts association",
-                  "url": "{{ passerelle_url }}astregs/associations/get-association-link-means?association_id={{request.GET.association_id}}&NameID={{user_nameid}}"
+                  "varnames": ["dossier"],
+                  "url": "{{ passerelle_url }}atos-genesys/genesys-prod/dossiers?NameID={{user_nameid}}&link_id={{ dossier }}"
              },
              "informations-association": {
                  "cache_duration": 1,
                  "name": "Informations de l'association",
-                  "url": "{{ passerelle_url }}astregs/associations/get-association-by-id?association_id={{request.GET.association_id}}&NameID={{user_nameid}}"
+                  "form": [
+                    {
+                      "label": "Identifiant du connecteur",
+                      "varname": "slug",
+                      "required": true
+                    }
+                  ],
+                  "additional-data": [
+                    {"key": "json_contact",
+                     "url": "{{ passerelle_url }}astregs/{{ slug }}/get-contact?contact_id={{ json.data.EncodeKeyContact }}"
+                    }
+                  ],
+                  "varnames": ["association_id"],
+                  "url": "{{ passerelle_url }}astregs/{{ slug }}/get-association-by-id?association_id={{ association_id }}&NameID={{ user_nameid }}"
              },
              "mes-associations": {
                  "cache_duration": 1,
                  "name": "Mes associations",
-                  "url": "{{ passerelle_url }}astregs/associations/links?NameID={{user_nameid}}"
+                  "form": [
+                    {
+                      "label": "Identifiant du connecteur",
+                      "varname": "slug",
+                      "required": true
+                    }
+                  ],
+                  "url": "{{ passerelle_url }}astregs/{{ slug }}/links?NameID={{ user_nameid }}"
              }
          }
      }
--- a/static/arles/_custom.scss
+++ b/static/arles/_custom.scss
@ -28,7 +28,10 @@ div#header-wrapper {
 	h1#logo {
 		background: url('img/bandeau.png') no-repeat;
 		height: 90px;
-		text-indent: -9999px;
+		a {
+			text-indent: -9999px;
+			display: block;
+		}
 		@media only screen and (max-width: $width) {
 			background: url('img/bandeau-medium.png') no-repeat;;
 		}
@ -514,6 +517,7 @@ div.file-upload-widget div.title {
@each $i in 5, 10, 15, 20 {
 	.min#{$i}::before {
 		background: url('img/#{$i}min.svg');
+		background-size: cover;
 	}
 }

@ -593,3 +597,6 @@ div.meetings_table {
 	}
 }

+#publik-portal-agent {
+	display: none;
+}
--- a/templates/variants/alpes-maritimes-2018/combo/json/contacts-association.html
+++ b/templates/variants/alpes-maritimes-2018/combo/json/contacts-association.html
@ -1,17 +0,0 @@
-<div class="cell textcell pink-header">
-  <div>
-    <h3>Moyens de contact</h3>
-    <p>
-      {% if json.data %}
-      {% for canal in json.data %}
-      {% if canal.type == "email" %}
-      Courriel : <strong>{{canal.value}}</strong><br/>{% endif%}
-      {% if canal.type == "mobile" %}Téléphone : <strong>{{canal.value}}</strong><br/>{% endif%}
-      {% if canal.type == "mail" %}Adresse : <strong>{{canal.value}}</strong><br/>{% endif%}
-      {% endfor %}
-      {% else %}
-      Aucun moyen de contact.
-      {% endif %}
-    </p>
-  </div>
-</div>
--- a/templates/variants/alpes-maritimes-2018/combo/json/informations-association.html
+++ b/templates/variants/alpes-maritimes-2018/combo/json/informations-association.html
@ -18,6 +18,18 @@
        {% if json.data.AdresseBureauDistributeur %}{{ json.data.AdresseBureauDistributeur }}<br/>{% endif %}
      </strong>
    </p>
+    <h3>Moyens de contact</h3>
+      {% if json_contact.data %}
+        <p>
+          <strong>{{json_contact.data.Prenom}} {{json_contact.data.Nom}}</strong><br/>
+          Courriel : <strong>{{json_contact.data.AdresseMail|default:"Non renseigné"}}</strong><br/>
+          Téléphone : <strong>{{json_contact.data.TelephoneMobile|default:"Non renseigné"}}</strong><br/>
+          Adresse : <strong>{{json_contact.data.RueVoie|default:""}} {{json_contact.data.CodePostal|default:""}} {{json_contact.data.Ville|default:""}}</strong>
+        </p>
+        {% else %}
+          <p>Aucun contact n'est renseigné.</p>
+        {% endif %}
  </div>
 </div>
+
 {% endif %}
--- a/templates/variants/alpes-maritimes-2018/combo/json/mes-associations.html
+++ b/templates/variants/alpes-maritimes-2018/combo/json/mes-associations.html
@ -7,14 +7,14 @@
    <p>
      <a href="{{ portal_url }}informations-de-lassociation/?association_id={{association.id}}">Voir les informations</a> -
      <a href="{{ eservices_url }}associations/modification-des-informations-relatives-a-mon-association/?association_id={{association.id}}&cancelurl={{ portal_url }}associations/">Modifier les informations</a> -
-      <a href="{{ eservicesl_url }}associations/enlever-une-association-a-mon-profil/?association_id={{association.id}}&cancelurl={{ portal_url }}associations/">Enlever de mon profil</a>
+      <a href="{{ eservices_url }}associations/enlever-une-association-a-mon-profil/?association_id={{association.id}}&cancelurl={{ portal_url }}associations/">Enlever de mon profil</a>
    </p>
    <p>
      <a class="turquoise-button" href="{{ eservices_url }}associations/demande-de-subvention/?association_id={{association.id}}&cancelurl={{ portal_url }}associations/\">Faire une demande de subvention</a>
    </p>
    {% endfor %}
    {% else %}
-    <p>Vous devez cliquer sur le bouton <a href="{{ portal_url }}associations/ajouter-une-association-a-mon-profil/?cancelurl={{ portal_url }}associations/">ajouter une association à mon profil</a> pour poursuivre.</p>
+    <p>Vous devez cliquer sur le bouton <a href="{{ eservices_url }}associations/ajouter-une-association-a-mon-profil/?cancelurl={{ portal_url }}associations/">ajouter une association à mon profil</a> pour poursuivre.</p>
    {% endif %}
  </div>
 </div>
Author	SHA1	Message	Date
Serghei Mihai	fd66e8c00c	alpes-maritimes-2018: typo fix (#35704 ) gitea-wip/publik-base-theme/pipeline/head There was a failure building this commit Details gitea/publik-base-theme/pipeline/head Something is wrong with the build of this commit Details	2019-08-30 15:44:00 +02:00
Serghei Mihai	a43fb25984	arles: hide portal agent link (#35673 )	2019-08-30 14:22:27 +02:00
Nicolas Roche	06693b5ef6	alpes-maritimes-2018: remove bottom margin only on file widget (#35690 ) This reverts commit `bc4a9b6bb4`.	2019-08-30 14:22:14 +02:00
Nicolas Roche	795b68a640	alpes-maritimes-2018: roll up widget content(#35690 )	2019-08-30 14:21:57 +02:00
Serghei Mihai	427ec85326	arles: fix background display of form filling duration (#35673 )	2019-08-30 11:13:06 +02:00
Serghei Mihai	2fa135811d	arles: fix logo link url display (#35673 )	2019-08-30 11:12:57 +02:00
Serghei Mihai	439e7b3b30	alpes-maritimes-2018: fix url typo (#35679 )	2019-08-30 11:11:51 +02:00
Serghei Mihai	b68be714ef	alpes-maritimes-2018: display association details and contacts on the same page (#35131 )	2019-08-30 11:11:40 +02:00
Serghei Mihai	5c68a5120d	alpes-maritimes-2018: use varnames instead of query string params (#35600 )	2019-08-30 11:11:33 +02:00
Serghei Mihai	0c32bde3ce	alpes-maritimes-2018: allow custom connector slug for associations related cells (#35600 )	2019-08-30 11:11:25 +02:00