From cd9666abd6f9f03e7c42303b4c81c0bf9a4cb914 Mon Sep 17 00:00:00 2001 From: Daniel Muyshond Date: Fri, 5 Aug 2022 14:06:24 +0200 Subject: [PATCH 1/7] [MTELEVERA-53] allow city to change logo by theirself --- static/verviers_2020/config.json | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/static/verviers_2020/config.json b/static/verviers_2020/config.json index de58f95a..51c05672 100644 --- a/static/verviers_2020/config.json +++ b/static/verviers_2020/config.json @@ -1,9 +1,25 @@ { - "label": "Verviers (2020)", - "variables": { - "no_extra_js": false, - "pwa_display": "standalone", - "theme_color": "#0E6E62", - "favicon": "verviers_2020/images/favicon.ico" - } + "label": "Verviers (2020)", + "settings": { + "combo": { + "COMBO_MAP_DEFAULT_POSITION": { + "lat": "50.591056", + "lng": "5.865595" + }, + "COMBO_ASSET_SLOTS.update": { + "header:background": { + "label": "Image d'en tête du guichet" + }, + "header:logo": { + "label": "Logo d'en tête du guichet" + } + } + } + }, + "variables": { + "no_extra_js": false, + "pwa_display": "standalone", + "theme_color": "#0E6E62", + "favicon": "verviers_2020/images/favicon.ico" + } } From 67dbb76018a0d3f4623ec316e4645ec0b720f194 Mon Sep 17 00:00:00 2001 From: Nicolas Selva Date: Mon, 8 Aug 2022 12:57:58 +0200 Subject: [PATCH 2/7] [SUP-25074]change dison theme_color --- static/dison/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/dison/config.json b/static/dison/config.json index 9d64c823..9c5729d0 100644 --- a/static/dison/config.json +++ b/static/dison/config.json @@ -2,6 +2,6 @@ "label": "Dison", "variables": { "no_extra_js": false, - "theme_color": "#DBCCBC" + "theme_color": "#7B98C4" } } \ No newline at end of file From e98d2418eb99504667bb7bbba9cefad8355bbf7f Mon Sep 17 00:00:00 2001 From: Nicolas Selva Date: Mon, 8 Aug 2022 13:08:56 +0200 Subject: [PATCH 3/7] [SUP-25074]change dison theme_color --- static/dison/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/dison/style.scss b/static/dison/style.scss index 9e2c6656..b695194c 100644 --- a/static/dison/style.scss +++ b/static/dison/style.scss @@ -1,7 +1,7 @@ @charset "UTF-8"; /*STYLE*/ -$primary-color: #347785; +$primary-color: #7B98C4; $width: 1100px; $mobile-limit: 800px; $font-size: 16px !default; From 67863a368dc9143225160b152fe29fa8d1416303 Mon Sep 17 00:00:00 2001 From: Daniel Muyshond Date: Tue, 9 Aug 2022 14:35:15 +0200 Subject: [PATCH 4/7] [TELE-1328] Hide toplinks on TS light --- static/brainelechateau/config.json | 47 +++++++++++++++--------------- static/lens/config.json | 47 +++++++++++++++--------------- static/manage/config.json | 47 +++++++++++++++--------------- static/nandrin/config.json | 47 +++++++++++++++--------------- static/wavre/config.json | 47 +++++++++++++++--------------- 5 files changed, 120 insertions(+), 115 deletions(-) diff --git a/static/brainelechateau/config.json b/static/brainelechateau/config.json index 088bcc56..7bf67e7a 100644 --- a/static/brainelechateau/config.json +++ b/static/brainelechateau/config.json @@ -1,25 +1,26 @@ { - "label": "Braine-le-Château", - "variables": { - "no_extra_js": false, - "pwa_display": "standalone", - "theme_color": "#026770", - "favicon": "brainelechateau/images/favicon.ico" - }, - "settings": { - "combo": { - "COMBO_MAP_DEFAULT_POSITION": { - "lat": "50.6831", - "lng": "4.2729" - }, - "COMBO_ASSET_SLOTS.update": { - "header:background": { - "label": "Image d'en tête du guichet" - }, - "header:logo": { - "label": "Logo d'en tête du guichet" - } - } - } - } + "label": "Braine-le-Château", + "variables": { + "no_extra_js": false, + "pwa_display": "standalone", + "theme_color": "#026770", + "include_top_links": false, + "favicon": "brainelechateau/images/favicon.ico" + }, + "settings": { + "combo": { + "COMBO_MAP_DEFAULT_POSITION": { + "lat": "50.6831", + "lng": "4.2729" + }, + "COMBO_ASSET_SLOTS.update": { + "header:background": { + "label": "Image d'en tête du guichet" + }, + "header:logo": { + "label": "Logo d'en tête du guichet" + } + } + } + } } diff --git a/static/lens/config.json b/static/lens/config.json index 071faf0c..7776847b 100644 --- a/static/lens/config.json +++ b/static/lens/config.json @@ -1,25 +1,26 @@ { - "label": "Lens", - "variables": { - "no_extra_js": false, - "pwa_display": "standalone", - "theme_color": "#343F4D", - "favicon": "lens/images/favicon.ico" - }, - "settings": { - "combo": { - "COMBO_MAP_DEFAULT_POSITION": { - "lat": "50.5578", - "lng": "3.8998" - }, - "COMBO_ASSET_SLOTS.update": { - "header:background": { - "label": "Image d'en tête du guichet" - }, - "header:logo": { - "label": "Logo d'en tête du guichet" - } - } - } - } + "label": "Lens", + "variables": { + "no_extra_js": false, + "pwa_display": "standalone", + "theme_color": "#343F4D", + "include_top_links": false, + "favicon": "lens/images/favicon.ico" + }, + "settings": { + "combo": { + "COMBO_MAP_DEFAULT_POSITION": { + "lat": "50.5578", + "lng": "3.8998" + }, + "COMBO_ASSET_SLOTS.update": { + "header:background": { + "label": "Image d'en tête du guichet" + }, + "header:logo": { + "label": "Logo d'en tête du guichet" + } + } + } + } } diff --git a/static/manage/config.json b/static/manage/config.json index e67bedc0..6a48c84b 100644 --- a/static/manage/config.json +++ b/static/manage/config.json @@ -1,25 +1,26 @@ { - "label": "Manage", - "variables": { - "no_extra_js": false, - "pwa_display": "standalone", - "theme_color": "#07689F", - "favicon": "manage/images/favicon.ico" - }, - "settings": { - "combo": { - "COMBO_MAP_DEFAULT_POSITION": { - "lat": "50.5030", - "lng": "4.2353" - }, - "COMBO_ASSET_SLOTS.update": { - "header:background": { - "label": "Image d'en tête du guichet" - }, - "header:logo": { - "label": "Logo d'en tête du guichet" - } - } - } - } + "label": "Manage", + "variables": { + "no_extra_js": false, + "pwa_display": "standalone", + "theme_color": "#07689F", + "include_top_links": false, + "favicon": "manage/images/favicon.ico" + }, + "settings": { + "combo": { + "COMBO_MAP_DEFAULT_POSITION": { + "lat": "50.5030", + "lng": "4.2353" + }, + "COMBO_ASSET_SLOTS.update": { + "header:background": { + "label": "Image d'en tête du guichet" + }, + "header:logo": { + "label": "Logo d'en tête du guichet" + } + } + } + } } diff --git a/static/nandrin/config.json b/static/nandrin/config.json index 8d7aa6c7..884ec7e1 100644 --- a/static/nandrin/config.json +++ b/static/nandrin/config.json @@ -1,25 +1,26 @@ { - "label": "Nandrin", - "variables": { - "no_extra_js": false, - "pwa_display": "standalone", - "theme_color": "#34B233", - "favicon": "nandrin/images/favicon.ico" - }, - "settings": { - "combo": { - "COMBO_MAP_DEFAULT_POSITION": { - "lat": "50.5071457", - "lng": "5.4198465" - }, - "COMBO_ASSET_SLOTS.update": { - "header:background": { - "label": "Image d'en tête du guichet" - }, - "header:logo": { - "label": "Logo d'en tête du guichet" - } - } - } - } + "label": "Nandrin", + "variables": { + "no_extra_js": false, + "pwa_display": "standalone", + "theme_color": "#34B233", + "include_top_links": false, + "favicon": "nandrin/images/favicon.ico" + }, + "settings": { + "combo": { + "COMBO_MAP_DEFAULT_POSITION": { + "lat": "50.5071457", + "lng": "5.4198465" + }, + "COMBO_ASSET_SLOTS.update": { + "header:background": { + "label": "Image d'en tête du guichet" + }, + "header:logo": { + "label": "Logo d'en tête du guichet" + } + } + } + } } diff --git a/static/wavre/config.json b/static/wavre/config.json index 245ec391..d6b9f487 100644 --- a/static/wavre/config.json +++ b/static/wavre/config.json @@ -1,25 +1,26 @@ { - "label": "Wavre (C.P.A.S.)", - "variables": { - "no_extra_js": false, - "pwa_display": "standalone", - "theme_color": "#343F4D", - "favicon": "wavre/images/favicon.ico" - }, - "settings": { - "combo": { - "COMBO_MAP_DEFAULT_POSITION": { - "lat": "50.715896", - "lng": "4.612808" - }, - "COMBO_ASSET_SLOTS.update": { - "header:background": { - "label": "Image d'en tête du guichet" - }, - "header:logo": { - "label": "Logo d'en tête du guichet" - } - } - } - } + "label": "Wavre (C.P.A.S.)", + "variables": { + "no_extra_js": false, + "pwa_display": "standalone", + "theme_color": "#343F4D", + "include_top_links": false, + "favicon": "wavre/images/favicon.ico" + }, + "settings": { + "combo": { + "COMBO_MAP_DEFAULT_POSITION": { + "lat": "50.715896", + "lng": "4.612808" + }, + "COMBO_ASSET_SLOTS.update": { + "header:background": { + "label": "Image d'en tête du guichet" + }, + "header:logo": { + "label": "Logo d'en tête du guichet" + } + } + } + } } From 6757799993def3db8ab36c899d5a27abef50bc18 Mon Sep 17 00:00:00 2001 From: Daniel Muyshond Date: Wed, 10 Aug 2022 14:58:19 +0200 Subject: [PATCH 5/7] [TOWS-114] add townstreet flyTo btn (desktop geoloc helper) --- .../forms/widgets/tows_flyto_button.html | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 templates/qommon/forms/widgets/tows_flyto_button.html diff --git a/templates/qommon/forms/widgets/tows_flyto_button.html b/templates/qommon/forms/widgets/tows_flyto_button.html new file mode 100644 index 00000000..82cdcd8a --- /dev/null +++ b/templates/qommon/forms/widgets/tows_flyto_button.html @@ -0,0 +1,19 @@ +{% extends "qommon/forms/widget.html" %} +{% block widget-content %} +Localisation incorrecte / je suis perdu : réinitialiser la carte (positionne la carte sur la commune) + + +{% endblock %} \ No newline at end of file From 8eb61249dee41a4697715e69ddee1a4da1a92a68 Mon Sep 17 00:00:00 2001 From: Daniel Muyshond Date: Tue, 16 Aug 2022 13:36:41 +0200 Subject: [PATCH 6/7] [TELE-1400] added : emails to combo asset slots for the new iMio theme --- static/imio-basic/config.json | 3 +++ static/staging1/config.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/static/imio-basic/config.json b/static/imio-basic/config.json index bbc7620a..22c02b5a 100644 --- a/static/imio-basic/config.json +++ b/static/imio-basic/config.json @@ -8,6 +8,9 @@ }, "header:logo" : { "label" : "Image de logo" + }, + "emails:logo": { + "label": "Image d'en-tête dans les mails" } }, "COMBO_CELL_ASSET_SLOTS.update" : { diff --git a/static/staging1/config.json b/static/staging1/config.json index 3b97657e..6d90e436 100644 --- a/static/staging1/config.json +++ b/static/staging1/config.json @@ -8,6 +8,9 @@ }, "header:logo" : { "label" : "Image de logo" + }, + "emails:logo": { + "label": "Image d'en-tête dans les mails" } }, "COMBO_CELL_ASSET_SLOTS.update" : { From 4e0799b8682b076af551ff65a7d0fc9379d3adb2 Mon Sep 17 00:00:00 2001 From: Daniel Muyshond Date: Tue, 16 Aug 2022 13:56:27 +0200 Subject: [PATCH 7/7] [TELE-1400] added : missing variable to make mail image combo asset works --- static/imio-basic/config.json | 3 ++- static/staging1/config.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/static/imio-basic/config.json b/static/imio-basic/config.json index 22c02b5a..8ff2472e 100644 --- a/static/imio-basic/config.json +++ b/static/imio-basic/config.json @@ -98,6 +98,7 @@ "theme_color" : "#651138", "include_top_links" : false, "favicon": "imio-basic/images/favicon.ico", - "no_extra_js": true + "no_extra_js": true, + "email_header_asset": "emails:logo" } } diff --git a/static/staging1/config.json b/static/staging1/config.json index 6d90e436..76f1c0f0 100644 --- a/static/staging1/config.json +++ b/static/staging1/config.json @@ -98,6 +98,7 @@ "theme_color" : "#651138", "include_top_links" : false, "favicon": "imio-basic/images/favicon.ico", - "no_extra_js": true + "no_extra_js": true, + "email_header_asset": "emails:logo" } }