Skip to content

Commit

Permalink
[#906] Renamed select_questionnaire_intro field to be consistent with…
Browse files Browse the repository at this point in the history
… other code
  • Loading branch information
Bart van der Schoor committed Nov 16, 2022
1 parent 352fa26 commit c58e012
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/open_inwoner/configurations/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class SiteConfigurarionAdmin(OrderedInlineModelAdminMixin, SingletonModelAdmin):
"home_questionnaire_title",
"home_questionnaire_intro",
"select_questionnaire_title",
"select_questionnaire_subtitle",
"select_questionnaire_intro",
"plans_intro",
"plans_no_plans_message",
"plans_edit_message",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.15 on 2022-11-16 11:48

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
("configurations", "0024_alter_siteconfiguration_home_questionnaire_intro"),
]

operations = [
migrations.RenameField(
model_name="siteconfiguration",
old_name="select_questionnaire_subtitle",
new_name="select_questionnaire_intro",
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Generated by Django 3.2.15 on 2022-11-16 11:49

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
(
"configurations",
"0025_rename_select_questionnaire_subtitle_siteconfiguration_select_questionnaire_intro",
),
]

operations = [
migrations.AlterField(
model_name="siteconfiguration",
name="select_questionnaire_intro",
field=models.TextField(
default="Kies hieronder één van de volgende vragenlijsten om de zelfdiagnose te starten.",
help_text="Questionaire selector intro on the theme and profile pages.",
verbose_name="Questionaire selector widget intro",
),
),
]
7 changes: 3 additions & 4 deletions src/open_inwoner/configurations/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,12 @@ class SiteConfiguration(SingletonModel):
verbose_name=_("Questionaire selector widget title"),
help_text=_("Questionaire selector title on the theme and profile pages."),
)
select_questionnaire_subtitle = models.CharField(
max_length=255,
select_questionnaire_intro = models.TextField(
default=_(
"Kies hieronder één van de volgende vragenlijsten om de zelfdiagnose te starten."
),
verbose_name=_("Questionaire selector widget sub-title"),
help_text=_("Questionaire selector sub-title on the theme and profile pages."),
verbose_name=_("Questionaire selector widget intro"),
help_text=_("Questionaire selector intro on the theme and profile pages."),
)
plans_intro = models.TextField(
default=_(
Expand Down
2 changes: 1 addition & 1 deletion src/open_inwoner/templates/pages/category/detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h1 class="h1">
<div class="column column--start-1 column--span-6 ">
<aside class="questionnaire">
<h2 class="h2">{{configurable_text.questionnaire_page.select_questionnaire_title}}</h2>
<p class="p">{{configurable_text.questionnaire_page.select_questionnaire_subtitle}}</p>
<p class="p">{{configurable_text.questionnaire_page.select_questionnaire_intro|linebreaksbr}}</p>
{% questionnaire root_nodes=questionnaire_roots %}
</aside>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{% block content %}
<h1 class="h1">{{configurable_text.questionnaire_page.select_questionnaire_title}}</h1>
<p class="p">{{configurable_text.questionnaire_page.select_questionnaire_subtitle}}</p>
<p class="p">{{configurable_text.questionnaire_page.select_questionnaire_intro|linebreaksbr}}</p>

{% questionnaire root_nodes=root_nodes %}
{% endblock content %}
2 changes: 1 addition & 1 deletion src/open_inwoner/utils/context_processors.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def settings(request):
},
"questionnaire_page": {
"select_questionnaire_title": config.select_questionnaire_title,
"select_questionnaire_subtitle": config.select_questionnaire_subtitle,
"select_questionnaire_intro": config.select_questionnaire_intro,
},
"footer": {
"footer_visiting_title": config.footer_visiting_title,
Expand Down

0 comments on commit c58e012

Please sign in to comment.