Merge pull request #3554 from alphagov/convert-single-line-textboxes-to-govuk-frontend

Convert single line textboxes to govuk frontend
This commit is contained in:
Pea M. Tyczynska
2020-08-18 11:29:44 +01:00
committed by GitHub
94 changed files with 787 additions and 578 deletions

View File

@@ -1,3 +1,6 @@
{% from "vendor/govuk-frontend/components/fieldset/macro.njk" import govukFieldset %}
{% from "vendor/govuk-frontend/components/error-message/macro.njk" import govukErrorMessage %}
{% macro list_entry(
field,
item_name,
@@ -5,45 +8,53 @@
autocomplete=True
) %}
{% if error %}
<div class="validation-wrapper">
{% endif %}
<fieldset class="form-group{% if field.errors %} form-group-error{% endif %}" id="{{ field.name }}">
<legend>
<span class="form-label">
{{ field.label.text }}
{% if hint %}
<span class="form-hint">
{{ hint }}
</span>
{% endif %}
{% if field.errors %}
<span class="error-message" data-module="track-error" data-error-type="{{ field.errors[0][0] }}" data-error-label="{{ field.name }}">
{{ field.errors[0][0] }}
</span>
{% endif %}
</label>
</legend>
<div class="input-list" data-module="list-entry" data-list-item-name="{{ item_name }}" id="list-entry-{{ field.name }}">
{% for index in range(0, field.entries|length) %}
<div class="list-entry">
<label for="input-{{ field.name }}-{{ index }}" class="text-box-number-label">
<span class="govuk-visually-hidden">{{ item_name }} number </span>{{ index + 1 }}.
</label>
<input
type="text"
name="{{ field.name }}-{{ index }}"
id="input-{{ field.name }}-{{ index }}"
class="form-control form-control-1-1"
value="{{ field.data[index] }}"
{% if not autocomplete %}autocomplete="off"{% endif %}
/>
</div>
{% endfor %}
<div class="govuk-form-group">
{% if hint %}
{% set attributes = {"aria-describedby": field.name + '-hint'} %}
{% else %}
{% set attributes = {} %}
{% endif %}
{% call govukFieldset({
"legend": {
"text": field.label.text,
"isPageHeading": False
},
"attributes": attributes
})
%}
{% if hint %}
<div id="{{ field.name }}-hint" class="govuk-hint">
{{ hint }}
</div>
</fieldset>
{% if error %}
{% endif %}
<div class="input-list" data-module="list-entry" data-list-item-name="{{ item_name }}" id="list-entry-{{ field.name }}">
{% for entry in field.entries %}
<div class="list-entry">
{% if not autocomplete %}
{% set autocomplete = "off" %}
{% else %}
{% set autocomplete = "" %}
{% endif %}
{% if entry.errors %}
{% set label_classes = "govuk-input--numbered__label govuk-input--numbered__label--error" %}
{% else %}
{% set label_classes = "govuk-input--numbered__label" %}
{% endif %}
{% set field_name = field.name + "-" + loop.index|string %}
{{ entry(param_extensions={
"id": "input-" + field_name,
"name": field_name,
"label": {
"html": '<span class="govuk-visually-hidden">' + item_name + ' number </span>' + loop.index|string + '.',
"classes": label_classes
},
"classes": "govuk-input--numbered govuk-!-width-full",
"value": field.data[loop.index0],
"autocomplete": autocomplete
}) }}
</div>
{% endfor %}
</div>
{% endif %}
{% endcall %}
{% endmacro %}

View File

@@ -10,12 +10,10 @@
{% if show %}
<div data-module="autofocus">
<div class="live-search js-header" data-module="live-search" data-targets="{{ target_selector }}">
{{ textbox(
form.search,
width='1-1',
label=search_label,
autocomplete="off"
) }}
{{ form.search(param_extensions={
"label": {"text": search_label},
"autocomplete": "off"
}) }}
</div>
</div>
{% endif %}

View File

@@ -26,7 +26,7 @@
{% call form_wrapper() %}
{{ textbox(form.name, hint="You can change this later") }}
{{ form.name(param_extensions={"hint": {"text": "You can change this later"}}) }}
{{ page_footer('Add service') }}

View File

@@ -1,6 +1,5 @@
{% extends "withoutnav_template.html" %}
{% from "components/radios.html" import radios %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -18,7 +17,7 @@
{% call form_wrapper() %}
{{ textbox(form.name, hint="You can change this later") }}
{{ form.name(param_extensions={"hint": {"text": "You can change this later"}}) }}
{% if not default_organisation_type %}
{{ radios(form.organisation_type) }}

View File

@@ -1,5 +1,4 @@
{% extends "withnav_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/radios.html" import radio, conditional_radio_panel %}
{% from "components/select-input.html" import select_wrapper %}
{% from "components/form.html" import form_wrapper %}
@@ -28,10 +27,14 @@
{% endfor %}
{% endcall %}
{% call conditional_radio_panel('on-behalf-of') %}
{{ textbox(form.on_behalf_of_name, width='1-1') }}
{{ textbox(form.on_behalf_of_email, width='1-1') }}
{{ form.on_behalf_of_name(param_extensions={"classes": "govuk-!-width-full"}) }}
{{ form.on_behalf_of_email(param_extensions={"classes": "govuk-!-width-full"}) }}
{% endcall %}
{{ textbox(form.version, width='1-3', hint='The version number is on the front page, for example 3.6') }}
{{ form.version(
param_extensions={
"hint": {"text": "The version number is on the front page, for example 3.6"},
"classes": "govuk-!-width-one-third"}
) }}
{{ page_footer('Continue') }}

View File

@@ -23,17 +23,17 @@
</p>
{% call form_wrapper() %}
{{ textbox(
form.url,
width='1-1',
hint='Must start with https://'
) }}
{{ textbox(
form.bearer_token,
width='1-1',
hint='At least 10 characters',
autocomplete='new-password'
) }}
{{ form.url(param_extensions={
"classes": "govuk-!-width-full",
"hint": {"text": "Must start with https://"}
}) }}
{{ form.bearer_token(param_extensions={
"classes": "govuk-!-width-full",
"hint": {"text": "At least 10 characters"},
"autocomplete": "new-password"
}) }}
{{ page_footer('Save') }}
{% endcall %}
</div>

View File

@@ -21,17 +21,16 @@
</p>
{% call form_wrapper() %}
{{ textbox(
form.url,
width='1-1',
hint='Must start with https://'
) }}
{{ textbox(
form.bearer_token,
width='1-1',
hint='At least 10 characters',
autocomplete='new-password'
) }}
{{ form.url(param_extensions={
"classes": "govuk-!-width-full",
"hint": {"text": "Must start with https://"}
}) }}
{{ form.bearer_token(param_extensions={
"classes": "govuk-!-width-full",
"hint": {"text": "At least 10 characters"},
"autocomplete": "new-password"
}) }}
{{ page_footer('Save') }}
{% endcall %}
</div>

View File

@@ -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/textbox.html" import textbox %}
{% from "components/radios.html" import radios %}
{% from "components/banner.html" import banner_wrapper %}
{% from "components/form.html" import form_wrapper %}
@@ -18,7 +17,7 @@
) }}
{% call form_wrapper() %}
{{ textbox(form.key_name, label='Name for this key') }}
{{ form.key_name }}
{{ radios(form.key_type, disable=disabled_options, option_hints=option_hints) }}
{{ page_footer('Continue') }}
{% endcall %}

View File

@@ -18,7 +18,10 @@
{% call form_wrapper() %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
{{ textbox(form.name, width='1-1', hint='Your recipients will not see this') }}
{{ form.name(param_extensions={
"classes": "govuk-!-width-full",
"hint": {"text": "Your recipients will not see this"},
}) }}
</div>
<div class="govuk-grid-column-two-thirds">
{{ textbox(form.template_content, highlight_placeholders=True, width='1-1', rows=5) }}

View File

@@ -19,7 +19,10 @@
{% call form_wrapper() %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-five-sixths">
{{ textbox(form.name, width='1-1', hint='Your recipients will not see this', rows=10) }}
{{ form.name(param_extensions={
"classes": "govuk-!-width-full",
"hint": {"text": "Your recipients will not see this"}
}) }}
{{ textbox(form.subject, width='1-1', highlight_placeholders=True, rows=2) }}
{{ textbox(form.template_content, highlight_placeholders=True, width='1-1', rows=8) }}
{% if current_user.platform_admin %}

View File

@@ -19,7 +19,10 @@
{% call form_wrapper() %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-five-sixths">
{{ textbox(form.name, width='1-1', hint='Your recipients will not see this', rows=10) }}
{{ form.name(param_extensions={
"classes": "govuk-!-width-full",
"hint": {"text": "Your recipients will not see this"}
}) }}
{{ textbox(form.subject, width='1-1', highlight_placeholders=True, rows=2) }}
{{ textbox(form.template_content, highlight_placeholders=True, width='1-1', rows=8) }}
{{ sticky_page_footer(

View File

@@ -19,7 +19,10 @@
{% call form_wrapper() %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
{{ textbox(form.name, width='1-1', hint='Your recipients will not see this') }}
{{ form.name(param_extensions={
"classes": "govuk-!-width-full",
"hint": {"text": "Your recipients will not see this"}
}) }}
</div>
<div class="govuk-grid-column-two-thirds">
{{ textbox(form.template_content, highlight_placeholders=True, width='1-1', rows=5) }}

View File

@@ -29,10 +29,10 @@
{{ file_upload(form.file, button_text='{} logo'.format('Update' if email_branding else 'Upload')) }}
{% call form_wrapper() %}
<div class="form-group">
<div style='margin-top:15px;'>{{textbox(form.name)}}</div>
<div style='margin-top:15px;'>{{textbox(form.text)}}</div>
{{ textbox(form.colour, width='1-4', colour_preview=True) }}
{{ radios(form.brand_type) }}
<div style='margin-top:15px;'>{{form.name}}</div>
<div style='margin-top:15px;'>{{form.text}}</div>
{{ form.colour }}
{{ radios(form.brand_type) }}
{{ page_footer(
'Save',
button_name='operation',

View File

@@ -19,11 +19,9 @@
class='govuk-grid-row'
) %}
<div class="govuk-grid-column-three-quarters">
{{ textbox(
form.search,
width='1-1',
label='Find services by name, or by partial name'
) }}
{{ form.search(param_extensions={
"label": {"text": "Find services by name, or by partial name"}
}) }}
</div>
<div class="govuk-grid-column-one-quarter">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">

View File

@@ -19,11 +19,9 @@
class='govuk-grid-row'
) %}
<div class="govuk-grid-column-three-quarters">
{{ textbox(
form.search,
width='1-1',
label='Find users by email, or by partial email'
) }}
{{ form.search(param_extensions={
"label": {"text": "Find users by email, or by partial email"}
}) }}
</div>
<div class="govuk-grid-column-one-quarter">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">

View File

@@ -1,5 +1,4 @@
{% extends "withoutnav_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -16,7 +15,7 @@ Create a new password
<p class="govuk-body">Well send you an email to create a new password.</p>
{% call form_wrapper() %}
{{ textbox(form.email_address, safe_error_message=True) }}
{{ form.email_address(error_message_with_html=True) }}
{{ page_footer("Send email") }}
{% endcall %}

View File

@@ -1,5 +1,4 @@
{% extends "withnav_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -17,7 +16,12 @@
{% call form_wrapper() %}
{{ textbox(form.email_address, width='1-1', safe_error_message=True) }}
{{ form.email_address(
param_extensions={
"classes": "govuk-!-width-full"
},
error_message_with_html=True
) }}
{% include 'views/manage-users/permissions.html' %}

View File

@@ -28,7 +28,9 @@
{{ file_upload(file_upload_form.file, button_text='{} logo'.format('Update' if is_update else 'Upload')) }}
{% call form_wrapper() %}
<div class="form-group">
<div style='margin-top:15px;'>{{textbox(letter_branding_details_form.name)}}</div>
{{ letter_branding_details_form.name(param_extensions={
"formGroup": {"classes": "govuk-!-margin-top-3"}
}) }}
{{ page_footer(
'Save',
button_name='operation',

View File

@@ -1,5 +1,4 @@
{% extends "withnav_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -17,7 +16,7 @@
<p class="govuk-body" id="user_name">This will change the email address for {{ user.name }}.</p>
{% call form_wrapper() %}
{{ textbox(form.email_address, width='1-1', safe_error_message=True) }}
{{ form.email_address(param_extensions={"classes": "govuk-!-width-full"}, error_message_with_html=True) }}
{{ page_footer('Save') }}
{% endcall %}

View File

@@ -19,7 +19,7 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-three-quarters">
{% call form_wrapper(class="extra-tracking") %}
{{ textbox(form.mobile_number) }}
{{ form.mobile_number }}
{{ page_footer('Save') }}
{% endcall %}
</div>

View File

@@ -1,5 +1,4 @@
{% extends "withoutnav_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -19,7 +18,7 @@
You can now create a new password for your account.
</p>
{% call form_wrapper() %}
{{ textbox(form.new_password, hint="At least 8 characters") }}
{{ form.new_password(param_extensions={"hint": {"text": "At least 8 characters"}}) }}
{{ page_footer("Continue") }}
{% endcall %}
{% else %}

View File

@@ -41,17 +41,17 @@
class="govuk-grid-row"
) %}
<div class="govuk-grid-column-three-quarters {% if message_type == 'sms' %}extra-tracking{% endif %}">
{{ textbox(
search_form.to,
width='1-1',
label=things_you_can_search_by|formatted_list(
conjunction='or',
before_each='',
after_each='',
prefix='Search by',
prefix_plural='Search by'
)
) }}
{{ search_form.to(param_extensions={
"label": {
"text": things_you_can_search_by|formatted_list(
conjunction='or',
before_each='',
after_each='',
prefix='Search by',
prefix_plural='Search by'
)
}
}) }}
</div>
<div class="govuk-grid-column-one-quarter">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
@@ -63,7 +63,7 @@
{% endcall %}
{% call form_wrapper(id="search-form") %}
<input type="hidden" name="to" value="{{ search_form.to.data }}">
<input type="hidden" name="to" {% if search_form.to.data %}value="{{ search_form.to.data }}{% endif %}">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
{% endcall %}

View File

@@ -22,7 +22,7 @@
{% endfor %}
{% endcall %}
{% call conditional_radio_panel('custom-organisation-name') %}
{{ textbox(form.name) }}
{{ form.name }}
{% endcall %}
{{ page_footer('Continue') }}
{% endcall %}

View File

@@ -26,9 +26,9 @@
{% block content %}
{{ page_header('New organisation') }}
{% call form_wrapper() %}
{{textbox(form.name)}}
{{radios(form.organisation_type)}}
{{radios(form.crown_status)}}
{{ form.name }}
{{ radios(form.organisation_type) }}
{{ radios(form.crown_status) }}
{{ page_footer('Save') }}
{% endcall %}
{% endblock %}

View File

@@ -1,5 +1,4 @@
{% extends "org_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -19,7 +18,7 @@
<div class="govuk-grid-column-three-quarters">
{% call form_wrapper() %}
{{ textbox(form.password, autocomplete='current-password') }}
{{ form.password(param_extensions={"autocomplete": "current-password"}) }}
<p class="govuk-body"> Your organisation name will be changed from {{ current_org.name }} to {{ new_name }} </p>
{{ page_footer('Confirm') }}
{% endcall %}

View File

@@ -16,7 +16,7 @@
) }}
{% call form_wrapper() %}
{{textbox(form.name)}}
{{ form.name }}
{{ page_footer('Save') }}
{% endcall %}

View File

@@ -1,6 +1,5 @@
{% extends "org_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/page-header.html" import page_header %}
{% from "components/form.html" import form_wrapper %}
@@ -16,7 +15,12 @@
back_link=url_for('.manage_org_users', org_id=current_org.id)
) }}
{% call form_wrapper() %}
{{ textbox(form.email_address, width='1-1', safe_error_message=True) }}
{{ form.email_address(
param_extensions={
"classes": "govuk-!-width-full"
},
error_message_with_html=True
) }}
<div class="bottom-gutter">
<p class="form-label">

View File

@@ -19,8 +19,8 @@
{% set details_content %}
{% call form_wrapper(method="get") %}
{{ textbox(form.start_date, hint="Enter start date in format YYYY-MM-DD") }}
{{ textbox(form.end_date, hint="Enter end date in format YYYY-MM-DD") }}
{{ form.start_date(param_extensions={"hint": {"text":"Enter start date in format YYYY-MM-DD"}}) }}
{{ form.end_date(param_extensions={"hint": {"text":"Enter end date in format YYYY-MM-DD"}}) }}
</br>
{{ govukButton({ "text": "Filter" }) }}
{% endcall %}

View File

@@ -12,8 +12,8 @@
</h1>
{% call form_wrapper() %}
{{ textbox(form.start_date, hint="Enter start date in format YYYY-MM-DD") }}
{{ textbox(form.end_date, hint="Enter end date in format YYYY-MM-DD") }}
{{ form.start_date(param_extensions={"hint": {"text": "Enter start date in format YYYY-MM-DD"}}) }}
{{ form.end_date(param_extensions={"hint": {"text": "Enter end date in format YYYY-MM-DD"}}) }}
{{ page_footer('Download report') }}
{% endcall %}

View File

@@ -67,8 +67,8 @@
{% set details_content %}
{% call form_wrapper(method="get") %}
{{ textbox(form.start_date, hint="Enter start date in format YYYY-MM-DD") }}
{{ textbox(form.end_date, hint="Enter end date in format YYYY-MM-DD") }}
{{ form.start_date(param_extensions={"hint": {"text": "Enter start date in format YYYY-MM-DD"}}) }}
{{ form.end_date(param_extensions={"hint": {"text": "Enter end date in format YYYY-MM-DD"}}) }}
{{ form.include_from_test_key }}
{{ govukButton({ "text": "Filter" }) }}
{% endcall %}

View File

@@ -12,9 +12,9 @@
</h1>
{% call form_wrapper() %}
{{ textbox(form.start_date, hint="Enter start date in format YYYY-MM-DD") }}
{{ textbox(form.end_date, hint="Enter end date in format YYYY-MM-DD") }}
{{ form.start_date(param_extensions={"hint": {"text": "Enter start date in format YYYY-MM-DD"}}) }}
{{ form.end_date(param_extensions={"hint": {"text": "Enter end date in format YYYY-MM-DD"}}) }}
{{ page_footer('Download report') }}
{% endcall %}
{% endblock %}
{% endblock %}

View File

@@ -25,7 +25,7 @@ Provider - {{provider.display_name}}
</ul>
{% call form_wrapper() %}
{{ textbox(form.priority) }}
{{ form.priority }}
{{ page_footer('Save') }}
{% endcall %}

View File

@@ -22,16 +22,23 @@ Create an account
well as the password, but should not be visible to users, nor should
the view process the input.
#}
<div class="visually-hidden">
<div class="govuk-visually-hidden">
<input type="email" name="username" id="username" value="{{ invited_user.email_address }}" disabled="disabled" tabindex="-1" aria-hidden="true" autocomplete="username" />
</div>
{{ textbox(form.name, width='3-4') }}
{{ form.name(param_extensions={"classes": "govuk-!-width-three-quarters"}) }}
{% if invited_user.auth_type == 'sms_auth' %}
<div class="extra-tracking">
{{ textbox(form.mobile_number, width='3-4', hint='Well send you a security code by text message') }}
{{ form.mobile_number(param_extensions={
"classes": "govuk-!-width-three-quarters",
"hint": {"text": "Well send you a security code by text message"}
}) }}
</div>
{% endif %}
{{ textbox(form.password, hint="At least 8 characters", width='3-4', autocomplete='new-password') }}
{{ form.password(param_extensions={
"classes": "govuk-!-width-three-quarters",
"hint": {"text": "At least 8 characters"},
"autocomplete": "new-password"
}) }}
{{ page_footer("Continue") }}
{{form.service}}
{{form.email_address}}

View File

@@ -14,11 +14,18 @@ Create an account
<h1 class="heading-large">Create an account</h1>
<p class="govuk-body">Your account will be created with this email: {{invited_org_user.email_address}}</p>
{% call form_wrapper() %}
{{ textbox(form.name, width='3-4') }}
{{ form.name(param_extensions={"classes": "govuk-!-width-three-quarters"}) }}
<div class="extra-tracking">
{{ textbox(form.mobile_number, width='3-4', hint='Well send you a security code by text message') }}
{{ form.mobile_number(param_extensions={
"classes": "govuk-!-width-three-quarters",
"hint": {"text": "Well send you a security code by text message"}
}) }}
</div>
{{ textbox(form.password, hint="At least 8 characters", width='3-4', autocomplete='new-password') }}
{{ form.password(param_extensions={
"classes": "govuk-!-width-three-quarters",
"hint": {"text": "At least 8 characters"},
"autocomplete": "new-password"
}) }}
{{ page_footer("Continue") }}
{{form.organisation}}
{{form.email_address}}

View File

@@ -13,13 +13,23 @@ Create an account
<div class="govuk-grid-column-two-thirds">
<h1 class="heading-large">Create an account</h1>
{% call form_wrapper(autocomplete=True) %}
{{ textbox(form.name, width='3-4') }}
{{ textbox(form.email_address, hint="Must be from a public sector organisation", width='3-4', safe_error_message=True, autocomplete='email') }}
{{ form.name(param_extensions={"classes": "govuk-!-width-three-quarters"}) }}
{{ form.email_address(
param_extensions={
"hint": {"text": "Must be from a public sector organisation"},
"classes": "govuk-!-width-three-quarters",
"autocomplete": "email"
},
error_message_with_html=True
) }}
<div class="extra-tracking">
{{ textbox(form.mobile_number, width='3-4', hint='Well send you a security code by text message') }}
{{ form.mobile_number(param_extensions={
"hint": {"text": "Well send you a security code by text message"},
"classes": "govuk-!-width-three-quarters"
}) }}
</div>
<input class="govuk-visually-hidden" aria-hidden="true" tabindex="-1" id="defeat-chrome-autocomplete">
{{ textbox(form.password, hint="At least 8 characters", width='3-4', autocomplete='new-password') }}
{{ form.password(param_extensions={"hint": {"text": "At least 8 characters"}, "classes": "govuk-!-width-three-quarters", "autocomplete": "new-password"}) }}
{{form.auth_type}}
{{ page_footer("Continue") }}
{% endcall %}

View File

@@ -2,7 +2,6 @@
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/message-count-label.html" import recipient_count_label %}
{% from "components/textbox.html" import textbox %}
{% from "components/form.html" import form_wrapper %}
{% block service_page_title %}
@@ -23,10 +22,7 @@
) %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-full {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}">
{{ textbox(
form.placeholder_value,
width='1-1',
) }}
{{ form.placeholder_value(param_extensions={"classes": "govuk-!-width-full"}) }}
</div>
{% if skip_link or link_to_upload %}
<div class="govuk-grid-column-full">

View File

@@ -19,7 +19,7 @@
<div class="govuk-grid-column-three-quarters">
{% call form_wrapper() %}
{{ textbox(form.password, autocomplete='current-password') }}
{{ form.password(param_extensions={"autocomplete": "current-password"}) }}
{{ page_footer(
'Confirm',
destructive=destructive

View File

@@ -18,7 +18,7 @@
{% call form_wrapper() %}
{{ radios(form.notification_type) }}
{{ textbox(form.days_of_retention) }}
{{ form.days_of_retention }}
{{ page_footer('Add') }}
{% endcall %}

View File

@@ -17,7 +17,7 @@
) }}
{% call form_wrapper() %}
{{ notification_type | capitalize}}
{{ textbox(form.days_of_retention) }}
{{ form.days_of_retention }}
{{ page_footer('Save') }}
{% endcall %}

View File

@@ -1,5 +1,4 @@
{% from "components/banner.html" import banner, banner_wrapper %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% from "components/button/macro.njk" import govukButton %}
@@ -47,11 +46,12 @@
{% call form_wrapper(
action = form_url
) %}
{{ textbox(
form.email_address,
width='1-1',
safe_error_message=True,
hint='This should be a shared inbox managed by your team, not your own email address'
{{ form.email_address(
param_extensions={
"hint": {"text": "This should be a shared inbox managed by your team, not your own email address"},
"classes": "govuk-!-width-full"
},
error_message_with_html=True
) }}
{% if not first_email_address and not existing_is_default %}
{{ form.is_default }}

View File

@@ -1,5 +1,4 @@
{% extends "withnav_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -16,11 +15,12 @@
) }}
{% call form_wrapper() %}
{{ textbox(
form.email_address,
width='1-1',
hint='This should be a shared inbox managed by your team, not your own email address',
safe_error_message=True
{{ form.email_address(
param_extensions={
"hint": {"text": "This should be a shared inbox managed by your team, not your own email address"},
"classes": "govuk-!-width-full"
},
error_message_with_html=True
) }}
{% if not first_email_address %}
{{ form.is_default }}

View File

@@ -16,11 +16,12 @@
back_link=url_for('main.service_email_reply_to', service_id=current_service.id)
) }}
{% call form_wrapper() %}
{{ textbox(
form.email_address,
width='1-1',
safe_error_message=True,
hint='This should be a shared inbox managed by your team, not your own email address.'
{{ form.email_address(
param_extensions={
"hint": {"text": "This should be a shared inbox managed by your team, not your own email address"},
"classes": "govuk-!-width-full"
},
error_message_with_html=True
) }}
{% if form.is_default.data %}
<p class="form-group">

View File

@@ -27,9 +27,18 @@
{% endif %}
{% call form_wrapper() %}
<div class="form-group">
{{ textbox(form.volume_email, width='1-2', hint='For example, 50,000') }}
{{ textbox(form.volume_sms, width='1-2', hint='For example, 50,000') }}
{{ textbox(form.volume_letter, width='1-2', hint='For example, 50,000') }}
{{ form.volume_email(param_extensions={
"classes": "govuk-!-width-one-half",
"hint": {"text": "For example, 50,000"},
}) }}
{{ form.volume_sms(param_extensions={
"classes": "govuk-!-width-one-half",
"hint": {"text": "For example, 50,000"},
}) }}
{{ form.volume_letter(param_extensions={
"classes": "govuk-!-width-one-half",
"hint": {"text": "For example, 50,000"},
}) }}
</div>
{{ radios(form.consent_to_research, hint='You do not have to take part and you can unsubscribe at any time') }}
{{ page_footer('Continue') }}

View File

@@ -1,6 +1,5 @@
{% extends "withnav_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -38,7 +37,7 @@
</div>
{% call form_wrapper() %}
{{ textbox(form.name) }}
{{ form.name }}
{{ page_footer('Save') }}
{% endcall %}

View File

@@ -1,6 +1,5 @@
{% extends "withnav_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -29,7 +28,7 @@
</div>
{% call form_wrapper() %}
{{ textbox(form.name) }}
{{ form.name }}
{{ page_footer('Save') }}
{% endcall %}

View File

@@ -1,5 +1,4 @@
{% extends "withnav_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/radios.html" import radio %}
@@ -35,7 +34,7 @@
{{ radio(option, data_target=data_target) }}
<div class="panel panel-border-narrow js-hidden" id={{data_target}}>
{{ textbox(form|attr(option.data), label=' ', width='1-1') }}
{{ form|attr(option.data)(param_extensions={"classes": "govuk-!-width-full", "label": {"text": " "}}) }}
</div>
{% endfor %}
{% endcall %}

View File

@@ -15,7 +15,7 @@
'Free text message allowance',
back_link=url_for('.service_settings', service_id=current_service.id)
) }}
{{ textbox(form.free_sms_allowance) }}
{{ form.free_sms_allowance }}
{{ page_footer('Save') }}
{% endcall %}

View File

@@ -1,42 +0,0 @@
{% extends "withnav_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% block service_page_title %}
Reply-to email address
{% endblock %}
{% block maincolumn_content %}
{{ page_header(
'Reply-to email address',
back_link=url_for('.service_settings', service_id=current_service.id)
) }}
<p class="govuk-body">
Your emails will be sent from
{{ current_service.email_from }}@notifications.service.gov.uk.
This is so they have the best chance of being delivered.
This email address cannot receive replies.
</p>
<p class="govuk-body">
Set up a separate email address to receive replies from
your users, then enter it here.
</p>
{% if current_service.trial_mode %}
<p class="govuk-body">
Your service cannot go live until youve done this.
</p>
{% endif %}
{% call form () %}
{{ textbox(
form.email_address,
width='2-3',
safe_error_message=True
) }}
{{ page_footer('Save') }}
{% endcall %}
{% endblock %}

View File

@@ -16,11 +16,10 @@
) }}
{% call form_wrapper() %}
{{ textbox(
form.sms_sender,
width='1-4',
hint='Up to 11 characters, letters, numbers and spaces only'
) }}
{{ form.sms_sender(param_extensions={
"classes": "govuk-!-width-one-quarter",
"hint": {"text": "Up to 11 characters, letters, numbers and spaces only"}
}) }}
{% if not first_sms_sender %}
{{ form.is_default }}
{% endif %}

View File

@@ -22,11 +22,10 @@
<span class="hint"> This phone number receives replies and cannot be changed </span>
</p>
{% else %}
{{ textbox(
form.sms_sender,
width='1-4',
hint='Up to 11 characters, letters, numbers and spaces only'
) }}
{{ form.sms_sender(param_extensions={
"classes": "govuk-!-width-one-quarter",
"hint": {"text": "Up to 11 characters, letters, numbers and spaces only"}
}) }}
{% endif %}
{% if form.is_default.data %}
<p class="form-group">

View File

@@ -1,5 +1,4 @@
{% extends "withoutnav_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -32,8 +31,8 @@
{% endif %}
{% call form_wrapper(autocomplete=True) %}
{{ textbox(form.email_address, autocomplete='email') }}
{{ textbox(form.password, autocomplete='current-password') }}
{{ form.email_address(param_extensions={"autocomplete": "email"}) }}
{{ form.password(param_extensions={"autocomplete": "current-password"}) }}
{{ page_footer("Continue", secondary_link=url_for('.forgot_password'), secondary_link_text="Forgotten your password?") }}
{% endcall %}
</div>

View File

@@ -27,8 +27,8 @@
{% call form_wrapper() %}
{{ textbox(form.feedback, width='1-1', hint='', rows=10, autosize=True) }}
{% if not current_user.is_authenticated %}
{{ textbox(form.name, width='1-1') }}
{{ textbox(form.email_address, width='1-1') }}
{{ form.name(param_extensions={"classes": "govuk-!-width-full"}) }}
{{ form.email_address(param_extensions={"classes": "govuk-!-width-full"}) }}
{% else %}
<p class="govuk-body">Well reply to {{ current_user.email_address }}</p>
{% endif %}

View File

@@ -16,7 +16,7 @@
<div id="move_to_new_folder_form">
<fieldset class="js-will-stick-at-bottom-when-scrolling">
<legend class="govuk-visually-hidden">Add to new folder</legend>
{{ textbox(templates_and_folders_form.move_to_new_folder_name, width='1-1') }}
{{ templates_and_folders_form.move_to_new_folder_name(param_extensions={"classes": "govuk-!-width-full"}) }}
{{ page_footer('Add to new folder', button_name='operation', button_value='move-to-new-folder') }}
</fieldset>
</div>
@@ -24,7 +24,7 @@
<div id="add_new_folder_form">
<fieldset class="js-will-stick-at-bottom-when-scrolling">
<legend class="govuk-visually-hidden">Add new folder</legend>
{{ textbox(templates_and_folders_form.add_new_folder_name, width='1-1') }}
{{ templates_and_folders_form.add_new_folder_name(param_extensions={"classes": "govuk-!-width-full"}) }}
{{ page_footer('Add new folder', button_name='operation', button_value='add-new-folder') }}
</fieldset>
</div>

View File

@@ -35,7 +35,7 @@
{% else %}
{{ live_search(target_selector='#template-list .govuk-grid-column-full', show=True, form=search_form) }}
{{ live_search(target_selector='#template-list .template-list-item', show=True, form=search_form) }}
<nav id="template-list">
{% for item in templates_and_folders %}

View File

@@ -23,7 +23,9 @@
</div>
{% call form_wrapper(action=url_for('main.manage_template_folder', service_id=current_service.id, template_folder_id=template_folder_id)) %}
{{ textbox(form.name, width='1-1') }}
{{ form.name(param_extensions={
"classes": "govuk-!-width-full"
}) }}
{% if current_user.has_permissions("manage_service") and form.users_with_permission.all_service_users %}
{{ form.users_with_permission }}
{% endif %}

View File

@@ -16,7 +16,7 @@ Check your mobile number
<p class="govuk-body">Check your mobile phone number is correct and then resend the security code.</p>
{% call form_wrapper() %}
{{ textbox(form.mobile_number) }}
{{ form.mobile_number }}
{{ page_footer("Resend security code") }}
{% endcall %}
</div>

View File

@@ -16,11 +16,10 @@
<p class="govuk-body">Weve sent you a text message with a security code.</p>
{% call form_wrapper(class="extra-tracking") %}
{{ textbox(
form.sms_code,
width='5em',
autofocus=True
) }}
{{ form.sms_code(param_extensions={
"classes": "govuk-input govuk-input--width-5",
"attributes": {"data-module": "autofocus"}
}) }}
{{ page_footer(
"Continue",
secondary_link=url_for('main.check_and_resend_text_code'),

View File

@@ -19,7 +19,7 @@
<div class="govuk-grid-column-three-quarters">
{% call form_wrapper(autocomplete=True) %}
{{ textbox(form.password, autocomplete='current-password') }}
{{ form.password(param_extensions={"autocomplete": "current-password"}) }}
{{ page_footer('Confirm') }}
{% endcall %}
</div>

View File

@@ -1,5 +1,4 @@
{% extends "withoutnav_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -18,8 +17,8 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-three-quarters">
{% call form_wrapper(autocomplete=True) %}
{{ textbox(form.old_password) }}
{{ textbox(form.new_password) }}
{{ form.old_password }}
{{ form.new_password }}
{{ page_footer('Save') }}
{% endcall %}
</div>

View File

@@ -1,5 +1,4 @@
{% extends "withoutnav_template.html" %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
@@ -18,7 +17,7 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-three-quarters">
{% call form_wrapper() %}
{{ textbox(form_field, safe_error_message=True) }}
{{ form_field(error_message_with_html=True) }}
{{ page_footer('Save') }}
{% endcall %}
</div>

View File

@@ -21,11 +21,11 @@
Weve sent a security code to your new {{ thing }}.
</p>
{% call form_wrapper() %}
{{ textbox(
form_field,
width='5em',
autofocus=True
) }}
{{ form_field(param_extensions={
"classes": "govuk-input govuk-input--width-5",
"attributes": {"data-module": "autofocus"}
}) }}
{{ page_footer('Confirm') }}
{% endcall %}
</div>