From a7789ce9243c3af0720b8b99cb44d0f2a490cf9d Mon Sep 17 00:00:00 2001 From: Nicolas ROCHE Date: Tue, 15 Nov 2022 08:38:05 +0100 Subject: [PATCH 1/2] dpark: add a title cell field (#71302) --- static/toulouse-2022/config.json | 3 ++- templates/combo/json/dpark.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/static/toulouse-2022/config.json b/static/toulouse-2022/config.json index 8bfd6b8b..de97af75 100644 --- a/static/toulouse-2022/config.json +++ b/static/toulouse-2022/config.json @@ -129,7 +129,8 @@ "varnames": [], "form": [ {"label": "Slug du connecteur Dpark", "varname": "dpark_instance"}, - {"label": "Url du formulaire d'appairage", "varname": "pairing_form_url"} + {"label": "Url du formulaire d'appairage", "varname": "pairing_form_url"}, + {"label": "Titre de la cellule (optionnel)", "varname": "dpark_title", "required": false} ], "log_errors": true, "cache_duration": 30, diff --git a/templates/combo/json/dpark.html b/templates/combo/json/dpark.html index bd7d3dbf..bb9299f1 100644 --- a/templates/combo/json/dpark.html +++ b/templates/combo/json/dpark.html @@ -1,4 +1,4 @@ -

Informations abonnement stationnement

+

{% if dpark_title %}{{ dpark_title }}{% else %}Informations abonnement stationnement{% endif %}

{% if not json.data %}

Vous pouvez relier votre compte Publik à votre compte D-Park via ce formulaire.

-- 2.39.2 From e0475e307be307a2ae31f3caa236456e973f7264 Mon Sep 17 00:00:00 2001 From: Nicolas ROCHE Date: Tue, 15 Nov 2022 08:39:15 +0100 Subject: [PATCH 2/2] toulouse-2022: overwrite publik account label on dpark (#71302) --- templates/combo/json/dpark.html | 10 +++++++++- templates/variants/toulouse-2022/combo/json/dpark.html | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 templates/variants/toulouse-2022/combo/json/dpark.html diff --git a/templates/combo/json/dpark.html b/templates/combo/json/dpark.html index bb9299f1..10a6481f 100644 --- a/templates/combo/json/dpark.html +++ b/templates/combo/json/dpark.html @@ -1,7 +1,15 @@

{% if dpark_title %}{{ dpark_title }}{% else %}Informations abonnement stationnement{% endif %}

{% if not json.data %} -

Vous pouvez relier votre compte Publik à votre compte D-Park via ce formulaire.

+
+

+ Vous pouvez relier votre compte + {% block publik_account_label %} + Publik + {% endblock %} + à votre abonnement stationnement via ce formulaire. +

+
{% else %}
{% for info in json.data %} diff --git a/templates/variants/toulouse-2022/combo/json/dpark.html b/templates/variants/toulouse-2022/combo/json/dpark.html new file mode 100644 index 00000000..7f6cbea4 --- /dev/null +++ b/templates/variants/toulouse-2022/combo/json/dpark.html @@ -0,0 +1,5 @@ +{% extends "combo/json/dpark.html" %} + +{% block publik_account_label %} +MonToulouse +{% endblock %} -- 2.39.2