From 863433c127516b39cbb71e488c3f16b02f2b5499 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Thu, 14 Jan 2021 15:16:02 +0000 Subject: [PATCH 1/3] Stop legend duplication on set-inbound-number --- app/main/forms.py | 2 +- .../service-settings/set-inbound-number.html | 30 ++++++++++++++----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 8d0b14427..045854de2 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1928,7 +1928,7 @@ class ServiceInboundNumberForm(StripWhitespaceForm): self.inbound_number.choices = kwargs['inbound_number_choices'] inbound_number = GovukRadiosField( - "Select your inbound number", + "Set inbound number", thing='an inbound number', ) diff --git a/app/templates/views/service-settings/set-inbound-number.html b/app/templates/views/service-settings/set-inbound-number.html index 4024c073f..9ef6fc5d4 100644 --- a/app/templates/views/service-settings/set-inbound-number.html +++ b/app/templates/views/service-settings/set-inbound-number.html @@ -2,25 +2,39 @@ {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import sticky_page_footer %} {% from "components/form.html" import form_wrapper %} +{% from "components/back-link/macro.njk" import govukBackLink %} + +{% set page_title = 'Set inbound number' %} {% block service_page_title %} - Set inbound number + {{ page_title }} {% endblock %} {% block maincolumn_content %} + {% if current_service.has_inbound_number or no_available_numbers %} {{ page_header( - 'Set inbound number', + page_title, back_link=url_for('.service_settings', service_id=current_service.id) ) }} - {% if current_service.has_inbound_number %} + {% endif %} + {% if current_service.has_inbound_number %}

This service already has an inbound number

- {% elif no_available_numbers %} + {% elif no_available_numbers %}

No available inbound numbers

- {% else %} - {% call form_wrapper() %} - {{ form.inbound_number }} + {% else %} + {{ govukBackLink({ "href": url_for('.service_settings', service_id=current_service.id) }) }} + {% call form_wrapper(class="govuk-!-margin-top-3") %} + {{ form.inbound_number(param_extensions={ + 'fieldset': { + 'legend': { + 'text': page_title, + 'isPageHeading': True, + 'classes': 'govuk-fieldset__legend--l' + } + } + }) }} {{ sticky_page_footer('Save') }} {% endcall %} - {% endif %} + {% endif %} {% endblock %} From 8974ffb43d3c3f13d8156647af797b74e7d9de13 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 15 Jan 2021 11:10:00 +0000 Subject: [PATCH 2/3] Stop legend duplication on disable-platform-admin --- app/main/views/user_profile.py | 4 ++- .../disable-platform-admin-view.html | 25 +++++++++++++------ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app/main/views/user_profile.py b/app/main/views/user_profile.py index a3be79178..9aaff0717 100644 --- a/app/main/views/user_profile.py +++ b/app/main/views/user_profile.py @@ -209,12 +209,14 @@ def user_profile_disable_platform_admin_view(): abort(403) form = ServiceOnOffSettingForm( - name="Signing in again clears this setting", + name="Use platform admin view", enabled=not session.get('disable_platform_admin_view'), truthy='Yes', falsey='No', ) + form.enabled.param_extensions = {"hint": {"text": "Signing in again clears this setting"}} + if form.validate_on_submit(): session['disable_platform_admin_view'] = not form.enabled.data return redirect(url_for('.user_profile')) diff --git a/app/templates/views/user-profile/disable-platform-admin-view.html b/app/templates/views/user-profile/disable-platform-admin-view.html index a0f4f9b10..10888fd0f 100644 --- a/app/templates/views/user-profile/disable-platform-admin-view.html +++ b/app/templates/views/user-profile/disable-platform-admin-view.html @@ -1,23 +1,32 @@ {% extends "withoutnav_template.html" %} {% from "components/form.html" import form_wrapper %} {% from "components/page-footer.html" import page_footer %} -{% from "components/page-header.html" import page_header %} +{% from "components/back-link/macro.njk" import govukBackLink %} + +{% set page_title = 'Use platform admin view' %} {% block per_page_title %} - Use platform admin view + {{ page_title }} {% endblock %} {% block maincolumn_content %}
- {{ page_header( - 'Use platform admin view', - back_link=url_for('.user_profile') - ) }} + {{ govukBackLink({ "href": url_for('.user_profile') }) }} - {% call form_wrapper() %} - {{ form.enabled }} + {% call form_wrapper(class="govuk-!-margin-top-3") %} + {{ form.enabled(param_extensions={ + 'fieldset': { + 'legend': { + 'isPageHeading': True, + 'classes': 'govuk-fieldset__legend--l' + } + }, + 'hint': { + 'text': 'Signing in again clears this setting' + } + }) }} {{ page_footer('Save') }} {% endcall %}
From 99146f52980dd723ee9533205ac5def623aa3f26 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 15 Jan 2021 11:12:56 +0000 Subject: [PATCH 3/3] Extra for set-inbound-number --- app/templates/views/service-settings/set-inbound-number.html | 1 - 1 file changed, 1 deletion(-) diff --git a/app/templates/views/service-settings/set-inbound-number.html b/app/templates/views/service-settings/set-inbound-number.html index 9ef6fc5d4..f7e423523 100644 --- a/app/templates/views/service-settings/set-inbound-number.html +++ b/app/templates/views/service-settings/set-inbound-number.html @@ -27,7 +27,6 @@ {{ form.inbound_number(param_extensions={ 'fieldset': { 'legend': { - 'text': page_title, 'isPageHeading': True, 'classes': 'govuk-fieldset__legend--l' }