From c9151e2663da6017ec1e1e392395b43f384d1585 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Thu, 2 Jul 2020 16:05:17 +0100 Subject: [PATCH] Convert radios on set-service-setting.html Uses the ServiceOnOffSettingForm.enabled. Effects the following routes: - /services//service-settings/switch-live - /services//service-settings/switch-count-as-live - /services//service-settings/permissions/ - /services//service-settings/permissions/broadcast Includes changes to make the GOVUK radios component render the h1 in the page. This is done so the legend doesn't just duplicate the h1 and is recommended in the design system guidance for the radios component for pages that just ask you for one piece of information. https://design-system.service.gov.uk/components/radios/#how-it-works --- .../service-settings/set-service-setting.html | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/app/templates/views/service-settings/set-service-setting.html b/app/templates/views/service-settings/set-service-setting.html index 98cabfe20..ce81df5ee 100644 --- a/app/templates/views/service-settings/set-service-setting.html +++ b/app/templates/views/service-settings/set-service-setting.html @@ -1,8 +1,7 @@ {% extends "withnav_template.html" %} -{% from "components/radios.html" import radios %} -{% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %} +{% from "components/back-link/macro.njk" import govukBackLink %} {% block service_page_title %} {{ title }} @@ -12,12 +11,20 @@
- {{ page_header( - title, - back_link=url_for('.service_settings', service_id=current_service.id) - ) }} + {{ govukBackLink({ + "text": "Back", + "href": url_for('.service_settings', service_id=current_service.id) + }) }} {% call form_wrapper() %} - {{ radios(form.enabled, hide_legend=True) }} + {{ form.enabled(param_extensions={ + "fieldset": { + "classes": "govuk-!-margin-top-3", + "legend": { + "isPageHeading": True, + "classes": "govuk-fieldset__legend--l" + } + } + }) }} {{ page_footer('Save') }} {% endcall %}