Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/edit succesfull voting on budgeting widget #383

Merged
merged 7 commits into from
Feb 13, 2023
Merged

Feature/edit succesfull voting on budgeting widget #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
55f1c9a
Made it so the title can be changed of the succesfull voting message
LorenzoJokhan Feb 10, 2023
db8ecf2
Added field to phase-voting-budgeting
LorenzoJokhan Feb 10, 2023
965e33f
Corrected spelling
LorenzoJokhan Feb 13, 2023
e308544
Corrected spelling
LorenzoJokhan Feb 13, 2023
14c18ee
Changed spelling of successful
LorenzoJokhan Feb 13, 2023
1dd2436
changed spelling in label of field
LorenzoJokhan Feb 13, 2023
b6a20f9
Merge branch 'development' into feature/edit-succesfull-voting-on-bud…
LorenzoJokhan Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/cms/lib/modules/begroot-widgets/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 'successful_voting_title',
label: 'Message you see when you voted successfully',
type: 'string',
def: 'Gelukt, je hebt gestemd!'
},
{
name: 'thankyou_message',
label: 'Thank you message',
Expand Down
2 changes: 1 addition & 1 deletion packages/cms/lib/modules/begroot-widgets/views/phase-voting/budgeting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.successful_voting_title}}</h4>
<br/>
{{data.widget.thankyou_message | sanitize | safe | nlbr}}
{% if data.widget.showNewsletterButton and data.widget.showNewsletterButton == 'yes' %}
Expand Down
2 changes: 1 addition & 1 deletion packages/cms/lib/modules/participatory-budgeting-widgets/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = {
{
name: 'explanation-texts',
label: 'Explanation texts',
fields: ['step_1_intro', 'step_2_intro', 'step_3_intro', 'step_3_successful_auth', 'thankyou_message', 'showNewsletterButton', 'newsletterButtonText']
fields: ['step_1_intro', 'step_2_intro', 'step_3_intro', 'step_3_successful_auth','successful_voting_title', 'thankyou_message', 'showNewsletterButton', 'newsletterButtonText']
},
{
name: 'authentication',
Expand Down
6 changes: 6 additions & 0 deletions packages/cms/lib/modules/participatory-budgeting-widgets/lib/fields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 'successful_voting_title',
label: 'Message you see when you voted successfully',
type: 'string',
def: 'Gelukt, je hebt gestemd!'
},
{
name: 'thankyou_message',
label: 'Thank you message',
Expand Down
2 changes: 1 addition & 1 deletion packages/cms/lib/modules/participatory-budgeting-widgets/views/phase-voting/budgeting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.successful_voting_title}}</h4>
<br/>
{{data.widget.thankyou_message | sanitize | safe | nlbr}}
{% if data.widget.showNewsletterButton and data.widget.showNewsletterButton == 'yes' %}
Expand Down