Merge pull request #3771 from alphagov/fix-all-radios-forms-with-duplicate-legends

Fix all radios forms with duplicate legends
This commit is contained in:
Tom Byers
2021-01-26 10:57:39 +00:00
committed by GitHub
4 changed files with 42 additions and 18 deletions

View File

@@ -2,25 +2,38 @@
{% 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 %}
<p class="govuk-body"> This service already has an inbound number </p>
{% elif no_available_numbers %}
{% elif no_available_numbers %}
<p class="govuk-body"> No available inbound numbers </p>
{% 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': {
'isPageHeading': True,
'classes': 'govuk-fieldset__legend--l'
}
}
}) }}
{{ sticky_page_footer('Save') }}
{% endcall %}
{% endif %}
{% endif %}
{% endblock %}

View File

@@ -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 %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-five-sixths">
{{ 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 %}
</div>