From a07d42516b5df1067d893718674c79df8c4d11d7 Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzoluk@gmail.com>
Date: Mon, 2 Jan 2023 10:44:56 +0100
Subject: [PATCH 01/20] Make it possible to set the href on the counter

---
 packages/cms/lib/modules/idea-map-widgets/index.js    | 11 ++++++++++-
 .../modules/idea-map-widgets/views/numberplate.html   |  2 +-
 .../lib/modules/idea-map-widgets/views/widget.html    |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/cms/lib/modules/idea-map-widgets/index.js b/packages/cms/lib/modules/idea-map-widgets/index.js
index 729f65873..a2edeba75 100644
--- a/packages/cms/lib/modules/idea-map-widgets/index.js
+++ b/packages/cms/lib/modules/idea-map-widgets/index.js
@@ -2,6 +2,7 @@
  * Overview of idea resources on a map
  */
 const openstadMap = require('../../../config/map').default;
+const _ = require('lodash');
 
 module.exports = {
   extend: 'map-widgets',
@@ -63,6 +64,13 @@ module.exports = {
       type: 'string',
       label: 'Counter text',
     },
+    {
+      name: 'counterUrl',
+      type: 'string',
+      label: 'Counter url',
+      def: 'plannen',
+      required: false
+    },
     {
       name: 'useMarkerLinks',
       type: 'boolean',
@@ -115,7 +123,7 @@ module.exports = {
       {
         name: 'counter',
         label: 'Counter',
-        fields: ['displayCounter', 'counterText']
+        fields: ['displayCounter', 'counterText', 'counterUrl']
       },
       {
         name: 'content',
@@ -169,6 +177,7 @@ module.exports = {
 
 
         widgets.forEach((widget) => {
+          widget.counterUrl = _.get(widget, 'counterUrl', 'plannen');
           widget.ideas = req.data.ideas ? req.data.ideas.map((idea) => {
             return {
               location: idea.location,
diff --git a/packages/cms/lib/modules/idea-map-widgets/views/numberplate.html b/packages/cms/lib/modules/idea-map-widgets/views/numberplate.html
index 0dcbcf6c4..0d3346bc0 100644
--- a/packages/cms/lib/modules/idea-map-widgets/views/numberplate.html
+++ b/packages/cms/lib/modules/idea-map-widgets/views/numberplate.html
@@ -1,6 +1,6 @@
 {% macro numberPlateButton(name, caption, value, href, color="#004699") %}
 	{% if href %}
-		<a href="{{data.siteUrl}}/plannen" class="{{name}}">
+		<a href="{{data.siteUrl}}/{{href}}" class="{{name}}">
 	{% else %}
 			<div class="{{name}}">
 	{% endif %}
diff --git a/packages/cms/lib/modules/idea-map-widgets/views/widget.html b/packages/cms/lib/modules/idea-map-widgets/views/widget.html
index c59f86f82..c7dc11c2c 100644
--- a/packages/cms/lib/modules/idea-map-widgets/views/widget.html
+++ b/packages/cms/lib/modules/idea-map-widgets/views/widget.html
@@ -18,7 +18,7 @@
         </a>
         {% endif %}
         {% if (data.widget.displayCounter) %}
-        {{numberPlateButton.numberPlateButton('no-of-locations', data.widget.counterText, data.ideas.length, '#')}}
+        {{numberPlateButton.numberPlateButton('no-of-locations', data.widget.counterText, data.ideas.length, data.widget.counterUrl)}}
         {% endif %}
       </div>
     </div>

From 8fc1639a798272c115eb346cd3b2b156628a3a05 Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzoluk@gmail.com>
Date: Mon, 16 Jan 2023 12:33:54 +0100
Subject: [PATCH 02/20] Set counterUrl without lodash lib

---
 packages/cms/lib/modules/idea-map-widgets/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/cms/lib/modules/idea-map-widgets/index.js b/packages/cms/lib/modules/idea-map-widgets/index.js
index a2edeba75..9fe494343 100644
--- a/packages/cms/lib/modules/idea-map-widgets/index.js
+++ b/packages/cms/lib/modules/idea-map-widgets/index.js
@@ -2,7 +2,6 @@
  * Overview of idea resources on a map
  */
 const openstadMap = require('../../../config/map').default;
-const _ = require('lodash');
 
 module.exports = {
   extend: 'map-widgets',
@@ -177,7 +176,7 @@ module.exports = {
 
 
         widgets.forEach((widget) => {
-          widget.counterUrl = _.get(widget, 'counterUrl', 'plannen');
+          widget.counterUrl = widget.counterUrl || 'plannen';
           widget.ideas = req.data.ideas ? req.data.ideas.map((idea) => {
             return {
               location: idea.location,

From b258b979efc8cfb90fb603f9a2c5ebe9b4edaba4 Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzoluk@gmail.com>
Date: Fri, 10 Feb 2023 10:08:51 +0100
Subject: [PATCH 03/20] Add a message when the widget is used on a non-idea
 resource page and when you are logged in as admin, moderator or editor

---
 .../lib/modules/arguments-block-widgets/views/widget.html    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/cms/lib/modules/arguments-block-widgets/views/widget.html b/packages/cms/lib/modules/arguments-block-widgets/views/widget.html
index 3fb9857df..2b09d4422 100755
--- a/packages/cms/lib/modules/arguments-block-widgets/views/widget.html
+++ b/packages/cms/lib/modules/arguments-block-widgets/views/widget.html
@@ -15,8 +15,9 @@
 
   {% if data.activeResource and data.activeResource.publishDate %}
 	<div class="{{data.widget.divId}}" style="width: 100%; height: 100%;"></div>
+  {% elif (data.isAdmin or data.isEditor or data.isModerator) and data.activeResourceType !== 'idea'%}
+	<p>Deze widget kan alleen worden gebruikt op pagina`s met een resource waarbij het activeResourceType idea is</p>
   {% else %}
-	<p>Er kunnen geen argumenten worden gegeven op een concept plan</p>
+  <p>Er kunnen geen argumenten worden gegeven op een concept plan</p>
   {% endif %}
-
 </div>

From 55f1c9a13c2696e74bd52d7373bf3c70a5d0de83 Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzoluk@gmail.com>
Date: Fri, 10 Feb 2023 13:41:25 +0100
Subject: [PATCH 04/20] Made it so the title can be changed of the succesfull
 voting message

---
 .../lib/modules/participatory-budgeting-widgets/index.js    | 2 +-
 .../modules/participatory-budgeting-widgets/lib/fields.js   | 6 ++++++
 .../views/phase-voting/budgeting.html                       | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/cms/lib/modules/participatory-budgeting-widgets/index.js b/packages/cms/lib/modules/participatory-budgeting-widgets/index.js
index f8e7ee2b8..f663d55f6 100644
--- a/packages/cms/lib/modules/participatory-budgeting-widgets/index.js
+++ b/packages/cms/lib/modules/participatory-budgeting-widgets/index.js
@@ -27,7 +27,7 @@ module.exports = {
             {
                 name: 'explanation-texts',
                 label: 'Explanation texts',
-                fields: ['step_1_intro', 'step_2_intro', 'step_3_intro', 'step_3_succesfull_auth', 'thankyou_message', 'showNewsletterButton', 'newsletterButtonText']
+                fields: ['step_1_intro', 'step_2_intro', 'step_3_intro', 'step_3_succesfull_auth','succesfull_voting_title', 'thankyou_message', 'showNewsletterButton', 'newsletterButtonText']
             },
             {
                 name: 'authentication',
diff --git a/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js b/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
index 883a91332..e07b5a1c2 100644
--- a/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
+++ b/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
@@ -198,6 +198,12 @@ const fields = [
     textarea: true,
     def: 'Het controleren van je stemcode is gelukt! Je bent bijna klaar. Klik op onderstaande knop om je stem te versturen.'
   },
+  {
+    name: 'succesfull_voting_title',
+    label: 'Message you see when you voted succesfully',
+    type: 'string',
+    def: 'Gelukt, je hebt gestemd!'
+  },
   {
     name: 'thankyou_message',
     label: 'Thank you message',
diff --git a/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html b/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
index 8f1be02e3..8632e544b 100644
--- a/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
+++ b/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
@@ -368,7 +368,7 @@ <h3 class="icon-header icon-header--blue">
 					<div id="steps-content-6" class="step">
 						<div class="text">
 							<div class="checkmark-block-green">
-								<h4>Gelukt, je hebt gestemd!</h4>
+								<h4>{{data.widget.succesfull_voting_title}}</h4>
 								<br/>
 								{{data.widget.thankyou_message | sanitize | safe | nlbr}}
 								{% if data.widget.showNewsletterButton and data.widget.showNewsletterButton == 'yes' %}

From db8ecf283f5e1eec29e9243ad4a2a5e94fd7ec27 Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzoluk@gmail.com>
Date: Fri, 10 Feb 2023 13:49:39 +0100
Subject: [PATCH 05/20] Added field to phase-voting-budgeting

---
 packages/cms/lib/modules/begroot-widgets/index.js           | 6 ++++++
 .../begroot-widgets/views/phase-voting/budgeting.html       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/cms/lib/modules/begroot-widgets/index.js b/packages/cms/lib/modules/begroot-widgets/index.js
index 3e20b7912..36c59c423 100644
--- a/packages/cms/lib/modules/begroot-widgets/index.js
+++ b/packages/cms/lib/modules/begroot-widgets/index.js
@@ -171,6 +171,12 @@ const fields = [
     textarea: true,
     def: 'Het controleren van je stemcode is gelukt! Je bent bijna klaar. Klik op onderstaande knop om je stem te versturen.'
   },
+  {
+    name: 'succesfull_voting_title',
+    label: 'Message you see when you voted succesfully',
+    type: 'string',
+    def: 'Gelukt, je hebt gestemd!'
+  },
   {
     name: 'thankyou_message',
     label: 'Thank you message',
diff --git a/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html b/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
index 04f94238b..f8305ac40 100644
--- a/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
+++ b/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
@@ -356,7 +356,7 @@ <h3 class="icon-header icon-header--blue">
 					<div id="steps-content-6" class="step">
 						<div class="text">
 							<div class="checkmark-block-green">
-								<h4>Gelukt, je hebt gestemd!</h4>
+								<h4>{{data.widget.succesfull_voting_title}}</h4>
 								<br/>
 								{{data.widget.thankyou_message | sanitize | safe | nlbr}}
 								{% if data.widget.showNewsletterButton and data.widget.showNewsletterButton == 'yes' %}

From 965e33f23e5543670ec80c45568784bb3e2f7611 Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzoluk@gmail.com>
Date: Mon, 13 Feb 2023 09:58:00 +0100
Subject: [PATCH 06/20] Corrected spelling

---
 .../modules/begroot-widgets/views/phase-voting/budgeting.html   | 2 +-
 .../cms/lib/modules/participatory-budgeting-widgets/index.js    | 2 +-
 .../lib/modules/participatory-budgeting-widgets/lib/fields.js   | 2 +-
 .../views/phase-voting/budgeting.html                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html b/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
index f8305ac40..6f70c8a47 100644
--- a/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
+++ b/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
@@ -356,7 +356,7 @@ <h3 class="icon-header icon-header--blue">
 					<div id="steps-content-6" class="step">
 						<div class="text">
 							<div class="checkmark-block-green">
-								<h4>{{data.widget.succesfull_voting_title}}</h4>
+								<h4>{{data.widget.succesful_voting_title}}</h4>
 								<br/>
 								{{data.widget.thankyou_message | sanitize | safe | nlbr}}
 								{% if data.widget.showNewsletterButton and data.widget.showNewsletterButton == 'yes' %}
diff --git a/packages/cms/lib/modules/participatory-budgeting-widgets/index.js b/packages/cms/lib/modules/participatory-budgeting-widgets/index.js
index f663d55f6..4824d3b14 100644
--- a/packages/cms/lib/modules/participatory-budgeting-widgets/index.js
+++ b/packages/cms/lib/modules/participatory-budgeting-widgets/index.js
@@ -27,7 +27,7 @@ module.exports = {
             {
                 name: 'explanation-texts',
                 label: 'Explanation texts',
-                fields: ['step_1_intro', 'step_2_intro', 'step_3_intro', 'step_3_succesfull_auth','succesfull_voting_title', 'thankyou_message', 'showNewsletterButton', 'newsletterButtonText']
+                fields: ['step_1_intro', 'step_2_intro', 'step_3_intro', 'step_3_succesfull_auth','succesful_voting_title', 'thankyou_message', 'showNewsletterButton', 'newsletterButtonText']
             },
             {
                 name: 'authentication',
diff --git a/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js b/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
index e07b5a1c2..bc6c1f747 100644
--- a/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
+++ b/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
@@ -199,7 +199,7 @@ const fields = [
     def: 'Het controleren van je stemcode is gelukt! Je bent bijna klaar. Klik op onderstaande knop om je stem te versturen.'
   },
   {
-    name: 'succesfull_voting_title',
+    name: 'succesful_voting_title',
     label: 'Message you see when you voted succesfully',
     type: 'string',
     def: 'Gelukt, je hebt gestemd!'
diff --git a/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html b/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
index 8632e544b..214ca63d8 100644
--- a/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
+++ b/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
@@ -368,7 +368,7 @@ <h3 class="icon-header icon-header--blue">
 					<div id="steps-content-6" class="step">
 						<div class="text">
 							<div class="checkmark-block-green">
-								<h4>{{data.widget.succesfull_voting_title}}</h4>
+								<h4>{{data.widget.succesful_voting_title}}</h4>
 								<br/>
 								{{data.widget.thankyou_message | sanitize | safe | nlbr}}
 								{% if data.widget.showNewsletterButton and data.widget.showNewsletterButton == 'yes' %}

From e3085441f84460ebafb82bc1e9652ff2d903f2f8 Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzoluk@gmail.com>
Date: Mon, 13 Feb 2023 10:00:39 +0100
Subject: [PATCH 07/20] Corrected spelling

---
 packages/cms/lib/modules/begroot-widgets/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cms/lib/modules/begroot-widgets/index.js b/packages/cms/lib/modules/begroot-widgets/index.js
index 36c59c423..3a4bc7bbb 100644
--- a/packages/cms/lib/modules/begroot-widgets/index.js
+++ b/packages/cms/lib/modules/begroot-widgets/index.js
@@ -172,7 +172,7 @@ const fields = [
     def: 'Het controleren van je stemcode is gelukt! Je bent bijna klaar. Klik op onderstaande knop om je stem te versturen.'
   },
   {
-    name: 'succesfull_voting_title',
+    name: 'succesful_voting_title',
     label: 'Message you see when you voted succesfully',
     type: 'string',
     def: 'Gelukt, je hebt gestemd!'

From 14c18eebdf49962b13805c2d09bd077097e8d488 Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzoluk@gmail.com>
Date: Mon, 13 Feb 2023 10:11:17 +0100
Subject: [PATCH 08/20] Changed spelling of successful

---
 packages/cms/lib/modules/begroot-widgets/index.js               | 2 +-
 .../modules/begroot-widgets/views/phase-voting/budgeting.html   | 2 +-
 .../cms/lib/modules/participatory-budgeting-widgets/index.js    | 2 +-
 .../lib/modules/participatory-budgeting-widgets/lib/fields.js   | 2 +-
 .../views/phase-voting/budgeting.html                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/cms/lib/modules/begroot-widgets/index.js b/packages/cms/lib/modules/begroot-widgets/index.js
index 3a4bc7bbb..621f9d098 100644
--- a/packages/cms/lib/modules/begroot-widgets/index.js
+++ b/packages/cms/lib/modules/begroot-widgets/index.js
@@ -172,7 +172,7 @@ const fields = [
     def: 'Het controleren van je stemcode is gelukt! Je bent bijna klaar. Klik op onderstaande knop om je stem te versturen.'
   },
   {
-    name: 'succesful_voting_title',
+    name: 'successful_voting_title',
     label: 'Message you see when you voted succesfully',
     type: 'string',
     def: 'Gelukt, je hebt gestemd!'
diff --git a/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html b/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
index 6f70c8a47..a7becdddc 100644
--- a/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
+++ b/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
@@ -356,7 +356,7 @@ <h3 class="icon-header icon-header--blue">
 					<div id="steps-content-6" class="step">
 						<div class="text">
 							<div class="checkmark-block-green">
-								<h4>{{data.widget.succesful_voting_title}}</h4>
+								<h4>{{data.widget.successful_voting_title}}</h4>
 								<br/>
 								{{data.widget.thankyou_message | sanitize | safe | nlbr}}
 								{% if data.widget.showNewsletterButton and data.widget.showNewsletterButton == 'yes' %}
diff --git a/packages/cms/lib/modules/participatory-budgeting-widgets/index.js b/packages/cms/lib/modules/participatory-budgeting-widgets/index.js
index 4824d3b14..0b4bba4af 100644
--- a/packages/cms/lib/modules/participatory-budgeting-widgets/index.js
+++ b/packages/cms/lib/modules/participatory-budgeting-widgets/index.js
@@ -27,7 +27,7 @@ module.exports = {
             {
                 name: 'explanation-texts',
                 label: 'Explanation texts',
-                fields: ['step_1_intro', 'step_2_intro', 'step_3_intro', 'step_3_succesfull_auth','succesful_voting_title', 'thankyou_message', 'showNewsletterButton', 'newsletterButtonText']
+                fields: ['step_1_intro', 'step_2_intro', 'step_3_intro', 'step_3_succesfull_auth','successful_voting_title', 'thankyou_message', 'showNewsletterButton', 'newsletterButtonText']
             },
             {
                 name: 'authentication',
diff --git a/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js b/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
index bc6c1f747..6d620a338 100644
--- a/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
+++ b/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
@@ -199,7 +199,7 @@ const fields = [
     def: 'Het controleren van je stemcode is gelukt! Je bent bijna klaar. Klik op onderstaande knop om je stem te versturen.'
   },
   {
-    name: 'succesful_voting_title',
+    name: 'successful_voting_title',
     label: 'Message you see when you voted succesfully',
     type: 'string',
     def: 'Gelukt, je hebt gestemd!'
diff --git a/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html b/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
index 214ca63d8..9c73fb7ba 100644
--- a/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
+++ b/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
@@ -368,7 +368,7 @@ <h3 class="icon-header icon-header--blue">
 					<div id="steps-content-6" class="step">
 						<div class="text">
 							<div class="checkmark-block-green">
-								<h4>{{data.widget.succesful_voting_title}}</h4>
+								<h4>{{data.widget.successful_voting_title}}</h4>
 								<br/>
 								{{data.widget.thankyou_message | sanitize | safe | nlbr}}
 								{% if data.widget.showNewsletterButton and data.widget.showNewsletterButton == 'yes' %}

From a82dd7656b4d8caafa2a4f0566d388bd343a1e0f Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzoluk@gmail.com>
Date: Mon, 13 Feb 2023 10:14:45 +0100
Subject: [PATCH 09/20] Changed spelling of step_3_successful_auth

---
 packages/cms/lib/modules/begroot-widgets/index.js             | 4 ++--
 .../modules/begroot-widgets/views/phase-voting/budgeting.html | 4 ++--
 .../cms/lib/modules/participatory-budgeting-widgets/index.js  | 2 +-
 .../lib/modules/participatory-budgeting-widgets/lib/fields.js | 2 +-
 .../views/phase-voting/budgeting.html                         | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/cms/lib/modules/begroot-widgets/index.js b/packages/cms/lib/modules/begroot-widgets/index.js
index 3e20b7912..12416caa6 100644
--- a/packages/cms/lib/modules/begroot-widgets/index.js
+++ b/packages/cms/lib/modules/begroot-widgets/index.js
@@ -165,8 +165,8 @@ const fields = [
     def: 'Via onderstaande knop kun je op een aparte pagina je persoonlijke stemcode invullen. Wij controleren de stemcode op geldigheid. Als dat gelukt is kom je terug op deze pagina waarna je kunt stemmen. Alle bewoners van Centrum hebben per post een stemcode ontvangen.'
   },
   {
-    name: 'step_3_succesfull_auth',
-    label: 'Step 3: succesfull auth',
+    name: 'step_3_successful_auth',
+    label: 'Step 3: successful auth',
     type: 'string',
     textarea: true,
     def: 'Het controleren van je stemcode is gelukt! Je bent bijna klaar. Klik op onderstaande knop om je stem te versturen.'
diff --git a/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html b/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
index 04f94238b..0cdf1daad 100644
--- a/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
+++ b/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
@@ -138,7 +138,7 @@ <h3 class="icon-header icon-header--blue">
 												<small>Vul een andere stemcode in</small>
 											</a>
 											<div>
-												{{data.widget.step_3_succesfull_auth}}
+												{{data.widget.step_3_successful_auth}}
 											</div>
 										</div>
 
@@ -340,7 +340,7 @@ <h3 class="icon-header icon-header--blue">
 									</div>
 								</a>
 								<div class="mobile-accordion-body">
-									{{data.widget.step_3_succesfull_auth}}
+									{{data.widget.step_3_successful_auth}}
 								</div>
 							</div>
 							<br />
diff --git a/packages/cms/lib/modules/participatory-budgeting-widgets/index.js b/packages/cms/lib/modules/participatory-budgeting-widgets/index.js
index f8e7ee2b8..5ac37ed28 100644
--- a/packages/cms/lib/modules/participatory-budgeting-widgets/index.js
+++ b/packages/cms/lib/modules/participatory-budgeting-widgets/index.js
@@ -27,7 +27,7 @@ module.exports = {
             {
                 name: 'explanation-texts',
                 label: 'Explanation texts',
-                fields: ['step_1_intro', 'step_2_intro', 'step_3_intro', 'step_3_succesfull_auth', 'thankyou_message', 'showNewsletterButton', 'newsletterButtonText']
+                fields: ['step_1_intro', 'step_2_intro', 'step_3_intro', 'step_3_successful_auth', 'thankyou_message', 'showNewsletterButton', 'newsletterButtonText']
             },
             {
                 name: 'authentication',
diff --git a/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js b/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
index 883a91332..61ef8a436 100644
--- a/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
+++ b/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
@@ -192,7 +192,7 @@ const fields = [
     def: 'Via onderstaande knop kun je op een aparte pagina je persoonlijke stemcode invullen. Wij controleren de stemcode op geldigheid. Als dat gelukt is kom je terug op deze pagina waarna je kunt stemmen. Alle bewoners van Centrum hebben per post een stemcode ontvangen.'
   },
   {
-    name: 'step_3_succesfull_auth',
+    name: 'step_3_successful_auth',
     label: 'Step 3: succesfull auth',
     type: 'string',
     textarea: true,
diff --git a/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html b/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
index 8f1be02e3..1d62a1abb 100644
--- a/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
+++ b/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
@@ -150,7 +150,7 @@ <h3 class="icon-header icon-header--blue">
 												<small>Vul een andere stemcode in</small>
 											</a>
 											<div>
-												{{data.widget.step_3_succesfull_auth}}
+												{{data.widget.step_3_successful_auth}}
 											</div>
 										</div>
 
@@ -352,7 +352,7 @@ <h3 class="icon-header icon-header--blue">
 									</div>
 								</a>
 								<div class="mobile-accordion-body">
-									{{data.widget.step_3_succesfull_auth}}
+									{{data.widget.step_3_successful_auth}}
 								</div>
 							</div>
 							<br />

From 1dd243646246be7737c45877ef5bafc7f07a6f0b Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzoluk@gmail.com>
Date: Mon, 13 Feb 2023 10:16:53 +0100
Subject: [PATCH 10/20] changed spelling in label of field

---
 packages/cms/lib/modules/begroot-widgets/index.js               | 2 +-
 .../lib/modules/participatory-budgeting-widgets/lib/fields.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cms/lib/modules/begroot-widgets/index.js b/packages/cms/lib/modules/begroot-widgets/index.js
index 621f9d098..e5be8fc28 100644
--- a/packages/cms/lib/modules/begroot-widgets/index.js
+++ b/packages/cms/lib/modules/begroot-widgets/index.js
@@ -173,7 +173,7 @@ const fields = [
   },
   {
     name: 'successful_voting_title',
-    label: 'Message you see when you voted succesfully',
+    label: 'Message you see when you voted successfully',
     type: 'string',
     def: 'Gelukt, je hebt gestemd!'
   },
diff --git a/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js b/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
index 6d620a338..f18cd2940 100644
--- a/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
+++ b/packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
@@ -200,7 +200,7 @@ const fields = [
   },
   {
     name: 'successful_voting_title',
-    label: 'Message you see when you voted succesfully',
+    label: 'Message you see when you voted successfully',
     type: 'string',
     def: 'Gelukt, je hebt gestemd!'
   },

From c193031ca1f54dcc36dd2144d04773b23049a925 Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzoluk@gmail.com>
Date: Mon, 13 Feb 2023 12:02:26 +0100
Subject: [PATCH 11/20] Added message closed but open for admin / editor /
 moderator

---
 packages/cms/lib/modules/arguments-block-widgets/index.js     | 4 +++-
 .../cms/lib/modules/arguments-block-widgets/views/widget.html | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/cms/lib/modules/arguments-block-widgets/index.js b/packages/cms/lib/modules/arguments-block-widgets/index.js
index f35a3a616..f370927e2 100755
--- a/packages/cms/lib/modules/arguments-block-widgets/index.js
+++ b/packages/cms/lib/modules/arguments-block-widgets/index.js
@@ -24,13 +24,15 @@ module.exports = {
     const superLoad = self.load;
 		self.load = function(req, widgets, next) {
 			widgets.forEach((widget) => {
+        const data = req.data;
 
 			  let config = createConfig({
           widget: widget,
-          data: req.data,
+          data,
         });
 			  widget.config = config;
         widget.divId = widget.config.divId;
+        widget.isClosedButRoleAllowes= config.isClosed && (data.isAdmin || data.isEditor || data.isModerator);
       });
       
 			return superLoad(req, widgets, next);
diff --git a/packages/cms/lib/modules/arguments-block-widgets/views/widget.html b/packages/cms/lib/modules/arguments-block-widgets/views/widget.html
index 2b09d4422..d9bb1631e 100755
--- a/packages/cms/lib/modules/arguments-block-widgets/views/widget.html
+++ b/packages/cms/lib/modules/arguments-block-widgets/views/widget.html
@@ -13,6 +13,10 @@
 
 <div id="{{data.widget.containerId}}" class="osc-component" style="width: 100%; height: 100%;">
 
+  {% if data.activeResource and data.widget.isClosedButRoleAllowes %}
+  <p>Reageren is gesloten, maar je kunt nog reageren vanwege je rol/als {{data.openstadUser.role }}</p>
+
+  {% endif %}
   {% if data.activeResource and data.activeResource.publishDate %}
 	<div class="{{data.widget.divId}}" style="width: 100%; height: 100%;"></div>
   {% elif (data.isAdmin or data.isEditor or data.isModerator) and data.activeResourceType !== 'idea'%}

From 7a0197b3c561de9dc54a33459e155a4df6cfccb2 Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzo@savvy.codes>
Date: Mon, 13 Feb 2023 13:24:33 +0100
Subject: [PATCH 12/20] Update
 packages/cms/lib/modules/arguments-block-widgets/index.js

Co-authored-by: Rudi van Hierden <rudi@draad.nl>
---
 packages/cms/lib/modules/arguments-block-widgets/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cms/lib/modules/arguments-block-widgets/index.js b/packages/cms/lib/modules/arguments-block-widgets/index.js
index f370927e2..763d8871f 100755
--- a/packages/cms/lib/modules/arguments-block-widgets/index.js
+++ b/packages/cms/lib/modules/arguments-block-widgets/index.js
@@ -32,7 +32,7 @@ module.exports = {
         });
 			  widget.config = config;
         widget.divId = widget.config.divId;
-        widget.isClosedButRoleAllowes= config.isClosed && (data.isAdmin || data.isEditor || data.isModerator);
+        widget.isClosedButRoleAllows = config.isClosed && (data.isAdmin || data.isEditor || data.isModerator);
       });
       
 			return superLoad(req, widgets, next);

From b6f468f56bc91dbeaf30733ed5695625632847dc Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzo@savvy.codes>
Date: Mon, 13 Feb 2023 13:24:51 +0100
Subject: [PATCH 13/20] Update
 packages/cms/lib/modules/arguments-block-widgets/views/widget.html

Co-authored-by: Rudi van Hierden <rudi@draad.nl>
---
 .../lib/modules/arguments-block-widgets/views/widget.html    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/cms/lib/modules/arguments-block-widgets/views/widget.html b/packages/cms/lib/modules/arguments-block-widgets/views/widget.html
index d9bb1631e..726b0e923 100755
--- a/packages/cms/lib/modules/arguments-block-widgets/views/widget.html
+++ b/packages/cms/lib/modules/arguments-block-widgets/views/widget.html
@@ -13,8 +13,9 @@
 
 <div id="{{data.widget.containerId}}" class="osc-component" style="width: 100%; height: 100%;">
 
-  {% if data.activeResource and data.widget.isClosedButRoleAllowes %}
-  <p>Reageren is gesloten, maar je kunt nog reageren vanwege je rol/als {{data.openstadUser.role }}</p>
+  {% if data.activeResource and data.widget.isClosedButRoleAllows %}
+  <p>Reageren is gesloten, maar je kunt nog reageren vanwege je rol als {{ data.openstadUser.role }}</p>
+
 
   {% endif %}
   {% if data.activeResource and data.activeResource.publishDate %}

From eb888e9f6a9fa8d1705ee31444f6a5334cd91bd8 Mon Sep 17 00:00:00 2001
From: Niels Vegter <niels@denes.nl>
Date: Tue, 21 Feb 2023 11:44:41 +0100
Subject: [PATCH 14/20] Aloow for multiple tabs sections on a page

---
 .../cms/lib/modules/section-widgets/index.js  |  7 ++-
 .../modules/section-widgets/public/js/main.js | 50 ++++++++++++-------
 .../section-widgets/views/types/tabs.html     | 46 ++++++++---------
 3 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/packages/cms/lib/modules/section-widgets/index.js b/packages/cms/lib/modules/section-widgets/index.js
index de6ff8b26..596970bed 100644
--- a/packages/cms/lib/modules/section-widgets/index.js
+++ b/packages/cms/lib/modules/section-widgets/index.js
@@ -283,6 +283,11 @@ module.exports = {
         },
       ]
     },
+    {
+      name: 'sectionName',
+      type: 'string',
+      label: 'Name',
+    },
   ],
 
 
@@ -311,7 +316,7 @@ module.exports = {
       {
         name: 'tabs',
         label: 'Tabs',
-        fields: ['tabs']
+        fields: ['sectionName', 'tabs']
       }
     ]);
 
diff --git a/packages/cms/lib/modules/section-widgets/public/js/main.js b/packages/cms/lib/modules/section-widgets/public/js/main.js
index e094d3f8e..e01a1fb8d 100644
--- a/packages/cms/lib/modules/section-widgets/public/js/main.js
+++ b/packages/cms/lib/modules/section-widgets/public/js/main.js
@@ -7,39 +7,51 @@ apos.define('section-widgets', {
   }
 });
 
+function findMyHash($parent) {
+
+  let hashes = window.location.hash && window.location.hash.match(/#tab-\d+(?:-[^#]+)?/g);
+
+  for (let hash of hashes) {
+    let match = hash.match(/#tab-(\d+)(?:-([^#]+))?/);
+    if (match[2] && $parent.find(`.section-tabs-${match[2]}`).length) return hash;
+  }
+
+  for (let hash of hashes) {
+    let match = hash.match(/#tab-(\d+)(?:-([^#]+))?/);
+    if (!match[2]) return hash;
+  }
+
+}
 
 function initTabs ($parent) {
 
-  console.log("init tabs fout");
-  
   var $tabContainers = $parent.find('.tab-container');
 
-
   if ($tabContainers.length > 0) {
     $tabContainers.hide();
 
-    $(window).on( 'hashchange', function( e ) {
-      setContainerForHash($parent)
+    $(window).on('hashchange', function( e ) {
+      let hash = findMyHash($parent);
+      if (hash) setContainerForHash($parent, hash)
     });
 
-    if (!window.location.hash || window.location.hash.length === 0) {
+    let hash = findMyHash($parent);
+    if (!hash) {
       $parent.find('.nav-link').first().get(0).click();
     } else {
-      setContainerForHash($parent);
+      setContainerForHash($parent, hash);
     }
   }
 }
 
-
-function setContainerForHash($parent) {
-  var hash = window.location.hash;
-
-  if (hash.startsWith('#tab-')) {
-    $parent.find('.tab-container').hide();
-    $parent.find('.nav-link').removeClass('active')
-    var selector = 'a[href*="'+hash+'"]';
-    // console.log('selector', selector, $parent.find(selector))
-    $parent.find(selector).addClass('active')
-    $(hash).show();
-  }
+function setContainerForHash($parent, hash) {
+  let match = hash.match(/#tab-(\d+)(?:-([^#]+))?/);
+  let tabnumber = match[1];
+  let sectionName = match[1][2] || $parent[0].innerHTML.match(/class="section-tabs section-tabs-([^"]*)"/)[1];
+  hash = '#tab-' + tabnumber + (sectionName ? '-'+sectionName: '');
+  $parent.find('.tab-container').hide();
+  $parent.find('.nav-link').removeClass('active')
+  let selector = 'a[href*="'+'#tab-'+tabnumber+'-'+sectionName+'"]';
+  $parent.find(selector).addClass('active')
+  $parent.find('#tab-'+tabnumber+'-container').show();
 }
diff --git a/packages/cms/lib/modules/section-widgets/views/types/tabs.html b/packages/cms/lib/modules/section-widgets/views/types/tabs.html
index f096cd2e5..a02276c3b 100644
--- a/packages/cms/lib/modules/section-widgets/views/types/tabs.html
+++ b/packages/cms/lib/modules/section-widgets/views/types/tabs.html
@@ -1,27 +1,27 @@
 <style>
-    {{data.widget.formattedContainerStyles}}
+ {{data.widget.formattedContainerStyles}}
 </style>
-<div id="{{data.widget.containerId}}" class="section-tabs">
-    <div class="row">
-        <div class="col-xs-12">
-            <ul class="nav nav-tabs">
-            {% for tab in data.widget.tabs %}
-                <li class="nav-item">
-                    <a class="nav-link" href="#tab-{{loop.index}}" tabindex="{{loop.index + 1}}"> {{tab.title}} </a>
-                </li>
-            {% endfor %}
-            </ul>
-            {% for tab in data.widget.tabs %}
-            {% if tab.areaName %}
-            <div id="tab-{{loop.index}}" class="tab-container">
-                {{
-                    apos.area(data.widget, tab.areaName, {
-                        widgets: data.widget.contentWidgets
-                    })
-                }}
-            </div>
-            {% endif %}
-            {% endfor %}
-        </div>
+<div id="{{data.widget.containerId}}" class="section-tabs section-tabs-{{data.widget.sectionName}}">
+  <div class="row">
+    <div class="col-xs-12">
+      <ul class="nav nav-tabs">
+        {% for tab in data.widget.tabs %}
+        <li class="nav-item">
+          <a class="nav-link" href="#tab-{{loop.index}}-{{data.widget.sectionName}}" tabindex="{{loop.index + 1}}"> {{tab.title}} </a>
+        </li>
+        {% endfor %}
+      </ul>
+      {% for tab in data.widget.tabs %}
+      {% if tab.areaName %}
+      <div id="tab-{{loop.index}}-container" class="tab-container">
+        {{
+        apos.area(data.widget, tab.areaName, {
+        widgets: data.widget.contentWidgets
+        })
+        }}
+      </div>
+      {% endif %}
+      {% endfor %}
     </div>
+  </div>
 </div>

From 2ec38f9f10d0b2c9db9800dbe573104200732aa1 Mon Sep 17 00:00:00 2001
From: Niels Vegter <niels@denes.nl>
Date: Tue, 21 Feb 2023 12:13:03 +0100
Subject: [PATCH 15/20] Make js uglifyable

---
 .../modules/section-widgets/public/js/main.js | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/cms/lib/modules/section-widgets/public/js/main.js b/packages/cms/lib/modules/section-widgets/public/js/main.js
index e01a1fb8d..8a8dd9547 100644
--- a/packages/cms/lib/modules/section-widgets/public/js/main.js
+++ b/packages/cms/lib/modules/section-widgets/public/js/main.js
@@ -9,15 +9,17 @@ apos.define('section-widgets', {
 
 function findMyHash($parent) {
 
-  let hashes = window.location.hash && window.location.hash.match(/#tab-\d+(?:-[^#]+)?/g);
+  var hashes = window.location.hash && window.location.hash.match(/#tab-\d+(?:-[^#]+)?/g);
 
-  for (let hash of hashes) {
-    let match = hash.match(/#tab-(\d+)(?:-([^#]+))?/);
-    if (match[2] && $parent.find(`.section-tabs-${match[2]}`).length) return hash;
+  for (var i = 0; i < hashes.length; i++) {
+    var hash = hashes[i];
+    var match = hash.match(/#tab-(\d+)(?:-([^#]+))?/);
+    if (match[2] && $parent.find('.section-tabs-'+match[2]).length) return hash;
   }
 
-  for (let hash of hashes) {
-    let match = hash.match(/#tab-(\d+)(?:-([^#]+))?/);
+  for (var i = 0; i < hashes.length; i++) {
+    var hash = hashes[i];
+    var match = hash.match(/#tab-(\d+)(?:-([^#]+))?/);
     if (!match[2]) return hash;
   }
 
@@ -31,11 +33,11 @@ function initTabs ($parent) {
     $tabContainers.hide();
 
     $(window).on('hashchange', function( e ) {
-      let hash = findMyHash($parent);
+      var hash = findMyHash($parent);
       if (hash) setContainerForHash($parent, hash)
     });
 
-    let hash = findMyHash($parent);
+    var hash = findMyHash($parent);
     if (!hash) {
       $parent.find('.nav-link').first().get(0).click();
     } else {
@@ -45,13 +47,13 @@ function initTabs ($parent) {
 }
 
 function setContainerForHash($parent, hash) {
-  let match = hash.match(/#tab-(\d+)(?:-([^#]+))?/);
-  let tabnumber = match[1];
-  let sectionName = match[1][2] || $parent[0].innerHTML.match(/class="section-tabs section-tabs-([^"]*)"/)[1];
+  var match = hash.match(/#tab-(\d+)(?:-([^#]+))?/);
+  var tabnumber = match[1];
+  var sectionName = match[1][2] || $parent[0].innerHTML.match(/class="section-tabs section-tabs-([^"]*)"/)[1];
   hash = '#tab-' + tabnumber + (sectionName ? '-'+sectionName: '');
   $parent.find('.tab-container').hide();
   $parent.find('.nav-link').removeClass('active')
-  let selector = 'a[href*="'+'#tab-'+tabnumber+'-'+sectionName+'"]';
+  var selector = 'a[href*="'+'#tab-'+tabnumber+'-'+sectionName+'"]';
   $parent.find(selector).addClass('active')
   $parent.find('#tab-'+tabnumber+'-container').show();
 }

From 8766fe5dcf919856f9224d8218adee88b44008af Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzoluk@gmail.com>
Date: Fri, 3 Mar 2023 11:29:15 +0100
Subject: [PATCH 16/20] Added fallback text because if you did not commit on a
 preexisting form then the message will not be rendered

---
 .../modules/begroot-widgets/views/phase-voting/budgeting.html   | 2 +-
 .../views/phase-voting/budgeting.html                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html b/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
index 6b3b81450..57af62cd9 100644
--- a/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
+++ b/packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
@@ -356,7 +356,7 @@ <h3 class="icon-header icon-header--blue">
 					<div id="steps-content-6" class="step">
 						<div class="text">
 							<div class="checkmark-block-green">
-								<h4>{{data.widget.successful_voting_title}}</h4>
+								<h4>{{data.widget.successful_voting_title or "Gelukt, je hebt gestemd!"}}</h4>
 								<br/>
 								{{data.widget.thankyou_message | sanitize | safe | nlbr}}
 								{% if data.widget.showNewsletterButton and data.widget.showNewsletterButton == 'yes' %}
diff --git a/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html b/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
index ea71aede4..1998f5109 100644
--- a/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
+++ b/packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
@@ -368,7 +368,7 @@ <h3 class="icon-header icon-header--blue">
 					<div id="steps-content-6" class="step">
 						<div class="text">
 							<div class="checkmark-block-green">
-								<h4>{{data.widget.successful_voting_title}}</h4>
+								<h4>{{data.widget.successful_voting_title or "Gelukt, je hebt gestemd!"}}</h4>
 								<br/>
 								{{data.widget.thankyou_message | sanitize | safe | nlbr}}
 								{% if data.widget.showNewsletterButton and data.widget.showNewsletterButton == 'yes' %}

From 8846a6816e9f36eed04a446f5f5c7e89b7cbcc47 Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzo@savvy.codes>
Date: Tue, 7 Mar 2023 14:18:55 +0100
Subject: [PATCH 17/20] Feature/group tags like mzm (#386)

* Added grouping capabilities to tags on ideas(plannen) on create plannen page

* Added tagid to checbox and label instead of non working option

* specify if theme labels should be shown

* Made it so tags can be grouped by use of extraData.theme

* Changed default of showing labels to false for and made name consistent

* Changed implementation to use type

* Put back cache

* Renamed theme fields to tagType

* Added cache key for if an empty list was fetched

* Added cachekey for empty list
---
 .../modules/openstad-pages/lib/load-tags.js   | 15 ++++-
 .../resource-form-widgets/lib/fields.js       | 23 ++++++-
 .../views/includes/fields/tags.html           | 61 +++++++++++++++----
 .../resource-overview-widgets/index.js        |  2 +
 .../lib/arrangeFields.js                      |  2 +-
 .../resource-overview-widgets/lib/fields.js   | 20 ++++++
 .../views/includes/controls/tags.html         | 46 ++++++++++++--
 7 files changed, 146 insertions(+), 23 deletions(-)

diff --git a/packages/cms/lib/modules/openstad-pages/lib/load-tags.js b/packages/cms/lib/modules/openstad-pages/lib/load-tags.js
index 77ce69f5c..e27fb13b3 100644
--- a/packages/cms/lib/modules/openstad-pages/lib/load-tags.js
+++ b/packages/cms/lib/modules/openstad-pages/lib/load-tags.js
@@ -1,4 +1,5 @@
 const rp              = require('request-promise');
+const _ = require('lodash');
 const moment          = require('moment'); // returns the new locale, in this case 'de'
 const url             = require('url');
 const internalApiUrl  = process.env.INTERNAL_API_URL;
@@ -17,18 +18,23 @@ module.exports =  function (req, res, next) {
    */
   if (globalData.siteId) {
     let tags;
-
+    let retrievedEmpty = false;
     // if cacheIdeas is turned on, get ideas from cache
     // cacheIdeas is old key, should be refactored,
     // preferable we always have caching on
+
     if (globalData.cacheIdeas) {
       let cacheKey = 'tags-' + globalData.siteId;
       tags = cache.get(cacheKey);
+      retrievedEmpty = cache.get(globalData.siteId + '-retrieved-tags-empty');
     }
-
+    
     if (Array.isArray(tags)) {
       req.data.openstadTags = tags;
       next();
+    } else if(retrievedEmpty) {
+      req.data.openstadTags = [];
+      next();
     } else {
 
       var options = {
@@ -42,9 +48,14 @@ module.exports =  function (req, res, next) {
           //add tags to to the data object so it's available in templates
           //use openstadTags instead of tags  to prevent colliding with Apos
           req.data.openstadTags = response;
+          req.data.groupedOpenstadTags = _.groupBy(response, function(tag){return tag.type});
 
           // set the cache
           if (globalData.cacheIdeas) {
+            cache.set(globalData.siteId + '-retrieved-tags-empty', response.length === 0, {
+              life: cacheLifespan
+            })
+
             cache.set('tags-' +req.data.global.siteId, response, {
               life: cacheLifespan
             });
diff --git a/packages/cms/lib/modules/resource-form-widgets/lib/fields.js b/packages/cms/lib/modules/resource-form-widgets/lib/fields.js
index e2839af36..9a84661ca 100644
--- a/packages/cms/lib/modules/resource-form-widgets/lib/fields.js
+++ b/packages/cms/lib/modules/resource-form-widgets/lib/fields.js
@@ -148,7 +148,7 @@ const fields = [
               {
                 value: 'tags',
                 label: "Tags (currently only works for ideas)",
-                showFields: ['fieldKey', 'fieldRequired', 'fieldMin', 'fieldMax']
+                showFields: ['fieldKey', 'fieldRequired', 'tagType', 'showTagTypeLabels', 'fieldMin', 'fieldMax']
               },
               {
                 value: 'raw',
@@ -296,6 +296,27 @@ const fields = [
             type: 'string',
             textarea: true
           },
+          {
+            name: 'tagType',
+            label: 'Optionally specify the single type (one word) by which to fetch the tags.',
+            type: 'string'
+          },
+          {
+            name: 'showTagTypeLabels',
+            label: 'When the above option is empty, select if the corresponding types should be shown or not',
+            type: 'boolean',
+            choices: [
+              {
+                label: 'Yes',
+                value: true,
+              },
+              {
+                label: 'No',
+                value: false,
+              }
+            ],
+            def: false
+          },
           {
             name: 'notExtraDataKey',
             label: 'Save field in root if data object and not in extraData, will only work if column exists in database)',
diff --git a/packages/cms/lib/modules/resource-form-widgets/views/includes/fields/tags.html b/packages/cms/lib/modules/resource-form-widgets/views/includes/fields/tags.html
index 1f1aafca9..d5c445c27 100644
--- a/packages/cms/lib/modules/resource-form-widgets/views/includes/fields/tags.html
+++ b/packages/cms/lib/modules/resource-form-widgets/views/includes/fields/tags.html
@@ -1,17 +1,52 @@
 <div class="checkbox-container">
-  {% for tag in data.openstadTags %}
-  <div class="checkbox">
-    <input
-      type="checkbox"
-      name="tags[]"
-      value="{{tag.id}}"
-      id="checkbox-{{loop.index}}-{{option.value}}"
-      {% if field.fieldRequired %}required{% endif %}
-      {% if field.idea.tags %}checked{% endif %}
-    />
-    <label for="checkbox-{{loop.index}}-{{option.value}}" class="checkbox-label">
-       {{tag.name}}
-    </label>
+  {% if field.tagType 
+        and data.groupedOpenstadTags[field.tagType] 
+        and data.groupedOpenstadTags[field.tagType].length %}
+
+    {% for tag in data.groupedOpenstadTags[field.tagType] %}
+      <div class="checkbox">
+        <input
+          type="checkbox"
+          name="tags[]"
+          value="{{tag.id}}"
+          id="checkbox-{{loop.index}}-{{tag.id}}"
+          {% if field.fieldRequired %}required{% endif %}
+          {% if field.idea.tags %}checked{% endif %}
+        />
+        <label for="checkbox-{{loop.index}}-{{tag.id}}" class="checkbox-label">{{tag.name}}</label>
+      </div>    
+    {% endfor %}
+  {% endif %}
   </div>
+
+
+  {% if field.tagType === '' or field.tagType === undefined %}
+  {% for key, tagList in data.groupedOpenstadTags %}
+    {% set outer_loop = loop %}
+
+    {% if field.showTagTypeLabels %}
+      {% if outer_loop.length > 1 and key !== 'undefined' %}
+        <p>{{key}}</p>
+      {% endif %}
+
+      {% if outer_loop.length > 1 and key == 'undefined' %}
+        <p>Overig</p>
+      {% endif %}
+    {% endif %}
+
+      {% for tag in tagList %}
+      <div class="checkbox">
+        <input
+          type="checkbox"
+          name="tags[]"
+          value="{{tag.id}}"
+          id="checkbox-{{outer_loop.index}}-{{loop.index}}-{{tag.id}}"
+          {% if field.fieldRequired %}required{% endif %}
+          {% if field.idea.tags %}checked{% endif %}
+        />
+        <label for="checkbox-{{outer_loop.index}}-{{loop.index}}-{{tag.id}}" class="checkbox-label">{{tag.name}}</label>
+      </div>    
+    {% endfor %}
   {% endfor %}
+{% endif %}
 </div>
diff --git a/packages/cms/lib/modules/resource-overview-widgets/index.js b/packages/cms/lib/modules/resource-overview-widgets/index.js
index 37005a532..d9f9033ed 100644
--- a/packages/cms/lib/modules/resource-overview-widgets/index.js
+++ b/packages/cms/lib/modules/resource-overview-widgets/index.js
@@ -261,6 +261,8 @@ module.exports = {
                     return Object.assign({}, tag);
                 }) : [];
 
+                widget.groupedOpenstadTags = req.data.groupedOpenstadTags;
+
                 let response;
 
                 // if cache is turned on, check if current url is available in cache
diff --git a/packages/cms/lib/modules/resource-overview-widgets/lib/arrangeFields.js b/packages/cms/lib/modules/resource-overview-widgets/lib/arrangeFields.js
index 9382f176a..2e290ba93 100644
--- a/packages/cms/lib/modules/resource-overview-widgets/lib/arrangeFields.js
+++ b/packages/cms/lib/modules/resource-overview-widgets/lib/arrangeFields.js
@@ -55,7 +55,7 @@ module.exports = (self, options) => {
         {
             name: 'tags',
             label: 'Tags',
-            fields: ['displayTagFilters']
+            fields: ['displayTagFilters', 'tagType', 'showTagTypeLabels']
         },
         {
             name: 'include_exclude',
diff --git a/packages/cms/lib/modules/resource-overview-widgets/lib/fields.js b/packages/cms/lib/modules/resource-overview-widgets/lib/fields.js
index fede604cc..7743c5616 100644
--- a/packages/cms/lib/modules/resource-overview-widgets/lib/fields.js
+++ b/packages/cms/lib/modules/resource-overview-widgets/lib/fields.js
@@ -541,6 +541,26 @@ module.exports = [
       }
     ],
   },
+  {
+    name: 'tagType',
+    label: 'If specified only show tags belonging to a certain type',
+    type: 'string',
+  },
+  {
+    name: 'showTagTypeLabels',
+    label: 'If no tag type is specified, should the type name be shown per group?',
+    type: 'boolean',
+    choices: [
+      {
+        label: 'Yes',
+        value: true
+      },
+      {
+        label: 'No',
+        value: false,
+      }
+    ],
+  },
   {
     name: 'displaySorting',
     label: 'Display sorting',
diff --git a/packages/cms/lib/modules/resource-overview-widgets/views/includes/controls/tags.html b/packages/cms/lib/modules/resource-overview-widgets/views/includes/controls/tags.html
index 3ba68c960..6aec1f4ac 100644
--- a/packages/cms/lib/modules/resource-overview-widgets/views/includes/controls/tags.html
+++ b/packages/cms/lib/modules/resource-overview-widgets/views/includes/controls/tags.html
@@ -5,13 +5,47 @@
   </a>
 </div>
 <div class="resource-overview-tags-container hidden-xs">
-  {% for tag in data.widget.openstadTags %}
-  {% if data.widget.isTagSelected(tag, data.query) %}
-  <a href="{{data.widget.formatTagRemoveUrl(tag, data.query)}}" class="resource-tag resource-tag--selected openstad-ajax-refresh-link" data-reset-pagination="1" data-reset-hash="1">{{tag.name}}</a>
-  {% else %}
-  <a href="{{data.widget.formatTagSelectUrl(tag, data.query)}}" class="resource-tag openstad-ajax-refresh-link" data-reset-pagination="1" data-reset-hash="1">{{tag.name}}</a>
+
+  {% if data.widget.tagType and data.widget.groupedOpenstadTags[data.widget.tagType] and data.widget.groupedOpenstadTags[data.widget.tagType].length %}
+    {% for tag in data.widget.groupedOpenstadTags[data.widget.tagType] %}
+      {% if data.widget.isTagSelected(tag, data.query) %}
+        <a href="{{data.widget.formatTagRemoveUrl(tag, data.query)}}" class="resource-tag resource-tag--selected openstad-ajax-refresh-link" data-reset-pagination="1" data-reset-hash="1">{{tag.name}}asdfsaf</a>
+        {% else %}
+        <a href="{{data.widget.formatTagSelectUrl(tag, data.query)}}" class="resource-tag openstad-ajax-refresh-link" data-reset-pagination="1" data-reset-hash="1">{{tag.name}}fasfasfds</a>
+      {% endif %}
+    {% endfor %}
   {% endif %}
-  {% endfor %}
+
+
+  
+
+  {% if data.widget.tagType === '' and data.widget.groupedOpenstadTags %}
+
+    {% for key, tagList in data.widget.groupedOpenstadTags %}
+
+      {% if data.widget.showTagTypeLabels %}
+        <div>
+           
+          <p> {{ "tags" if key === 'undefined' else key }}</p>
+            {% for tag in tagList %}
+              {% if data.widget.isTagSelected(tag, data.query) %}
+                <a href="{{data.widget.formatTagRemoveUrl(tag, data.query)}}" class="resource-tag resource-tag--selected openstad-ajax-refresh-link" data-reset-pagination="1" data-reset-hash="1">{{tag.name}}</a>
+                {% else %}
+                <a href="{{data.widget.formatTagSelectUrl(tag, data.query)}}" class="resource-tag openstad-ajax-refresh-link" data-reset-pagination="1" data-reset-hash="1">{{tag.name}}</a>
+              {% endif %}
+            {% endfor %}
+          </div>
+      {% else%}
+      {% for tag in tagList %}
+        {% if data.widget.isTagSelected(tag, data.query) %}
+          <a href="{{data.widget.formatTagRemoveUrl(tag, data.query)}}" class="resource-tag resource-tag--selected openstad-ajax-refresh-link" data-reset-pagination="1" data-reset-hash="1">{{tag.name}}</a>
+          {% else %}
+          <a href="{{data.widget.formatTagSelectUrl(tag, data.query)}}" class="resource-tag openstad-ajax-refresh-link" data-reset-pagination="1" data-reset-hash="1">{{tag.name}}</a>
+        {% endif %}
+      {% endfor %}
+    {% endif%}  
+  {% endfor %}  
+{% endif %}
 </div>
 <div id="filter-tags-modal" class="content-modal content-modal--l">
   <div class="content-modal-content">

From e928524c19aa16d9ac523c9ced27fb035e2053c2 Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzo@savvy.codes>
Date: Thu, 13 Apr 2023 10:57:11 +0200
Subject: [PATCH 18/20] Bugfix/tags remember choices on edit idea (#389)

* added forgotten groupedTags from cache

* Clean up test code

* Added fallback when choosing static form with dynamic fields
---
 packages/cms/lib/modules/openstad-pages/lib/load-tags.js   | 2 ++
 packages/cms/lib/modules/resource-form-widgets/index.js    | 6 ++++++
 .../lib/modules/resource-form-widgets/public/js/main.js    | 7 ++++++-
 .../resource-form-widgets/views/includes/fields/tags.html  | 6 +++---
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/packages/cms/lib/modules/openstad-pages/lib/load-tags.js b/packages/cms/lib/modules/openstad-pages/lib/load-tags.js
index e27fb13b3..dd234fa3d 100644
--- a/packages/cms/lib/modules/openstad-pages/lib/load-tags.js
+++ b/packages/cms/lib/modules/openstad-pages/lib/load-tags.js
@@ -31,6 +31,8 @@ module.exports =  function (req, res, next) {
     
     if (Array.isArray(tags)) {
       req.data.openstadTags = tags;
+      req.data.groupedOpenstadTags = _.groupBy(tags, function(tag){return tag.type});
+
       next();
     } else if(retrievedEmpty) {
       req.data.openstadTags = [];
diff --git a/packages/cms/lib/modules/resource-form-widgets/index.js b/packages/cms/lib/modules/resource-form-widgets/index.js
index 93ec4c5ce..44e4188b9 100644
--- a/packages/cms/lib/modules/resource-form-widgets/index.js
+++ b/packages/cms/lib/modules/resource-form-widgets/index.js
@@ -185,6 +185,12 @@ module.exports = {
         const isReactedTo = activeResource ? (activeResource.yes > 0 || activeResource.no > 0 || activeResource.argumentCount > 0) : false;
         const isOwnerOrAdmin = ((!isReactedTo || !widget.hideAdminAfterPublicAction) && isOwner) || req.data.hasModeratorRights;
 
+
+        widget.isTagSelected = function(tagId) {
+          if(!activeResource || !Array.isArray(activeResource.tags)) return false;
+          return activeResource.tags.findIndex(t => t.id === tagId) !== -1;
+        }
+
         widget.mapConfig = self.getMapConfigBuilder(globalData)
           .setDefaultSettings({
             mapCenterLat: (activeResource && activeResource.location && activeResource.location.coordinates && activeResource.location.coordinates[0]) || globalData.mapCenterLat,
diff --git a/packages/cms/lib/modules/resource-form-widgets/public/js/main.js b/packages/cms/lib/modules/resource-form-widgets/public/js/main.js
index 0b97cedad..e5bbee84c 100644
--- a/packages/cms/lib/modules/resource-form-widgets/public/js/main.js
+++ b/packages/cms/lib/modules/resource-form-widgets/public/js/main.js
@@ -188,7 +188,6 @@ $(document).ready(function () {
 
         $(form).find('input[type="submit"]').each(function(index, button) {
           oldButtonValues.push($(this).val());
-
           if(button.id === "btnSaveAsConcept" && publishField.val()) {
             $(this).val('Verzenden...');
           } else if(!publishField.val()) {
@@ -206,6 +205,12 @@ $(document).ready(function () {
           success:function(response) {
               formHasChanged = false;
               var redirect = $(form).find('.form-redirect-uri').val();
+
+              // for some reason when you select the dynamic form then the input field with class .form-redirect-uri is not within the form
+              if(!redirect) {
+                redirect = document.querySelector('.form-redirect-uri').value;
+              }
+
               redirect = redirect.replace(':id', response.id);
               redirect = window.siteUrl + redirect;
 
diff --git a/packages/cms/lib/modules/resource-form-widgets/views/includes/fields/tags.html b/packages/cms/lib/modules/resource-form-widgets/views/includes/fields/tags.html
index d5c445c27..858c80bdd 100644
--- a/packages/cms/lib/modules/resource-form-widgets/views/includes/fields/tags.html
+++ b/packages/cms/lib/modules/resource-form-widgets/views/includes/fields/tags.html
@@ -18,8 +18,8 @@
     {% endfor %}
   {% endif %}
   </div>
-
-
+  
+  
   {% if field.tagType === '' or field.tagType === undefined %}
   {% for key, tagList in data.groupedOpenstadTags %}
     {% set outer_loop = loop %}
@@ -42,7 +42,7 @@
           value="{{tag.id}}"
           id="checkbox-{{outer_loop.index}}-{{loop.index}}-{{tag.id}}"
           {% if field.fieldRequired %}required{% endif %}
-          {% if field.idea.tags %}checked{% endif %}
+          {% if data.widget.isTagSelected(tag.id) %}checked{% endif %}
         />
         <label for="checkbox-{{outer_loop.index}}-{{loop.index}}-{{tag.id}}" class="checkbox-label">{{tag.name}}</label>
       </div>    

From 9e09f78dacd1ee9a9b5476638fe88c337ce1c429 Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzo@savvy.codes>
Date: Wed, 26 Apr 2023 16:33:22 +0200
Subject: [PATCH 19/20] make inzendingPath the same as global config > ideaSlug
 (#392)

---
 packages/cms/lib/modules/openstad-api/lib/api.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/cms/lib/modules/openstad-api/lib/api.js b/packages/cms/lib/modules/openstad-api/lib/api.js
index 267c6cbad..89b434c5c 100644
--- a/packages/cms/lib/modules/openstad-api/lib/api.js
+++ b/packages/cms/lib/modules/openstad-api/lib/api.js
@@ -10,8 +10,12 @@ module.exports = (self, options) => {
   };
 
   self.updateSiteConfig = async (req, siteConfig, item, apiSyncFields) => {
-
     apiSyncFields.forEach(field => {
+      if(field.name === 'ideaSlug') {
+        siteConfig.ideas.feedbackEmail["inzendingPath"] = item.ideaSlug;
+        siteConfig.ideas.conceptEmail["inzendingPath"] = item.ideaSlug;
+        siteConfig.ideas.conceptToPublishedEmail["inzendingPath"] = item.ideaSlug;
+      }
       //item is the inter global config
       const value = self.getFieldValue(item, field);
       self.setApiConfigValue(siteConfig, field.apiSyncField, value);

From 90082562b6df492a5a1257d78ee5e29765759e73 Mon Sep 17 00:00:00 2001
From: LorenzoJokhan <lorenzo@savvy.codes>
Date: Tue, 2 May 2023 09:39:18 +0200
Subject: [PATCH 20/20] Changed reading of activeResource param in html (#393)

---
 .../views/display/user-activity.html                      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/cms/lib/modules/resource-representation-widgets/views/display/user-activity.html b/packages/cms/lib/modules/resource-representation-widgets/views/display/user-activity.html
index bb0f40381..b3989dd73 100644
--- a/packages/cms/lib/modules/resource-representation-widgets/views/display/user-activity.html
+++ b/packages/cms/lib/modules/resource-representation-widgets/views/display/user-activity.html
@@ -6,8 +6,8 @@ <h4> Activiteit op deze website     {{data.nielsisgek}}
   </h4>
   <ul class="user-activity-list">
 
-    {% if data.widget.activeResource.activity %}
-    {% for activity in data.widget.activeResource.activity %}
+    {% if data.activeResource.activity %}
+    {% for activity in data.activeResource.activity %}
     {% if data.global.siteId === activity.site.id %}
     {% set counterThisSite = counterThisSite + 1 %}
 
@@ -25,8 +25,8 @@ <h4> Activiteit op deze website     {{data.nielsisgek}}
     <br />
     <h4> Activiteit op andere websites</h4>
     <ul class="user-activity-list">
-        {% if data.widget.activeResource.activity %}
-        {% for activity in data.widget.activeResource.activity %}
+        {% if data.activeResource.activity %}
+        {% for activity in data.activeResource.activity %}
         {% if data.global.siteId !== activity.site.id %}
         {% set counterOtherSites = counterOtherSites + 1 %}