From 52929d835d1b35068cc0afa52f4d753e71aeaa29 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Thu, 25 Jun 2020 15:39:59 +0100 Subject: [PATCH 01/14] Convert radios for P.Admin email branding (basic) --- app/main/forms.py | 2 +- app/templates/views/email-branding/manage-branding.html | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 00f0706d7..f1aad0724 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1753,7 +1753,7 @@ class ServiceUpdateEmailBranding(StripWhitespaceForm): } ) file = FileField_wtf('Upload a PNG logo', validators=[FileAllowed(['png'], 'PNG Images only!')]) - brand_type = RadioField( + brand_type = GovukRadiosField( "Brand type", choices=[ ('both', 'GOV.UK and branding'), diff --git a/app/templates/views/email-branding/manage-branding.html b/app/templates/views/email-branding/manage-branding.html index f356139ad..ca19c8f53 100644 --- a/app/templates/views/email-branding/manage-branding.html +++ b/app/templates/views/email-branding/manage-branding.html @@ -2,7 +2,6 @@ {% from "components/file-upload.html" import file_upload %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} -{% from "components/radios.html" import radios %} {% from "components/form.html" import form_wrapper %} {% block service_page_title %} @@ -31,7 +30,7 @@
{{form.name}}
{{form.text}}
{{ form.colour }} - {{ radios(form.brand_type) }} + {{ form.brand_type }} {{ page_footer( 'Save', button_name='operation', From 6aaa4d906b7e052d37046bcd7cc993c4df8ef867 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Thu, 25 Jun 2020 16:37:07 +0100 Subject: [PATCH 02/14] Convert radios on add nhs local org page (basic) --- app/main/forms.py | 2 +- .../views/organisations/add-nhs-local-organisation.html | 5 ++--- tests/app/main/views/organisations/test_organisation.py | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index f1aad0724..73cd485be 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1157,7 +1157,7 @@ class AddNHSLocalOrganisationForm(StripWhitespaceForm): super().__init__(*args, **kwargs) self.organisations.choices = organisation_choices - organisations = RadioField( + organisations = GovukRadiosField( 'Which NHS Trust or Clinical Commissioning Group do you work for?', thing='an NHS Trust or Clinical Commissioning Group' ) diff --git a/app/templates/views/organisations/add-nhs-local-organisation.html b/app/templates/views/organisations/add-nhs-local-organisation.html index 17f12a6e4..f07d8fbc5 100644 --- a/app/templates/views/organisations/add-nhs-local-organisation.html +++ b/app/templates/views/organisations/add-nhs-local-organisation.html @@ -1,7 +1,6 @@ {% extends "withnav_template.html" %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import sticky_page_footer %} -{% from "components/radios.html" import radios %} {% from "components/live-search.html" import live_search %} {% from "components/form.html" import form_wrapper %} @@ -21,13 +20,13 @@ {{ form.organisations.label.text }}

{{ live_search( - target_selector='.multiple-choice', + target_selector='.govuk-radios__item', show=True, form=search_form, label='Search by name', autofocus=True) }} - {{ radios(form.organisations, hide_legend=True) }} + {{ form.organisations }} {{ sticky_page_footer('Continue') }} {% endcall %} {% endblock %} diff --git a/tests/app/main/views/organisations/test_organisation.py b/tests/app/main/views/organisations/test_organisation.py index 6f33da32d..c2e4f7a7d 100644 --- a/tests/app/main/views/organisations/test_organisation.py +++ b/tests/app/main/views/organisations/test_organisation.py @@ -261,14 +261,14 @@ def test_nhs_local_can_create_own_organisations( 'Which NHS Trust or Clinical Commissioning Group do you work for?' ) assert page.select_one('[data-module=live-search]')['data-targets'] == ( - '.multiple-choice' + '.govuk-radios__item' ) assert [ ( normalize_spaces(radio.select_one('label').text), radio.select_one('input')['value'] ) - for radio in page.select('.multiple-choice') + for radio in page.select('.govuk-radios__item') ] == [ ('Trust 1', 't1'), ('Trust 2', 't2'), From 45526598c6b1cda2e54a25dd64f1888da55d5927 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 26 Jun 2020 17:49:07 +0100 Subject: [PATCH 03/14] Convert radios on edit org agreement page (basic) --- app/main/forms.py | 13 ++-- .../organisation/settings/edit-agreement.html | 9 +-- .../views/organisations/test_organisation.py | 62 ++++++++++--------- 3 files changed, 44 insertions(+), 40 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 73cd485be..e40584b88 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1182,16 +1182,21 @@ class OrganisationCrownStatusForm(StripWhitespaceForm): class OrganisationAgreementSignedForm(StripWhitespaceForm): - agreement_signed = RadioField( - ( - 'Has this organisation signed the agreement?' - ), + agreement_signed = GovukRadiosField( + 'Has this organisation signed the agreement?', choices=[ ('yes', 'Yes'), ('no', 'No'), ('unknown', 'No (but we have some service-specific agreements in place)'), ], thing='whether this organisation has signed the agreement', + param_extensions={ + 'items': [ + {'hint': {'html': 'Users will be told their organisation has already signed the agreement'}}, + {'hint': {'html': 'Users will be prompted to sign the agreement before they can go live'}}, + {'hint': {'html': 'Users will not be prompted to sign the agreement'}} + ] + } ) diff --git a/app/templates/views/organisations/organisation/settings/edit-agreement.html b/app/templates/views/organisations/organisation/settings/edit-agreement.html index f4672bfef..f4c44d99c 100644 --- a/app/templates/views/organisations/organisation/settings/edit-agreement.html +++ b/app/templates/views/organisations/organisation/settings/edit-agreement.html @@ -17,14 +17,7 @@
{% call form_wrapper() %} - {{ radios( - form.agreement_signed, - option_hints={ - 'yes': 'Users will be told their organisation has already signed the agreement', - 'no': 'Users will be prompted to sign the agreement before they can go live', - 'unknown': 'Users will not be prompted to sign the agreement' - } - ) }} + {{ form.agreement_signed }} {{ page_footer('Save') }} {% endcall %}
diff --git a/tests/app/main/views/organisations/test_organisation.py b/tests/app/main/views/organisations/test_organisation.py index c2e4f7a7d..28ee9606c 100644 --- a/tests/app/main/views/organisations/test_organisation.py +++ b/tests/app/main/views/organisations/test_organisation.py @@ -704,41 +704,44 @@ def test_organisation_settings_for_platform_admin( ( '.edit_organisation_type', ( - ('central', 'Central government'), - ('local', 'Local government'), - ('nhs_central', 'NHS – central government agency or public body'), - ('nhs_local', 'NHS Trust or Clinical Commissioning Group'), - ('nhs_gp', 'GP practice'), - ('emergency_service', 'Emergency service'), - ('school_or_college', 'School or college'), - ('other', 'Other'), + {'value': 'central', 'label': 'Central government'}, + {'value': 'local', 'label': 'Local government'}, + {'value': 'nhs_central', 'label': 'NHS – central government agency or public body'}, + {'value': 'nhs_local', 'label': 'NHS Trust or Clinical Commissioning Group'}, + {'value': 'nhs_gp', 'label': 'GP practice'}, + {'value': 'emergency_service', 'label': 'Emergency service'}, + {'value': 'school_or_college', 'label': 'School or college'}, + {'value': 'other', 'label': 'Other'}, ), 'central', ), ( '.edit_organisation_crown_status', ( - ('crown', 'Yes'), - ('non-crown', 'No'), - ('unknown', 'Not sure'), + {'value': 'crown', 'label': 'Yes'}, + {'value': 'non-crown', 'label': 'No'}, + {'value': 'unknown', 'label': 'Not sure'}, ), 'crown', ), ( '.edit_organisation_agreement', ( - ('yes', ( - 'Yes ' - 'Users will be told their organisation has already signed the agreement' - )), - ('no', ( - 'No ' - 'Users will be prompted to sign the agreement before they can go live' - )), - ('unknown', ( - 'No (but we have some service-specific agreements in place) ' - 'Users will not be prompted to sign the agreement' - )), + { + 'value': 'yes', + 'label': 'Yes', + 'hint': 'Users will be told their organisation has already signed the agreement' + }, + { + 'value': 'no', + 'label': 'No', + 'hint': 'Users will be prompted to sign the agreement before they can go live' + }, + { + 'value': 'unknown', + 'label': 'No (but we have some service-specific agreements in place)', + 'hint': 'Users will not be prompted to sign the agreement' + }, ), 'no', ), @@ -769,11 +772,14 @@ def test_view_organisation_settings( radios = page.select('input[type=radio]') for index, option in enumerate(expected_options): - label = page.select_one('label[for={}]'.format(radios[index]['id'])) - assert ( - radios[index]['value'], - normalize_spaces(label.text), - ) == option + option_values = { + 'value': radios[index]['value'], + 'label': normalize_spaces(page.select_one('label[for={}]'.format(radios[index]['id'])).text) + } + if 'hint' in option: + option_values['hint'] = normalize_spaces( + page.select_one('label[for={}] + .govuk-hint'.format(radios[index]['id'])).text) + assert option_values == option if expected_selected: assert page.select_one('input[checked]')['value'] == expected_selected From e979aef43f5c11668d62684d9d644db3c8491da2 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Thu, 12 Nov 2020 13:38:09 +0000 Subject: [PATCH 04/14] Convert radios on provider ratio page (basic) Also changes the CSS for the radios slider variant component. --- app/assets/stylesheets/components/radios.scss | 3 +-- app/main/forms.py | 16 ++++++++++++---- .../views/providers/edit-sms-provider-ratio.html | 3 +-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/components/radios.scss b/app/assets/stylesheets/components/radios.scss index c3c1ada6c..9afa37b97 100644 --- a/app/assets/stylesheets/components/radios.scss +++ b/app/assets/stylesheets/components/radios.scss @@ -129,9 +129,8 @@ display: none; } - .multiple-choice { + .govuk-radios__item { - display: inline-block; margin-right: 0; padding: 0; width: 38px; diff --git a/app/main/forms.py b/app/main/forms.py index e40584b88..f029cb4d4 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1597,10 +1597,18 @@ class ProviderForm(StripWhitespaceForm): class ProviderRatioForm(StripWhitespaceForm): - ratio = RadioField(choices=[ - (str(value), '{}% / {}%'.format(value, 100 - value)) - for value in range(100, -10, -10) - ]) + ratio = GovukRadiosField(choices=[ + (str(value), '{}% / {}%'.format(value, 100 - value)) + for value in range(100, -10, -10) + ], + param_extensions={ + "classes": "govuk-radios--inline", + "fieldset": { + "legend": { + "classes": "govuk-visually-hidden" + } + } + }) @property def percentage_left(self): diff --git a/app/templates/views/providers/edit-sms-provider-ratio.html b/app/templates/views/providers/edit-sms-provider-ratio.html index 8e831d57d..35b4c6208 100644 --- a/app/templates/views/providers/edit-sms-provider-ratio.html +++ b/app/templates/views/providers/edit-sms-provider-ratio.html @@ -2,7 +2,6 @@ {% 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/radios.html" import radios %} {% block per_page_title %} Text message providers @@ -30,7 +29,7 @@
{% call form_wrapper() %}
- {{ radios(form.ratio, inline=True, hide_legend=True) }} + {{ form.ratio }}
—
From b1d65f33c7170979a303de6bf05fb852fc6eca36 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Thu, 12 Nov 2020 13:38:20 +0000 Subject: [PATCH 05/14] Convert radios on clear cache page (basic) --- app/main/forms.py | 2 +- app/templates/views/platform-admin/clear-cache.html | 3 +-- tests/app/main/views/test_platform_admin.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index f029cb4d4..c28997205 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -2272,7 +2272,7 @@ class TemplateAndFoldersSelectionForm(Form): class ClearCacheForm(StripWhitespaceForm): - model_type = RadioField( + model_type = GovukRadiosField( 'What do you want to clear today', ) diff --git a/app/templates/views/platform-admin/clear-cache.html b/app/templates/views/platform-admin/clear-cache.html index b601dff30..52e7666ce 100644 --- a/app/templates/views/platform-admin/clear-cache.html +++ b/app/templates/views/platform-admin/clear-cache.html @@ -1,6 +1,5 @@ {% extends "views/platform-admin/_base_template.html" %} {% from "components/form.html" import form_wrapper %} -{% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} {% block per_page_title %} @@ -14,7 +13,7 @@ {% call form_wrapper() %} - {{ radios(form.model_type) }} + {{ form.model_type }} {{ page_footer('Clear') }} {% endcall %} diff --git a/tests/app/main/views/test_platform_admin.py b/tests/app/main/views/test_platform_admin.py index 1f1fb9757..e4b99cb45 100644 --- a/tests/app/main/views/test_platform_admin.py +++ b/tests/app/main/views/test_platform_admin.py @@ -744,7 +744,7 @@ def test_clear_cache_requires_option(client_request, platform_admin_user, mocker page = client_request.post('main.clear_cache', _data={}, _expected_status=200) - assert normalize_spaces(page.find('span', class_='error-message').text) == 'Select an option' + assert normalize_spaces(page.find('span', class_='govuk-error-message').text) == 'Error: Select an option' assert not redis.delete_cache_keys_by_pattern.called From 25b89dd30a69282544d8d3f8d6984537453103d3 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 26 Jun 2020 21:17:38 +0100 Subject: [PATCH 06/14] Convert radios on data retention page (basic) --- app/main/forms.py | 4 ++-- app/templates/views/service-settings/data-retention/add.html | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index c28997205..44ab8bd3e 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -2097,14 +2097,14 @@ class BrandingOptions(StripWhitespaceForm): class ServiceDataRetentionForm(StripWhitespaceForm): - notification_type = RadioField( + notification_type = GovukRadiosField( 'What notification type?', choices=[ ('email', 'Email'), ('sms', 'SMS'), ('letter', 'Letter'), ], - validators=[DataRequired()], + thing='notification type', ) days_of_retention = GovukIntegerField( label="Days of retention", diff --git a/app/templates/views/service-settings/data-retention/add.html b/app/templates/views/service-settings/data-retention/add.html index d78a434cb..bc33f79ec 100644 --- a/app/templates/views/service-settings/data-retention/add.html +++ b/app/templates/views/service-settings/data-retention/add.html @@ -2,7 +2,6 @@ {% 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/radios.html" import radios %} {% block service_page_title %} Data retention @@ -16,7 +15,7 @@ ) }} {% call form_wrapper() %} - {{ radios(form.notification_type) }} + {{ form.notification_type }} {{ form.days_of_retention }} {{ page_footer('Add') }} {% endcall %} From d0b8610cd889e9dac125edcf4b34ba5eebbc151e Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 26 Jun 2020 21:56:08 +0100 Subject: [PATCH 07/14] Convert radios on research consent (basic) --- app/main/forms.py | 5 ++++- app/templates/views/service-settings/estimate-usage.html | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 44ab8bd3e..0fde6c862 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1569,13 +1569,16 @@ class EstimateUsageForm(StripWhitespaceForm): things='letters', format_error_suffix='you expect to send', ) - consent_to_research = RadioField( + consent_to_research = GovukRadiosField( 'Can we contact you when we’re doing user research?', choices=[ ('yes', 'Yes'), ('no', 'No'), ], thing='yes or no', + param_extensions={ + 'hint': {'text': 'You do not have to take part and you can unsubscribe at any time'} + } ) at_least_one_volume_filled = True diff --git a/app/templates/views/service-settings/estimate-usage.html b/app/templates/views/service-settings/estimate-usage.html index 0f26640ae..6fdbb2383 100644 --- a/app/templates/views/service-settings/estimate-usage.html +++ b/app/templates/views/service-settings/estimate-usage.html @@ -3,7 +3,6 @@ {% from "components/form.html" import form_wrapper %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} -{% from "components/radios.html" import radios %} {% block service_page_title %} Tell us how many messages you expect to send @@ -39,7 +38,7 @@ "hint": {"text": "For example, 50,000"}, }) }}
- {{ radios(form.consent_to_research, hint='You do not have to take part and you can unsubscribe at any time') }} + {{ form.consent_to_research }} {{ page_footer('Continue') }} {% endcall %} From 0f269a125965580d36fd9cab03d68b4c4a15b745 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Tue, 30 Jun 2020 15:13:42 +0100 Subject: [PATCH 08/14] Convert radios on set inbound page (basic) --- app/main/forms.py | 2 +- .../views/service-settings/set-inbound-number.html | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 0fde6c862..69f30c82b 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1916,7 +1916,7 @@ class ServiceInboundNumberForm(StripWhitespaceForm): super().__init__(*args, **kwargs) self.inbound_number.choices = kwargs['inbound_number_choices'] - inbound_number = RadioField( + inbound_number = GovukRadiosField( "Select your 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 0cad34afc..4024c073f 100644 --- a/app/templates/views/service-settings/set-inbound-number.html +++ b/app/templates/views/service-settings/set-inbound-number.html @@ -1,7 +1,6 @@ {% extends "withnav_template.html" %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import sticky_page_footer %} -{% from "components/radios.html" import radios%} {% from "components/form.html" import form_wrapper %} {% block service_page_title %} @@ -19,9 +18,9 @@

No available inbound numbers

{% else %} {% call form_wrapper() %} - {{ radios(form.inbound_number) }} - {{ sticky_page_footer('Save') }} - {% endcall %} + {{ form.inbound_number }} + {{ sticky_page_footer('Save') }} + {% endcall %} {% endif %} {% endblock %} From ca50cf63cb153aff5150bab998475b5d4cf1560b Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 3 Jul 2020 11:52:54 +0100 Subject: [PATCH 09/14] Convert radios on /support page (basic) --- app/main/forms.py | 7 +++++-- app/templates/views/support/index.html | 5 ++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 69f30c82b..9bd9e99fa 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1516,7 +1516,7 @@ class CreateKeyForm(StripWhitespaceForm): class SupportType(StripWhitespaceForm): - support_type = RadioField( + support_type = GovukRadiosField( 'How can we help you?', choices=[ (PROBLEM_TICKET_TYPE, 'Report a problem'), @@ -1526,12 +1526,15 @@ class SupportType(StripWhitespaceForm): class SupportRedirect(StripWhitespaceForm): - who = RadioField( + who = GovukRadiosField( 'What do you need help with?', choices=[ ('public-sector', 'I work in the public sector and need to send emails, text messages or letters'), ('public', 'I’m a member of the public with a question for the government'), ], + param_extensions={ + "fieldset": {"legend": {"classes": "govuk-visually-hidden"}} + } ) diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html index 25400bc52..8e6ac7371 100644 --- a/app/templates/views/support/index.html +++ b/app/templates/views/support/index.html @@ -1,5 +1,4 @@ {% extends "withoutnav_template.html" %} -{% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %} @@ -14,12 +13,12 @@ {% call form_wrapper() %} {% if current_user.is_authenticated %} - {{ radios(form.support_type) }} + {{ form.support_type }} {% else %}

What do you need help with?

- {{ radios(form.who, hide_legend=True) }} + {{ form.who }} {% endif %} {{ page_footer('Continue') }} {% endcall %} From 641f03cb5b170845c15abcc81afbe1d527658915 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 3 Jul 2020 12:11:15 +0100 Subject: [PATCH 10/14] Convert radios on support triage page (basic) --- app/main/forms.py | 2 +- app/templates/views/support/triage.html | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 9bd9e99fa..f569b2868 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1545,7 +1545,7 @@ class FeedbackOrProblem(StripWhitespaceForm): class Triage(StripWhitespaceForm): - severe = RadioField( + severe = GovukRadiosField( 'Is it an emergency?', choices=[ ('yes', 'Yes'), diff --git a/app/templates/views/support/triage.html b/app/templates/views/support/triage.html index 9b32dd13c..b9546b637 100644 --- a/app/templates/views/support/triage.html +++ b/app/templates/views/support/triage.html @@ -1,5 +1,4 @@ {% extends "withoutnav_template.html" %} -{% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} {% from "components/page-header.html" import page_header %} {% from "components/form.html" import form_wrapper %} @@ -17,7 +16,7 @@ back_link=url_for('.support') ) }} {% call form_wrapper() %} - {{ radios(form.severe) }} + {{ form.severe }} {{ page_footer('Continue') }} {% endcall %}

From ae59f602dbb4e4d9cf38a89dabc925bfa4e762d1 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 3 Jul 2020 12:18:08 +0100 Subject: [PATCH 11/14] Convert radios on edit postage page (basic) --- app/main/forms.py | 2 +- app/templates/views/templates/edit-template-postage.html | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index f569b2868..503a185ed 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1389,7 +1389,7 @@ class LetterTemplateForm(EmailTemplateForm): class LetterTemplatePostageForm(StripWhitespaceForm): - postage = RadioField( + postage = GovukRadiosField( 'Choose the postage for this letter template', choices=[ ('first', 'First class'), diff --git a/app/templates/views/templates/edit-template-postage.html b/app/templates/views/templates/edit-template-postage.html index 22ca4aa74..b7bffeb8a 100644 --- a/app/templates/views/templates/edit-template-postage.html +++ b/app/templates/views/templates/edit-template-postage.html @@ -1,7 +1,6 @@ {% extends "withnav_template.html" %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} -{% from "components/radios.html" import radios %} {% from "components/form.html" import form_wrapper %} {% block service_page_title %} @@ -17,7 +16,7 @@ {% call form_wrapper() %}
- {{ radios(form.postage) }} + {{ form.postage }} {{ page_footer('Save') }}