darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-08 08:28:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changing the govuk grid to USWDS

Browse Source
This commit is contained in:
Jonathan Bobel
2023-08-23 16:18:25 -04:00
parent 4aa781ed9a
commit 412fad89ff
107 changed files with 314 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/error_pages/5xx.html
View File

@@ -66,9 +66,9 @@
</header> </header>
<div class="govuk-width-container"> <div class="govuk-width-container">
<main class="govuk-main-wrapper govuk-!-padding-top-0 govuk-!-padding-bottom-12" id="main-content" role="main"> <main class="govuk-main-wrapper govuk-!-padding-top-0" id="main-content" role="main">
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
<h1 class="govuk-heading-l govuk-!-padding-top-7"> <h1 class="govuk-heading-l govuk-!-padding-top-7">
Sorry, there is a problem with the service Sorry, there is a problem with the service
</h1> </h1>

4
app/templates/error/401.html
View File

@@ -1,8 +1,8 @@
{% extends "withoutnav_template.html" %} {% extends "withoutnav_template.html" %}
{% block per_page_title %}You’re not authorised to see this page{% endblock %} {% block per_page_title %}You’re not authorised to see this page{% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1>You’re not authorised to see this page</h1> <h1>You’re not authorised to see this page</h1>
<p class="govuk-body"><a class="usa-link" href="{{ url_for('main.sign_in' )}}">Sign in</a> to Notify.gov and try again.</p> <p class="govuk-body"><a class="usa-link" href="{{ url_for('main.sign_in' )}}">Sign in</a> to Notify.gov and try again.</p>
</div> </div>

4
app/templates/error/403.html
View File

@@ -1,8 +1,8 @@
{% extends "withoutnav_template.html" %} {% extends "withoutnav_template.html" %}
{% block per_page_title %}You’re not allowed to see this page{% endblock %} {% block per_page_title %}You’re not allowed to see this page{% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="heading-large"> <h1 class="heading-large">
You’re not allowed to see this page You’re not allowed to see this page
</h1> </h1>

4
app/templates/error/404.html
View File

@@ -1,8 +1,8 @@
{% extends "withoutnav_template.html" %} {% extends "withoutnav_template.html" %}
{% block per_page_title %}Page not found{% endblock %} {% block per_page_title %}Page not found{% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="heading-large"> <h1 class="heading-large">
Page not found Page not found
</h1> </h1>

4
app/templates/error/410.html
View File

@@ -1,8 +1,8 @@
{% extends "withoutnav_template.html" %} {% extends "withoutnav_template.html" %}
{% block per_page_title %}Page not found{% endblock %} {% block per_page_title %}Page not found{% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="heading-large"> <h1 class="heading-large">
Page not found Page not found
</h1> </h1>

4
app/templates/error/500.html
View File

@@ -1,8 +1,8 @@
{% extends "withoutnav_template.html" %} {% extends "withoutnav_template.html" %}
{% block per_page_title %}Sorry, there’s a problem with the service{% endblock %} {% block per_page_title %}Sorry, there’s a problem with the service{% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="heading-large"> <h1 class="heading-large">
Sorry, there’s a problem with Notify.gov Sorry, there’s a problem with Notify.gov
</h1> </h1>

2
app/templates/fullwidth_template.html
View File

@@ -1,6 +1,6 @@
{% extends "admin_template.html" %} {% extends "admin_template.html" %}
{% set mainClasses = "govuk-!-padding-top-0 govuk-!-padding-bottom-0" %} {% set mainClasses = "" %}
{% block main %} {% block main %}
{% block beforeContent %}{% endblock %} {% block beforeContent %}{% endblock %}

2
app/templates/main_template.html
View File

@@ -4,7 +4,7 @@
{# specify absolute url for the static assets folder e.g. http://wwww.domain.com/assets #} {# specify absolute url for the static assets folder e.g. http://wwww.domain.com/assets #}
{%- set assetUrl = assetUrl | default(assetPath) -%} {%- set assetUrl = assetUrl | default(assetPath) -%}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="{{ htmlLang | default('en') }}" class="govuk-template {{ htmlClasses }}"> <html lang="{{ htmlLang | default('en') }}" class="{{ htmlClasses }}">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>{% block pageTitle %}Notify.gov{% endblock %}</title> <title>{% block pageTitle %}Notify.gov{% endblock %}</title>

6
app/templates/org_template.html
View File

@@ -15,11 +15,11 @@
</div> </div>
<a href="{{ url_for('main.choose_account') }}" class="usa-link navigation-service">Switch service</a> <a href="{{ url_for('main.choose_account') }}" class="usa-link navigation-service">Switch service</a>
</div> </div>
<div class="govuk-grid-row govuk-!-padding-bottom-12"> <div class="grid-row">
<div class="govuk-grid-column-one-quarter"> <div class="grid-col-3">
{% include "org_nav.html" %} {% include "org_nav.html" %}
</div> </div>
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
{% block beforeContent %} {% block beforeContent %}
{% block backLink %}{% endblock %} {% block backLink %}{% endblock %}
{% endblock %} {% endblock %}

6
app/templates/partials/count.html
View File

@@ -3,12 +3,12 @@
<div class="ajax-block-container"> <div class="ajax-block-container">
{% if notifications_deleted %} {% if notifications_deleted %}
<div class="govuk-grid-row bottom-gutter-1-2"> <div class="grid-row bottom-gutter-1-2">
{% for label, query_param, url, count in counts %} {% for label, query_param, url, count in counts %}
{% if query_param == 'pending' %} {% if query_param == 'pending' %}
<div class="govuk-grid-column-one-quarter">{{ big_number(count, query_param, smaller=True) }}</div> <div class="grid-col-3">{{ big_number(count, query_param, smaller=True) }}</div>
{% else %} {% else %}
<div class="govuk-grid-column-one-quarter">{{ big_number(count, label, smaller=True) }}</div> <div class="grid-col-3">{{ big_number(count, label, smaller=True) }}</div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}

18
app/templates/partials/tour.html
View File

@@ -2,31 +2,31 @@
{% call banner_wrapper(type='tour') %} {% call banner_wrapper(type='tour') %}
<p class="heading-medium">Try sending yourself this example</p> <p class="heading-medium">Try sending yourself this example</p>
<div class="govuk-grid-row bottom-gutter {% if help != '1' %}greyed-out-step{% endif %}"> <div class="grid-row bottom-gutter {% if help != '1' %}greyed-out-step{% endif %}">
<div class="govuk-grid-column-one-sixth"> <div class="grid-col-2">
<p class="heading-large">1.</p> <p class="heading-large">1.</p>
</div> </div>
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
<p class="govuk-body"> <p class="govuk-body">
Every message is sent from a template Every message is sent from a template
</p> </p>
</div> </div>
</div> </div>
<div class="govuk-grid-row bottom-gutter {% if help != '2' %}greyed-out-step{% endif %}"> <div class="grid-row bottom-gutter {% if help != '2' %}greyed-out-step{% endif %}">
<div class="govuk-grid-column-one-sixth"> <div class="grid-col-2">
<p class="heading-large">2.</p> <p class="heading-large">2.</p>
</div> </div>
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
<p class="govuk-body"> <p class="govuk-body">
The template pulls in the data you provide The template pulls in the data you provide
</p> </p>
</div> </div>
</div> </div>
<div class="govuk-grid-row bottom-gutter {% if help != '3' %}greyed-out-step{% endif %}"> <div class="grid-row bottom-gutter {% if help != '3' %}greyed-out-step{% endif %}">
<div class="govuk-grid-column-one-sixth"> <div class="grid-col-2">
<p class="heading-large">3.</p> <p class="heading-large">3.</p>
</div> </div>
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
<p class="govuk-body"> <p class="govuk-body">
Notify delivers the message Notify delivers the message
</p> </p>

4
app/templates/views/add-service-local.html
View File

@@ -9,8 +9,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
{{ page_header('About your service') }} {{ page_header('About your service') }}

4
app/templates/views/add-service.html
View File

@@ -9,8 +9,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
{{ page_header('About your service') }} {{ page_header('About your service') }}

4
app/templates/views/api/callbacks/delivery-status-callback.html
View File

@@ -14,8 +14,8 @@
{% endblock %} {% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
{{ page_header('Callbacks for delivery receipts') }} {{ page_header('Callbacks for delivery receipts') }}

4
app/templates/views/api/callbacks/received-text-messages-callback.html
View File

@@ -14,8 +14,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
{{ page_header('Callbacks for received text messages') }} {{ page_header('Callbacks for received text messages') }}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
<p> <p>
When you receive a text message in Notify, we can forward it to your system. When you receive a text message in Notify, we can forward it to your system.
Check the <a class="usa-link" href="{{ url_for('.callbacks') }}"> callback documentation </a> for more information. Check the <a class="usa-link" href="{{ url_for('.callbacks') }}"> callback documentation </a> for more information.

4
app/templates/views/api/guest-list.html
View File

@@ -50,8 +50,8 @@
{% call form_wrapper() %} {% call form_wrapper() %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
{{ list_entry( {{ list_entry(
form.email_addresses, form.email_addresses,

20
app/templates/views/api/index.html
View File

@@ -12,25 +12,25 @@
API integration API integration
</h1> </h1>
<nav class="govuk-grid-row bottom-gutter-1-2"> <nav class="grid-row bottom-gutter-1-2">
<div class="govuk-grid-column-one-third"> <div class="grid-col-4">
<a class="usa-link pill-separate-item" href="{{ url_for('.api_keys', service_id=current_service.id) }}">API keys</a> <a class="usa-link pill-separate-item" href="{{ url_for('.api_keys', service_id=current_service.id) }}">API keys</a>
</div> </div>
<div class="govuk-grid-column-one-third"> <div class="grid-col-4">
<a class="usa-link pill-separate-item" href="{{ url_for('.guest_list', service_id=current_service.id) }}">Guest list</a> <a class="usa-link pill-separate-item" href="{{ url_for('.guest_list', service_id=current_service.id) }}">Guest list</a>
</div> </div>
<div class="govuk-grid-column-one-third"> <div class="grid-col-4">
<a class="usa-link pill-separate-item" href="{{ url_for(callbacks_link, service_id=current_service.id) }}">Callbacks</a> <a class="usa-link pill-separate-item" href="{{ url_for(callbacks_link, service_id=current_service.id) }}">Callbacks</a>
</div> </div>
</nav> </nav>
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<h2 class="heading-small"> <h2 class="heading-small">
Message log Message log
</h2> </h2>
</div> </div>
<div class="govuk-grid-column-one-half align-with-heading-copy-right"> <div class="grid-col-6 align-with-heading-copy-right">
<a class="usa-link" href="{{ url_for('.api_integration', service_id=current_service.id) }}">Refresh</a> <a class="usa-link" href="{{ url_for('.api_integration', service_id=current_service.id) }}">Refresh</a>
</div> </div>
</div> </div>
@@ -52,11 +52,11 @@
<span class="govuk-details__summary-text"> <span class="govuk-details__summary-text">
{{ notification.to }} {{ notification.to }}
</span> </span>
<span class="govuk-grid-row api-notifications-item__meta"> <span class="grid-row api-notifications-item__meta">
<span class="govuk-grid-column-one-half api-notifications-item__meta-key"> <span class="grid-col-6 api-notifications-item__meta-key">
{{notification.key_name}} {{notification.key_name}}
</span> </span>
<span class="govuk-grid-column-one-half api-notifications-item__meta-time"> <span class="grid-col-6 api-notifications-item__meta-time">
<time class="timeago" datetime="{{ notification.created_at }}"> <time class="timeago" datetime="{{ notification.created_at }}">
{{ notification.created_at|format_delta }} {{ notification.created_at|format_delta }}
</time> </time>

4
app/templates/views/cancelled-invitation.html
View File

@@ -1,8 +1,8 @@
{% extends "withoutnav_template.html" %} {% extends "withoutnav_template.html" %}
{% block per_page_title %}The invitation you were sent has been cancelled{% endblock %} {% block per_page_title %}The invitation you were sent has been cancelled{% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3"> <h1 class="font-body-2xl margin-bottom-3">
The invitation you were sent has been cancelled The invitation you were sent has been cancelled
</h1> </h1>

18
app/templates/views/choose-account.html
View File

@@ -8,13 +8,13 @@
services=[] services=[]
) %} ) %}
{% if show_heading and (services or organizations) %} {% if show_heading and (services or organizations) %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-quarter"> <div class="grid-col-3">
<h2> <h2>
{{ heading }} {{ heading }}
</h2> </h2>
</div> </div>
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
<ul> <ul>
{% else %} {% else %}
<ul> <ul>
@@ -56,13 +56,13 @@
<nav class="browse-list {% if current_user.has_access_to_live_and_trial_mode_services %}top-gutter-2-3{% endif %}"> <nav class="browse-list {% if current_user.has_access_to_live_and_trial_mode_services %}top-gutter-2-3{% endif %}">
{% if current_user.platform_admin %} {% if current_user.platform_admin %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-quarter"> <div class="grid-col-3">
<h2> <h2>
Platform admin Platform admin
</h2> </h2>
</div> </div>
<ul class="govuk-grid-column-three-quarters"> <ul class="grid-col-9">
<li class="browse-list-item"> <li class="browse-list-item">
<a href="{{ url_for('.organizations') }}" class="usa-link">All organizations</a> <a href="{{ url_for('.organizations') }}" class="usa-link">All organizations</a>
<p class="browse-list-hint"> <p class="browse-list-hint">
@@ -102,11 +102,11 @@
{% if can_add_service %} {% if can_add_service %}
<div class="js-stick-at-bottom-when-scrolling"> <div class="js-stick-at-bottom-when-scrolling">
{% if current_user.has_access_to_live_and_trial_mode_services %} {% if current_user.has_access_to_live_and_trial_mode_services %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-quarter"> <div class="grid-col-3">
&nbsp; &nbsp;
</div> </div>
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
{% endif %} {% endif %}
{{ govukButton({ {{ govukButton({
"element": "a", "element": "a",

8
app/templates/views/conversations/messages.html
View File

@@ -1,18 +1,18 @@
<div class="ajax-block-container"> <div class="ajax-block-container">
{% for message in conversation %} {% for message in conversation %}
<div class="govuk-grid-row sms-message-row" id="n{{ message.id }}" tabindex="0"> <div class="grid-row sms-message-row" id="n{{ message.id }}" tabindex="0">
{% if message.inbound %} {% if message.inbound %}
<div class="govuk-grid-column-two-thirds sms-message-inbound"> <div class="grid-col-8 sms-message-inbound">
{{ message.content | string }} {{ message.content | string }}
<div class="sms-message-status"> <div class="sms-message-status">
{{ message.created_at | format_datetime_relative }} {{ message.created_at | format_datetime_relative }}
</div> </div>
</div> </div>
{% else %} {% else %}
<div class="govuk-grid-column-one-third"> <div class="grid-col-4">
&nbsp; &nbsp;
</div> </div>
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
{{ message.content | string }} {{ message.content | string }}
{% if message.status == 'delivered' %} {% if message.status == 'delivered' %}
<div class="sms-message-status sms-message-status-outbound"> <div class="sms-message-status sms-message-status-outbound">

4
app/templates/views/cookies.html
View File

@@ -9,8 +9,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<div class="cookie-settings__confirmation banner banner-with-tick" data-cookie-confirmation="true" role="group" tabindex="-1"> <div class="cookie-settings__confirmation banner banner-with-tick" data-cookie-confirmation="true" role="group" tabindex="-1">
<h2 class="banner-title">Your cookie settings were saved</h2> <h2 class="banner-title">Your cookie settings were saved</h2>
<a class="govuk_link cookie-settings__prev-page govuk-!-margin-top-1" href="#" data-module="track-click" data-track-category="cookieSettings" data-track-action="Back to previous page"> <a class="govuk_link cookie-settings__prev-page govuk-!-margin-top-1" href="#" data-module="track-click" data-track-category="cookieSettings" data-track-action="Back to previous page">

8
app/templates/views/dashboard/_jobs.html
View File

@@ -45,18 +45,18 @@
) )
) }} ) }}
{% else %} {% else %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-third"> <div class="grid-col-4">
{{ big_number( {{ big_number(
item.notifications_sending, item.notifications_sending,
smallest=True, smallest=True,
label='pending', label='pending',
) }} ) }}
</div> </div>
<div class="govuk-grid-column-one-third"> <div class="grid-col-4">
{{ big_number(item.notifications_delivered, smallest=True, label='delivered') }} {{ big_number(item.notifications_delivered, smallest=True, label='delivered') }}
</div> </div>
<div class="govuk-grid-column-one-third"> <div class="grid-col-4">
{{ big_number(item.notifications_failed, smallest=True, label='failed') }} {{ big_number(item.notifications_failed, smallest=True, label='failed') }}
</div></div> </div></div>

6
app/templates/views/edit-email-template.html
View File

@@ -20,8 +20,8 @@
{{ page_header('{} email template'.format(heading_action)) }} {{ page_header('{} email template'.format(heading_action)) }}
{% call form_wrapper() %} {% call form_wrapper() %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
{{ form.name(param_extensions={ {{ form.name(param_extensions={
"classes": "", "classes": "",
"hint": {"text": "Your recipients will not see this"} "hint": {"text": "Your recipients will not see this"}
@@ -35,7 +35,7 @@
'Save' 'Save'
) }} ) }}
</div> </div>
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{% include "partials/templates/guidance-formatting.html" %} {% include "partials/templates/guidance-formatting.html" %}
{% include "partials/templates/guidance-personalisation.html" %} {% include "partials/templates/guidance-personalisation.html" %}
{% include "partials/templates/guidance-optional-content.html" %} {% include "partials/templates/guidance-optional-content.html" %}

8
app/templates/views/edit-sms-template.html
View File

@@ -32,8 +32,8 @@
{% endif %} {% endif %}
{% call form_wrapper() %} {% call form_wrapper() %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
{{ form.name(param_extensions={ {{ form.name(param_extensions={
"classes": "", "classes": "",
"hint": {"text": "Your recipients will not see this"} "hint": {"text": "Your recipients will not see this"}
@@ -51,7 +51,7 @@
{{ form.process_type }} {{ form.process_type }}
{% endif %} {% endif %}
</div> </div>
<div class="govuk-grid-column-full"> <div class="grid-col-12">
<div class="template-content-count"> <div class="template-content-count">
<div data-module="update-status" data-target="template_content" data-updates-url="{{ url_for('.count_content_length', service_id=current_service.id, template_type='sms') }}" aria-live="polite"> <div data-module="update-status" data-target="template_content" data-updates-url="{{ url_for('.count_content_length', service_id=current_service.id, template_type='sms') }}" aria-live="polite">
&nbsp; &nbsp;
@@ -62,7 +62,7 @@
After saving, you'll have the option to send 🚀 After saving, you'll have the option to send 🚀
</p> </p>
</div> </div>
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{% include "partials/templates/guidance-personalisation.html" %} {% include "partials/templates/guidance-personalisation.html" %}
{% include "partials/templates/guidance-optional-content.html" %} {% include "partials/templates/guidance-optional-content.html" %}
{% include "partials/templates/guidance-links.html" %} {% include "partials/templates/guidance-links.html" %}

4
app/templates/views/email-branding/manage-branding.html
View File

@@ -17,8 +17,8 @@
{% block platform_admin_content %} {% block platform_admin_content %}
{{ page_header('{} email branding'.format('Update' if email_branding else 'Add')) }} {{ page_header('{} email branding'.format('Update' if email_branding else 'Add')) }}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
{% if logo %} {% if logo %}
<div id="logo-img"> <div id="logo-img">
<img src="https://{{ cdn_url }}/{{ logo }}"/> <img src="https://{{ cdn_url }}/{{ logo }}"/>

4
app/templates/views/email-link-invalid.html
View File

@@ -7,8 +7,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">This link has expired</h1> <h1 class="font-body-2xl margin-bottom-3">This link has expired</h1>
<p> <p>

4
app/templates/views/email-not-received.html
View File

@@ -7,8 +7,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">Resend email link</h1> <h1 class="font-body-2xl margin-bottom-3">Resend email link</h1>
<p>Emails sometimes take a few minutes to arrive. If you do not receive an email link, Notify can send you a new one.</p> <p>Emails sometimes take a few minutes to arrive. If you do not receive an email link, Notify can send you a new one.</p>

4
app/templates/views/find-users/auth_type.html
View File

@@ -14,8 +14,8 @@
{% block platform_admin_content %} {% block platform_admin_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
{{ page_header('Set auth type for ' + user.name) }} {{ page_header('Set auth type for ' + user.name) }}
{% call form_wrapper() %} {% call form_wrapper() %}

4
app/templates/views/find-users/user-information.html
View File

@@ -6,8 +6,8 @@
{% endblock %} {% endblock %}
{% block platform_admin_content %} {% block platform_admin_content %}
<div class="govuk-grid-row bottom-gutter"> <div class="grid-row bottom-gutter">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
<h1 class="font-body-2xl margin-bottom-3"> <h1 class="font-body-2xl margin-bottom-3">
{{ user.name }} {{ user.name }}
</h1> </h1>

4
app/templates/views/forgot-password.html
View File

@@ -8,8 +8,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">Forgot your password?</h1> <h1 class="font-body-2xl margin-bottom-3">Forgot your password?</h1>
<p>We’ll send you an email to create a new password.</p> <p>We’ll send you an email to create a new password.</p>

4
app/templates/views/integration-testing.html
View File

@@ -7,8 +7,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">Integration testing</h1> <h1 class="font-body-2xl margin-bottom-3">Integration testing</h1>
<p>This information has moved.</p> <p>This information has moved.</p>

6
app/templates/views/manage-users.html
View File

@@ -22,8 +22,8 @@
<div class="user-list"> <div class="user-list">
{% for user in users %} {% for user in users %}
<div class="user-list-item"> <div class="user-list-item">
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
<h2 class="user-list-item-heading" title="{{ user.email_address }}"> <h2 class="user-list-item-heading" title="{{ user.email_address }}">
{%- if user.name -%} {%- if user.name -%}
<span class="heading-small live-search-relevant">{{ user.name }}</span>&ensp; <span class="heading-small live-search-relevant">{{ user.name }}</span>&ensp;
@@ -70,7 +70,7 @@
</p> </p>
{% endif %} {% endif %}
</div> </div>
<div class="govuk-grid-column-one-quarter"> <div class="grid-col-3">
{% if current_user.has_permissions('manage_service') %} {% if current_user.has_permissions('manage_service') %}
{% if user.status == 'pending' %} {% if user.status == 'pending' %}
<a class="user-list-edit-link usa-link" href="{{ url_for('.cancel_invited_user', service_id=current_service.id, invited_user_id=user.id)}}">Cancel invitation<span class="usa-sr-only"> for {{ user.email_address }}</span></a> <a class="user-list-edit-link usa-link" href="{{ url_for('.cancel_invited_user', service_id=current_service.id, invited_user_id=user.id)}}">Cancel invitation<span class="usa-sr-only"> for {{ user.email_address }}</span></a>

4
app/templates/views/manage-users/confirm-edit-user-email.html
View File

@@ -17,8 +17,8 @@
{{ page_header('Confirm change of email address') }} {{ page_header('Confirm change of email address') }}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{% call form_wrapper() %} {% call form_wrapper() %}
<p>New email address:</p> <p>New email address:</p>
<div class="panel panel-border-wide bottom-gutter"> <div class="panel panel-border-wide bottom-gutter">

4
app/templates/views/manage-users/confirm-edit-user-mobile-number.html
View File

@@ -16,8 +16,8 @@
{{ page_header('Confirm change of mobile number') }} {{ page_header('Confirm change of mobile number') }}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{% call form_wrapper() %} {% call form_wrapper() %}
<p>New mobile number:</p> <p>New mobile number:</p>
<div class="panel panel-border-wide bottom-gutter"> <div class="panel panel-border-wide bottom-gutter">

4
app/templates/views/manage-users/edit-user-mobile.html
View File

@@ -17,8 +17,8 @@
{{ page_header('Change team member’s mobile number') }} {{ page_header('Change team member’s mobile number') }}
<p id="user_name">This will change the mobile number for {{ user.name }}.</p> <p id="user_name">This will change the mobile number for {{ user.name }}.</p>
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
{% call form_wrapper(class="extra-tracking") %} {% call form_wrapper(class="extra-tracking") %}
{{ form.mobile_number }} {{ form.mobile_number }}
{{ page_footer('Save') }} {{ page_footer('Save') }}

4
app/templates/views/new-password.html
View File

@@ -8,8 +8,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
{% if user %} {% if user %}
<h1 class="font-body-2xl margin-bottom-3"> <h1 class="font-body-2xl margin-bottom-3">
Create a new password Create a new password

6
app/templates/views/organizations/add-organization.html
View File

@@ -14,11 +14,11 @@
<a href="{{ url_for('main.choose_account') }}" class="usa-link navigation-service usa-breadcrumb-switch">Switch service</a> <a href="{{ url_for('main.choose_account') }}" class="usa-link navigation-service usa-breadcrumb-switch">Switch service</a>
</div> </div>
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-quarter"> <div class="grid-col-3">
&nbsp; &nbsp;
</div> </div>
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
<main class="govuk-main-wrapper column-main govuk-!-padding-top-0 govuk-!-padding-bottom-0" id="main-content" role="main" > <main class="govuk-main-wrapper column-main govuk-!-padding-top-0 govuk-!-padding-bottom-0" id="main-content" role="main" >
{% block beforeContent %}{% endblock %} {% block beforeContent %}{% endblock %}
{% block content %} {% block content %}

12
app/templates/views/organizations/organization/index.html
View File

@@ -16,8 +16,8 @@
{{ pill(years, selected_year, big_number_args={'smallest': True}) }} {{ pill(years, selected_year, big_number_args={'smallest': True}) }}
</div> </div>
<div class="govuk-grid-row bottom-gutter"> <div class="grid-row bottom-gutter">
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<h2 class="heading-small">Emails</h2> <h2 class="heading-small">Emails</h2>
<div class="keyline-block"> <div class="keyline-block">
{{ big_number( {{ big_number(
@@ -27,7 +27,7 @@
) }} ) }}
</div> </div>
</div> </div>
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<h2 class="heading-small">Text messages</h2> <h2 class="heading-small">Text messages</h2>
<div class="keyline-block"> <div class="keyline-block">
{{ big_number( {{ big_number(
@@ -58,15 +58,15 @@
<h3 class="govuk-!-font-weight-bold govuk-!-font-size-24 govuk-!-margin-bottom-3 govuk-!-margin-top-1 live-search-relevant"> <h3 class="govuk-!-font-weight-bold govuk-!-font-size-24 govuk-!-margin-bottom-3 govuk-!-margin-top-1 live-search-relevant">
<a href="{{ url_for('main.usage', service_id=service.service_id) }}" class="usa-link browse-list-link">{{ service.service_name }}</a> <a href="{{ url_for('main.usage', service_id=service.service_id) }}" class="usa-link browse-list-link">{{ service.service_name }}</a>
</h3> </h3>
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
{{ big_number( {{ big_number(
service.emails_sent, service.emails_sent,
label=service.emails_sent|message_count_label('email'), label=service.emails_sent|message_count_label('email'),
smallest=True smallest=True
) }} ) }}
</div> </div>
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
{% if service.sms_cost %} {% if service.sms_cost %}
{{ big_number( {{ big_number(
service.sms_cost, service.sms_cost,

4
app/templates/views/organizations/organization/settings/edit-domains.html
View File

@@ -15,8 +15,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
{{ page_header("Known email domains") }} {{ page_header("Known email domains") }}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
<p> <p>
If a user’s email addresses ends with one of these domains then If a user’s email addresses ends with one of these domains then
any services they create will be associated with this organization. any services they create will be associated with this organization.

4
app/templates/views/organizations/organization/settings/edit-go-live-notes.html
View File

@@ -15,8 +15,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
{{ page_header("Edit request to go live notes") }} {{ page_header("Edit request to go live notes") }}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
<p> <p>
Text entered here will be displayed in the Zendesk ticket when a service Text entered here will be displayed in the Zendesk ticket when a service
belonging to this organization requests to go live. belonging to this organization requests to go live.

4
app/templates/views/organizations/organization/settings/preview-email-branding.html
View File

@@ -10,8 +10,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<h1 class="font-body-2xl margin-bottom-3">Preview email branding</h1> <h1 class="font-body-2xl margin-bottom-3">Preview email branding</h1>
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{{ email_branding_preview(form.branding_style.data) }} {{ email_branding_preview(form.branding_style.data) }}
{% call form_wrapper(action=action) %} {% call form_wrapper(action=action) %}
<div class="form-group"> <div class="form-group">

8
app/templates/views/organizations/organization/settings/set-email-branding.html
View File

@@ -19,12 +19,12 @@
{{ page_header(page_title) }} {{ page_header(page_title) }}
{% call form_wrapper(data_kwargs={'preview-type': 'email'}) %} {% call form_wrapper(data_kwargs={'preview-type': 'email'}) %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full preview-pane"> <div class="grid-col-12 preview-pane">
</div> </div>
</div> </div>
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{{ live_search( {{ live_search(
target_selector='.govuk-radios__item', target_selector='.govuk-radios__item',
show=True, show=True,

6
app/templates/views/organizations/organization/users/index.html
View File

@@ -32,8 +32,8 @@
<div class="user-list"> <div class="user-list">
{% for user in users %} {% for user in users %}
<div class="user-list-item"> <div class="user-list-item">
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
<h2 class="user-list-item-heading"> <h2 class="user-list-item-heading">
{%- if user.name -%} {%- if user.name -%}
<span class="heading-small">{{ user.name }}</span>&ensp; <span class="heading-small">{{ user.name }}</span>&ensp;
@@ -51,7 +51,7 @@
</span> </span>
</h2> </h2>
</div> </div>
<div class="govuk-grid-column-one-quarter"> <div class="grid-col-3">
{% if user.status == 'pending' %} {% if user.status == 'pending' %}
<a class="usa-link user-list-edit-link" href="{{ url_for('.cancel_invited_org_user', org_id=current_org.id, invited_user_id=user.id)}}">Cancel invitation<span class="usa-sr-only"> for {{ user.email_address }}</span></a> <a class="usa-link user-list-edit-link" href="{{ url_for('.cancel_invited_org_user', org_id=current_org.id, invited_user_id=user.id)}}">Cancel invitation<span class="usa-sr-only"> for {{ user.email_address }}</span></a>
{% elif user.status != 'cancelled' %} {% elif user.status != 'cancelled' %}

4
app/templates/views/password-reset-sent.html
View File

@@ -6,8 +6,8 @@ Check your email
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">Check your email</h1> <h1 class="font-body-2xl margin-bottom-3">Check your email</h1>
<p>Click the link in the email to reset your password.</p> <p>Click the link in the email to reset your password.</p>

26
app/templates/views/performance.html
View File

@@ -9,8 +9,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row govuk-!-margin-bottom-8"> <div class="grid-row govuk-!-margin-bottom-8">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
{{ page_header('Performance data') }} {{ page_header('Performance data') }}
</div> </div>
</div> </div>
@@ -19,21 +19,21 @@
Messages sent since May 2023 Messages sent since May 2023
</h2> </h2>
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<div class="product-page-big-number">{{ total_notifications|format_billions }}</div> <div class="product-page-big-number">{{ total_notifications|format_billions }}</div>
total total
</div> </div>
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<div class="govuk-grid-row govuk-!-padding-top-4"> <div class="grid-row govuk-!-padding-top-4">
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
{{ big_number( {{ big_number(
email_notifications|format_billions, email_notifications|format_billions,
label=email_notifications|message_count_noun('email'), label=email_notifications|message_count_noun('email'),
smallest=True, smallest=True,
) }} ) }}
</div> </div>
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
{{ big_number( {{ big_number(
sms_notifications|format_billions, sms_notifications|format_billions,
label=sms_notifications|message_count_noun('sms'), label=sms_notifications|message_count_noun('sms'),
@@ -74,8 +74,8 @@
<h2 class="govuk-heading-m"> <h2 class="govuk-heading-m">
Messages sent within 10 seconds Messages sent within 10 seconds
</h2> </h2>
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
{{ big_number( {{ big_number(
'{:.2f}%'.format(average_percentage_under_10_seconds), '{:.2f}%'.format(average_percentage_under_10_seconds),
label='on average', label='on average',
@@ -107,13 +107,13 @@
<h2 class="govuk-heading-m"> <h2 class="govuk-heading-m">
Organizations using Notify Organizations using Notify
</h2> </h2>
<div class="govuk-grid-row bottom-gutter"> <div class="grid-row bottom-gutter">
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<span class="usa-sr-only">There are</span> <span class="usa-sr-only">There are</span>
<div class="product-page-big-number">{{ count_of_live_services_and_organizations.organizations|format_thousands }}</div> <div class="product-page-big-number">{{ count_of_live_services_and_organizations.organizations|format_thousands }}</div>
organizations organizations
</div> </div>
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<span class="usa-sr-only">and</span> <span class="usa-sr-only">and</span>
<div class="product-page-big-number">{{ count_of_live_services_and_organizations.services|format_thousands }}</div> <div class="product-page-big-number">{{ count_of_live_services_and_organizations.services|format_thousands }}</div>
services services

6
app/templates/views/platform-admin/_global_stats.html
View File

@@ -1,7 +1,7 @@
{% from "components/big-number.html" import big_number_with_status %} {% from "components/big-number.html" import big_number_with_status %}
<div class="govuk-grid-row bottom-gutter"> <div class="grid-row bottom-gutter">
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
{{ big_number_with_status( {{ big_number_with_status(
global_stats.email.delivered + global_stats.email.failed, global_stats.email.delivered + global_stats.email.failed,
global_stats.email.delivered|message_count_label('email'), global_stats.email.delivered|message_count_label('email'),
@@ -11,7 +11,7 @@
smaller=True smaller=True
) }} ) }}
</div> </div>
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
{{ big_number_with_status( {{ big_number_with_status(
global_stats.sms.delivered + global_stats.sms.failed, global_stats.sms.delivered + global_stats.sms.failed,
global_stats.sms.delivered|message_count_label('sms'), global_stats.sms.delivered|message_count_label('sms'),

8
app/templates/views/platform-admin/index.html
View File

@@ -30,9 +30,9 @@
"open": form.errors | convert_to_boolean "open": form.errors | convert_to_boolean
}) }} }) }}
<div class="govuk-grid-row bottom-gutter"> <div class="grid-row bottom-gutter">
{% for noti_type in global_stats %} {% for noti_type in global_stats %}
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
{{ big_number_simple( {{ big_number_simple(
noti_type.black_box.number, noti_type.black_box.number,
noti_type.black_box.number|message_count_label(noti_type.black_box.notification_type) noti_type.black_box.number|message_count_label(noti_type.black_box.notification_type)
@@ -51,9 +51,9 @@
{% endfor %} {% endfor %}
</div> </div>
<div class="govuk-grid-row bottom-gutter"> <div class="grid-row bottom-gutter">
{% for noti_type in global_stats %} {% for noti_type in global_stats %}
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<div class="bordered-text-box"> <div class="bordered-text-box">
<span class="big-number-number">{{ "{:,}".format(noti_type.test_data.number) }}</span> <span class="big-number-number">{{ "{:,}".format(noti_type.test_data.number) }}</span>
{{ noti_type.test_data.label }} {{ noti_type.test_data.label }}

4
app/templates/views/privacy.html
View File

@@ -7,8 +7,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">Privacy notice: how we use your data</h1> <h1 class="font-body-2xl margin-bottom-3">Privacy notice: how we use your data</h1>
{{ content_metadata( {{ content_metadata(

4
app/templates/views/providers/provider.html
View File

@@ -14,8 +14,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
{{ page_header(provider_versions[0].display_name) }} {{ page_header(provider_versions[0].display_name) }}

4
app/templates/views/re-validate-email-sent.html
View File

@@ -7,8 +7,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">{{ title }}</h1> <h1 class="font-body-2xl margin-bottom-3">{{ title }}</h1>
<p>For security, we need to check if you still have access to your email address.</p> <p>For security, we need to check if you still have access to your email address.</p>
<p>We’ve sent you a link valid for 1 hour to sign in to Notify. The link will open in a new browser window, so you can close this one.</p> <p>We’ve sent you a link valid for 1 hour to sign in to Notify. The link will open in a new browser window, so you can close this one.</p>

4
app/templates/views/register-from-invite.html
View File

@@ -8,8 +8,8 @@ Create an account
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">Create an account</h1> <h1 class="font-body-2xl margin-bottom-3">Create an account</h1>
<p> <p>
Your account will be created with this email address: Your account will be created with this email address:

4
app/templates/views/register-from-org-invite.html
View File

@@ -8,8 +8,8 @@ Create an account
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">Create an account</h1> <h1 class="font-body-2xl margin-bottom-3">Create an account</h1>
<p>Your account will be created with this email: {{invited_org_user.email_address}}</p> <p>Your account will be created with this email: {{invited_org_user.email_address}}</p>
{% call form_wrapper() %} {% call form_wrapper() %}

4
app/templates/views/register.html
View File

@@ -8,8 +8,8 @@ Create an account
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">Create an account</h1> <h1 class="font-body-2xl margin-bottom-3">Create an account</h1>
{% call form_wrapper(autocomplete=True) %} {% call form_wrapper(autocomplete=True) %}
{{ form.name(param_extensions={"classes": "govuk-!-width-three-quarters"}) }} {{ form.name(param_extensions={"classes": "govuk-!-width-three-quarters"}) }}

6
app/templates/views/send-test.html
View File

@@ -23,12 +23,12 @@
module="autofocus", module="autofocus",
data_kwargs={'force-focus': True} data_kwargs={'force-focus': True}
) %} ) %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}"> <div class="grid-col-12 {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}">
{{ form.placeholder_value(param_extensions={"classes": ""}) }} {{ form.placeholder_value(param_extensions={"classes": ""}) }}
</div> </div>
{% if skip_link or link_to_upload %} {% if skip_link or link_to_upload %}
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{% if link_to_upload %} {% if link_to_upload %}
<a class="usa-link govuk-!-margin-right-3" href="{{ url_for('.send_messages', service_id=current_service.id, template_id=template.id) }}">Upload a list of {{ 999|recipient_count_label(template.template_type) }}</a> <a class="usa-link govuk-!-margin-right-3" href="{{ url_for('.send_messages', service_id=current_service.id, template_id=template.id) }}">Upload a list of {{ 999|recipient_count_label(template.template_type) }}</a>
{% endif %} {% endif %}

4
app/templates/views/service-settings/confirm.html
View File

@@ -16,8 +16,8 @@
{{ page_header(heading) }} {{ page_header(heading) }}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
{% call form_wrapper() %} {% call form_wrapper() %}
{{ form.password(param_extensions={"autocomplete": "current-password"}) }} {{ form.password(param_extensions={"autocomplete": "current-password"}) }}

10
app/templates/views/service-settings/data-retention.html
View File

@@ -8,13 +8,13 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row bottom-gutter"> <div class="grid-row bottom-gutter">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3"> <h1 class="font-body-2xl margin-bottom-3">
Data retention Data retention
</h1> </h1>
</div> </div>
<div class="govuk-grid-column-one-third"> <div class="grid-col-4">
{{ govukButton({ {{ govukButton({
"element": "a", "element": "a",
"text": "Add data retention", "text": "Add data retention",
@@ -23,8 +23,8 @@
}) }} }) }}
</div> </div>
</div> </div>
<div class="govuk-grid-row bottom-gutter"> <div class="grid-row bottom-gutter">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
By default data is kept for 7 days By default data is kept for 7 days
</div> </div>
</div> </div>

16
app/templates/views/service-settings/email_reply_to.html
View File

@@ -25,8 +25,8 @@
{% endif %} {% endif %}
{% for item in current_service.email_reply_to_addresses %} {% for item in current_service.email_reply_to_addresses %}
<div class="user-list-item"> <div class="user-list-item">
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
<h2 class="user-list-item-heading"> <h2 class="user-list-item-heading">
<span class="heading-small">{{ item.email_address }}</span>&ensp;<span class="hint"> <span class="heading-small">{{ item.email_address }}</span>&ensp;<span class="hint">
{%- if item.is_default -%} {%- if item.is_default -%}
@@ -35,7 +35,7 @@
</span> </span>
</h2> </h2>
</div> </div>
<div class="govuk-grid-column-one-quarter"> <div class="grid-col-3">
{% if current_user.has_permissions('manage_service') %} {% if current_user.has_permissions('manage_service') %}
<a class="usa-link user-list-edit-link" href="{{ url_for('.service_edit_email_reply_to', service_id =current_service.id, reply_to_email_id = item.id) }}"> <a class="usa-link user-list-edit-link" href="{{ url_for('.service_edit_email_reply_to', service_id =current_service.id, reply_to_email_id = item.id) }}">
Change<span class="usa-sr-only"> {{ item.email_address }}</span> Change<span class="usa-sr-only"> {{ item.email_address }}</span>
@@ -43,8 +43,8 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{% if current_service.count_email_reply_to_addresses > 1 %} {% if current_service.count_email_reply_to_addresses > 1 %}
{{ copy_to_clipboard(item.id, name=item.email_address, thing="ID") }} {{ copy_to_clipboard(item.id, name=item.email_address, thing="ID") }}
{% endif %} {% endif %}
@@ -53,8 +53,8 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{% if current_user.has_permissions('manage_service') %} {% if current_user.has_permissions('manage_service') %}
<div class="js-stick-at-bottom-when-scrolling"> <div class="js-stick-at-bottom-when-scrolling">
{{ govukButton({ {{ govukButton({
@@ -65,7 +65,7 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
<p> <p>
You need to add at least one reply-to address so recipients can reply to your messages. You need to add at least one reply-to address so recipients can reply to your messages.
</p> </p>

4
app/templates/views/service-settings/estimate-usage.html
View File

@@ -14,8 +14,8 @@
{% endblock %} {% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{% if not form.at_least_one_volume_filled %} {% if not form.at_least_one_volume_filled %}
{% call banner_wrapper(type='dangerous') %} {% call banner_wrapper(type='dangerous') %}
<h1 class='banner-title'> <h1 class='banner-title'>

4
app/templates/views/service-settings/preview-email-branding.html
View File

@@ -10,8 +10,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<h1 class="font-body-2xl margin-bottom-3">Preview email branding</h1> <h1 class="font-body-2xl margin-bottom-3">Preview email branding</h1>
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{{ email_branding_preview(form.branding_style.data) }} {{ email_branding_preview(form.branding_style.data) }}
{% call form_wrapper(action=action) %} {% call form_wrapper(action=action) %}
<div class="form-group"> <div class="form-group">

4
app/templates/views/service-settings/request-to-go-live.html
View File

@@ -14,8 +14,8 @@
{% endblock %} {% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{{ page_header('Before you request to go live') }} {{ page_header('Before you request to go live') }}
{% call task_list_wrapper() %} {% call task_list_wrapper() %}
{{ task_list_item( {{ task_list_item(

4
app/templates/views/service-settings/send-files-by-email.html
View File

@@ -15,8 +15,8 @@
{% endblock %} {% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
{{ page_header('Send files by email') }} {{ page_header('Send files by email') }}
<p> <p>
This is an API-only feature. This is an API-only feature.

4
app/templates/views/service-settings/service-already-live.html
View File

@@ -6,8 +6,8 @@
{% endblock %} {% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{{ page_header('Your service is already live') }} {{ page_header('Your service is already live') }}
<p> <p>

4
app/templates/views/service-settings/set-auth-type.html
View File

@@ -13,8 +13,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
{{ page_header('Sign-in method') }} {{ page_header('Sign-in method') }}
{% if 'email_auth' in current_service.permissions %} {% if 'email_auth' in current_service.permissions %}
<p class="heading-small bottom-gutter-2-3"> <p class="heading-small bottom-gutter-2-3">

8
app/templates/views/service-settings/set-email-branding.html
View File

@@ -19,12 +19,12 @@
{{ page_header(page_title) }} {{ page_header(page_title) }}
{% call form_wrapper(data_kwargs={'preview-type': 'email'}) %} {% call form_wrapper(data_kwargs={'preview-type': 'email'}) %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full preview-pane"> <div class="grid-col-12 preview-pane">
</div> </div>
</div> </div>
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{{ live_search( {{ live_search(
target_selector='.govuk-radios__item', target_selector='.govuk-radios__item',
show=True, show=True,

4
app/templates/views/service-settings/set-email.html
View File

@@ -14,8 +14,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
{{ page_header('Send emails') }} {{ page_header('Send emails') }}
<p> <p>
It’s free to send emails through Notify.gov. It’s free to send emails through Notify.gov.

4
app/templates/views/service-settings/set-inbound-sms.html
View File

@@ -13,8 +13,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
{{ page_header('Receive text messages') }} {{ page_header('Receive text messages') }}
{% if 'inbound_sms' in current_service.permissions %} {% if 'inbound_sms' in current_service.permissions %}
<p> <p>

4
app/templates/views/service-settings/set-international-sms.html
View File

@@ -14,8 +14,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
{{ page_header('Send international text messages') }} {{ page_header('Send international text messages') }}
<p> <p>
Messages to international mobile numbers are charged at 1, 2, or Messages to international mobile numbers are charged at 1, 2, or

4
app/templates/views/service-settings/set-service-setting.html
View File

@@ -13,8 +13,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
{% call form_wrapper() %} {% call form_wrapper() %}
{{ form.enabled(param_extensions={ {{ form.enabled(param_extensions={
"fieldset": { "fieldset": {

4
app/templates/views/service-settings/sms-senders.html
View File

@@ -53,8 +53,8 @@
</div> </div>
{% if current_user.has_permissions('manage_service') %} {% if current_user.has_permissions('manage_service') %}
<div class="govuk-grid-row bottom-gutter"> <div class="grid-row bottom-gutter">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{{ govukButton({ {{ govukButton({
"element": "a", "element": "a",
"text": "Add text message sender", "text": "Add text message sender",

42
app/templates/views/signedout.html
View File

@@ -149,8 +149,8 @@ Notify.gov
<nav class="breadcrumbs breadcrumbs--inverse" aria-label="Breadcrumbs"> <nav class="breadcrumbs breadcrumbs--inverse" aria-label="Breadcrumbs">
</nav> </nav>
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1> <h1>
Send text messages to your users Send text messages to your users
</h1> </h1>
@@ -168,7 +168,7 @@ Notify.gov
it before it before
</div> </div>
</div> </div>
<div class="govuk-grid-column-one-third"> <div class="grid-col-4">
<img <img
src="{{ asset_url('images/product/proposition-illustration.png') }}" src="{{ asset_url('images/product/proposition-illustration.png') }}"
alt="An illustration of notifications to a phone, a laptop, and a letter."> alt="An illustration of notifications to a phone, a laptop, and a letter.">
@@ -178,8 +178,8 @@ Notify.gov
</div> </div>
<div class="product-page-section"> <div class="product-page-section">
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<h2> <h2>
Control your content Control your content
</h2> </h2>
@@ -187,7 +187,7 @@ Notify.gov
You do not need any technical knowledge to create message templates. You do not need any technical knowledge to create message templates.
</p> </p>
</div> </div>
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<img <img
src="{{ asset_url('images/product/01-templates.svg') }}" src="{{ asset_url('images/product/01-templates.svg') }}"
alt="Example screenshot of adding a new text message template"> alt="Example screenshot of adding a new text message template">
@@ -195,8 +195,8 @@ Notify.gov
</div> </div>
</div> </div>
<div class="product-page-section"> <div class="product-page-section">
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<h2> <h2>
See how your messages perform See how your messages perform
</h2> </h2>
@@ -205,7 +205,7 @@ Notify.gov
find out which ones are not being delivered. find out which ones are not being delivered.
</p> </p>
</div> </div>
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<img <img
src="{{ asset_url('images/product/02-reporting.svg') }}" src="{{ asset_url('images/product/02-reporting.svg') }}"
alt="A screenshot of Notify.gov showing counts of emails and text messages sent" alt="A screenshot of Notify.gov showing counts of emails and text messages sent"
@@ -217,8 +217,8 @@ Notify.gov
<h2 class="with-keyline"> <h2 class="with-keyline">
Send messages manually or automatically Send messages manually or automatically
</h2> </h2>
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<p> <p>
Upload a spreadsheet of phone&nbsp;numbers and Notify sends the messages. Upload a spreadsheet of phone&nbsp;numbers and Notify sends the messages.
</p> </p>
@@ -227,7 +227,7 @@ Notify.gov
alt="A screenshot of a spreadsheet with columns for email address, name and color" alt="A screenshot of a spreadsheet with columns for email address, name and color"
> >
</div> </div>
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<p> <p>
Integrate the Notify.gov API with your web&nbsp;application or Integrate the Notify.gov API with your web&nbsp;application or
back office system. back office system.
@@ -242,13 +242,13 @@ Notify.gov
<div class="product-page-section"> <div class="product-page-section">
<div class="with-keyline bottom-gutter-2" id="whos-using-notify"> <div class="with-keyline bottom-gutter-2" id="whos-using-notify">
<h2>Who’s using Notify.gov</h2> <h2>Who’s using Notify.gov</h2>
<div class="govuk-grid-row bottom-gutter"> <div class="grid-row bottom-gutter">
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<span class="usa-sr-only">There are</span> <span class="usa-sr-only">There are</span>
<div class="product-page-big-number">{{ counts.organizations|format_thousands }}</div> <div class="product-page-big-number">{{ counts.organizations|format_thousands }}</div>
<span>organizations</span> <span>organizations</span>
</div> </div>
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<span class="usa-sr-only">and</span> <span class="usa-sr-only">and</span>
<div class="product-page-big-number">{{ counts.services|format_thousands }}</div> <div class="product-page-big-number">{{ counts.services|format_thousands }}</div>
<span>services</span> <span>services</span>
@@ -264,19 +264,19 @@ Notify.gov
<div class="product-page-section"> <div class="product-page-section">
<div class="with-keyline bottom-gutter-2"> <div class="with-keyline bottom-gutter-2">
<h2>Pricing</h2> <h2>Pricing</h2>
<div class="govuk-grid-row bottom-gutter"> <div class="grid-row bottom-gutter">
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<h3 class="usa-sr-only">Emails</h3> <h3 class="usa-sr-only">Emails</h3>
<div class="product-page-big-number">Unlimited</div> <div class="product-page-big-number">Unlimited</div>
<span>free emails</span> <span>free emails</span>
</div> </div>
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<h3 class="usa-sr-only">Text messages</h3> <h3 class="usa-sr-only">Text messages</h3>
<div class="product-page-big-number">Up to 40,000</div> <div class="product-page-big-number">Up to 40,000</div>
<span>free text messages a year,<br> <span>free text messages a year,<br>
then {{ sms_rate }} pence per message</span> then {{ sms_rate }} pence per message</span>
</div> </div>
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
<p class="align-with-big-number-hint"> <p class="align-with-big-number-hint">
There’s no monthly charge, no setup fee and no&nbsp;procurement process. There’s no monthly charge, no setup fee and no&nbsp;procurement process.
</p> </p>
@@ -287,8 +287,8 @@ Notify.gov
</div> </div>
</div> </div>
<div class="product-page-section"> <div class="product-page-section">
<div class="govuk-grid-row margin-bottom-"> <div class="grid-row margin-bottom-">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
<h2 class="with-keyline"> <h2 class="with-keyline">
The team The team
</h2> </h2>

4
app/templates/views/support/bat-phone.html
View File

@@ -14,8 +14,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
{{ page_header('Out of hours emergencies')}} {{ page_header('Out of hours emergencies')}}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<p> <p>
First, check the First, check the
<a class="usa-link" href="https://status.notifications.service.gov.uk">system status page</a>. <a class="usa-link" href="https://status.notifications.service.gov.uk">system status page</a>.

4
app/templates/views/support/form.html
View File

@@ -16,8 +16,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
{{ page_header(page_title) }} {{ page_header(page_title) }}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
{% if show_status_page_banner %} {% if show_status_page_banner %}
<div class="panel panel-border-wide"> <div class="panel panel-border-wide">
<p> <p>

4
app/templates/views/support/index.html
View File

@@ -28,8 +28,8 @@
{{ page_footer('Continue') }} {{ page_footer('Continue') }}
{% endcall %} {% endcall %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h2 class="font-body-lg">Office hours</h2> <h2 class="font-body-lg">Office hours</h2>
<p>Our office hours are 9:30am to 5:30pm, Monday to Friday.</p> <p>Our office hours are 9:30am to 5:30pm, Monday to Friday.</p>
<p>When you report a problem in office hours, we’ll aim to read it within 30 minutes and reply within one working day.</p> <p>When you report a problem in office hours, we’ll aim to read it within 30 minutes and reply within one working day.</p>

4
app/templates/views/support/public.html
View File

@@ -13,8 +13,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
{{ page_header('The Notify.gov service is for people who work in the government') }} {{ page_header('The Notify.gov service is for people who work in the government') }}

4
app/templates/views/support/triage.html
View File

@@ -14,8 +14,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
{{ page_header(page_title) }} {{ page_header(page_title) }}
{% call form_wrapper() %} {% call form_wrapper() %}
{{ form.severe }} {{ form.severe }}

6
app/templates/views/temp-history.html
View File

@@ -32,8 +32,8 @@
<ul class="bottom-gutter"> <ul class="bottom-gutter">
{% for event in events %} {% for event in events %}
<li class="history-list-item"> <li class="history-list-item">
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-third"> <div class="grid-col-4">
<div class="history-list-user"> <div class="history-list-user">
{{ user_getter(event.user_id) }} {{ user_getter(event.user_id) }}
</div> </div>
@@ -41,7 +41,7 @@
{{ event.time | format_time_24h }} {{ event.time | format_time_24h }}
</div> </div>
</div> </div>
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
{{ event }} {{ event }}
</div> </div>
</li> </li>

4
app/templates/views/templates/_template_history.html
View File

@@ -1,4 +1,4 @@
<div class="govuk-grid-column-full"> <div class="grid-col-12">
<h2 class="message-name">{{ template.name }}</h2> <h2 class="message-name">{{ template.name }}</h2>
<p class="hint"> <p class="hint">
{% if template.get_raw('version', 1) > 1 %} {% if template.get_raw('version', 1) > 1 %}
@@ -11,6 +11,6 @@
</p> </p>
</div> </div>
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{{ template|string }} {{ template|string }}
</div> </div>

4
app/templates/views/templates/action_blocked.html
View File

@@ -13,8 +13,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
{{ page_header('{} are disabled'.format(notification_type.capitalize())) }} {{ page_header('{} are disabled'.format(notification_type.capitalize())) }}
<p> <p>
Sending {{ 999|message_count_label(notification_type, suffix='') }} has been disabled for your service. Sending {{ 999|message_count_label(notification_type, suffix='') }} has been disabled for your service.

4
app/templates/views/templates/breaking-change.html
View File

@@ -17,8 +17,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
{{ page_header('Confirm changes') }} {{ page_header('Confirm changes') }}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
{% if template_change.placeholders_removed %} {% if template_change.placeholders_removed %}
<p> <p>
You removed {{ list_of_placeholders(template_change.placeholders_removed) }} You removed {{ list_of_placeholders(template_change.placeholders_removed) }}

6
app/templates/views/templates/choose.html
View File

@@ -32,8 +32,8 @@
{% else %} {% else %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="{% if current_user.has_permissions('manage_templates') %} govuk-grid-column-five-sixths {% else %} govuk-grid-column-full {% endif %}"> <div class="{% if current_user.has_permissions('manage_templates') %} grid-col-10 {% else %} grid-col-12 {% endif %}">
<div class="usa-alert usa-alert--info usa-alert--slim"> <div class="usa-alert usa-alert--info usa-alert--slim">
<div class="usa-alert__body"> <div class="usa-alert__body">
<p class="usa-alert__text"> <p class="usa-alert__text">
@@ -49,7 +49,7 @@
) }} ) }}
</div> </div>
{% if current_user.has_permissions('manage_templates') and current_template_folder_id and user_has_template_folder_permission %} {% if current_user.has_permissions('manage_templates') and current_template_folder_id and user_has_template_folder_permission %}
<div class="govuk-grid-column-one-sixth"> <div class="grid-col-2">
<a href="{{ url_for('.manage_template_folder', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="usa-link folder-heading-manage-link">Manage<span class="usa-sr-only"> this folder</span></a> <a href="{{ url_for('.manage_template_folder', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="usa-link folder-heading-manage-link">Manage<span class="usa-sr-only"> this folder</span></a>
</div> </div>
{% endif %} {% endif %}

2
app/templates/views/templates/choose_history.html
View File

@@ -6,7 +6,7 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<h1 class="font-body-2xl margin-bottom-3">Previous versions</h1> <h1 class="font-body-2xl margin-bottom-3">Previous versions</h1>
<div class="govuk-grid-row"> <div class="grid-row">
{% for template in versions %} {% for template in versions %}
{% with show_title=True %} {% with show_title=True %}
{% include 'views/templates/_template_history.html' %} {% include 'views/templates/_template_history.html' %}

4
app/templates/views/templates/manage-template-folder.html
View File

@@ -9,8 +9,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row bottom-gutter-1-2"> <div class="grid-row bottom-gutter-1-2">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
{{ folder_path( {{ folder_path(
folders=template_folder_path, folders=template_folder_path,
service_id=current_service.id, service_id=current_service.id,

8
app/templates/views/templates/set-sender.html
View File

@@ -13,19 +13,19 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row govuk-!-margin-top-3"> <div class="grid-row govuk-!-margin-top-3">
{% call form_wrapper() %} {% call form_wrapper() %}
{{ form.sender(param_extensions={ {{ form.sender(param_extensions={
'fieldset': { 'fieldset': {
'legend': { 'legend': {
'isPageHeading': True, 'isPageHeading': True,
'text': sender_context.title, 'text': sender_context.title,
'classes': 'govuk-fieldset__legend--l govuk-grid-column-full' 'classes': 'govuk-fieldset__legend--l grid-col-12'
} }
}, },
'classes': 'govuk-grid-column-three-quarters' 'classes': 'grid-col-9'
}) }} }) }}
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
{{ page_footer('Continue') }} {{ page_footer('Continue') }}
</div> </div>
{% endcall %} {% endcall %}

8
app/templates/views/templates/set-template-sender.html
View File

@@ -15,19 +15,19 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row govuk-!-margin-top-3"> <div class="grid-row govuk-!-margin-top-3">
{% call form_wrapper() %} {% call form_wrapper() %}
{{ form.sender(param_extensions={ {{ form.sender(param_extensions={
'fieldset': { 'fieldset': {
'legend': { 'legend': {
'isPageHeading': True, 'isPageHeading': True,
'text': page_title, 'text': page_title,
'classes': 'govuk-fieldset__legend--l govuk-grid-column-full' 'classes': 'govuk-fieldset__legend--l grid-col-12'
} }
}, },
'classes': 'govuk-grid-column-three-quarters' 'classes': 'grid-col-9'
}) }} }) }}
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
{{ page_footer('Continue') }} {{ page_footer('Continue') }}
<a class="usa-link" href="{{ url_for('.service_add_letter_contact', service_id=current_service.id, from_template=template_id) }}">Add new sender</a> <a class="usa-link" href="{{ url_for('.service_add_letter_contact', service_id=current_service.id, from_template=template_id) }}">Add new sender</a>
</div> </div>

2
app/templates/views/templates/template_history.html
View File

@@ -10,7 +10,7 @@
<h1 class="font-body-2xl margin-bottom-3">{{ template.name }}</h1> <h1 class="font-body-2xl margin-bottom-3">{{ template.name }}</h1>
<div class="govuk-grid-row"> <div class="grid-row">
{% with show_title=False %} {% with show_title=False %}
{% include 'views/templates/_template_history.html' %} {% include 'views/templates/_template_history.html' %}
{% endwith %} {% endwith %}

4
app/templates/views/text-not-received.html
View File

@@ -8,8 +8,8 @@ Check your mobile number
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">Check your mobile number</h1> <h1 class="font-body-2xl margin-bottom-3">Check your mobile number</h1>
<p>Check your mobile phone number is correct and then resend the security code.</p> <p>Check your mobile phone number is correct and then resend the security code.</p>

4
app/templates/views/two-factor-email.html
View File

@@ -7,8 +7,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">{{ title }}</h1> <h1 class="font-body-2xl margin-bottom-3">{{ title }}</h1>
<p>We’ve emailed you a link to sign in to Notify.</p> <p>We’ve emailed you a link to sign in to Notify.</p>
<p>Clicking the link will open Notify in a new browser window, so you can close this one.</p> <p>Clicking the link will open Notify in a new browser window, so you can close this one.</p>

4
app/templates/views/two-factor-sms.html
View File

@@ -8,8 +8,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">Check your phone</h1> <h1 class="font-body-2xl margin-bottom-3">Check your phone</h1>
<p>We’ve sent you a text message with a security code.</p> <p>We’ve sent you a text message with a security code.</p>

6
app/templates/views/two-factor-webauthn.html
View File

@@ -36,8 +36,8 @@
} }
}) }} }) }}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
{{ page_header(page_title) }} {{ page_header(page_title) }}
<p> <p>
@@ -64,7 +64,7 @@
"text": "JavaScript is not available for this page. Security keys need JavaScript to work." "text": "JavaScript is not available for this page. Security keys need JavaScript to work."
}) }} }) }}
</div> </div>
<div class="govuk-grid-column-one-quarter"> <div class="grid-col-3">
<img src="{{ asset_url('images/security-key.svg') }}" alt="" class="webauthn-illustration" width="149" height="150"> <img src="{{ asset_url('images/security-key.svg') }}" alt="" class="webauthn-illustration" width="149" height="150">
</div> </div>
</div> </div>

18
app/templates/views/usage.html
View File

@@ -18,9 +18,9 @@
{{ pill(years, selected_year, big_number_args={'smallest': True}) }} {{ pill(years, selected_year, big_number_args={'smallest': True}) }}
</div> </div>
<div id='pill-selected-item'> <div id='pill-selected-item'>
<div class='govuk-grid-row'> <div class='grid-row'>
<div class='govuk-grid-column-one-half'> <div class='grid-col-6'>
<h2 class='heading-small'>Text messages</h2> <h2 class='heading-small'>Text messages</h2>
<div class="keyline-block"> <div class="keyline-block">
{{ big_number(sms_sent, 'sent', smaller=True) }} {{ big_number(sms_sent, 'sent', smaller=True) }}
@@ -39,7 +39,7 @@
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
{# <div class='govuk-grid-column-one-half'> {# <div class='grid-col-6'>
<h2 class='heading-small'>Emails</h2> <h2 class='heading-small'>Emails</h2>
<div class="keyline-block"> <div class="keyline-block">
{{ big_number(emails_sent, 'email disabled during SMS pilot', smaller=True) }} {{ big_number(emails_sent, 'email disabled during SMS pilot', smaller=True) }}
@@ -48,8 +48,8 @@
</div> #} </div> #}
</div> </div>
{# <div class='govuk-grid-row'> {# <div class='grid-row'>
<div class='govuk-grid-column-one-half'> <div class='grid-col-6'>
<div class="keyline-block"> <div class="keyline-block">
{{ big_number( {{ big_number(
sms_cost, sms_cost,
@@ -59,7 +59,7 @@
) }} ) }}
</div> </div>
</div> </div>
<div class='govuk-grid-column-one-half'> <div class='grid-col-6'>
<div class="keyline-block"> <div class="keyline-block">
&nbsp; &nbsp;
</div> </div>
@@ -126,13 +126,13 @@
{% endif %} {% endif %}
</div> </div>
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-third"> <div class="grid-col-4">
<p class="align-with-heading-copy"> <p class="align-with-heading-copy">
Federal fiscal year ends September&nbsp;30 Federal fiscal year ends September&nbsp;30
</p> </p>
</div> </div>
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<p class="align-with-heading-copy"> <p class="align-with-heading-copy">
What counts as 1 text message?<br /> What counts as 1 text message?<br />
See <a class="usa-link" href="{{ url_for('.pricing') }}">pricing</a>. See <a class="usa-link" href="{{ url_for('.pricing') }}">pricing</a>.

4
app/templates/views/user-profile/authenticate.html
View File

@@ -16,8 +16,8 @@
{{ page_header('Change your {}'.format(thing)) }} {{ page_header('Change your {}'.format(thing)) }}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
{% call form_wrapper(autocomplete=True) %} {% call form_wrapper(autocomplete=True) %}
{{ form.password(param_extensions={"autocomplete": "current-password"}) }} {{ form.password(param_extensions={"autocomplete": "current-password"}) }}

4
app/templates/views/user-profile/change-password.html
View File

@@ -16,8 +16,8 @@
{{ page_header('Change your password') }} {{ page_header('Change your password') }}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
{% call form_wrapper(autocomplete=True) %} {% call form_wrapper(autocomplete=True) %}
{{ form.old_password }} {{ form.old_password }}
{{ form.new_password }} {{ form.new_password }}

4
app/templates/views/user-profile/change.html
View File

@@ -16,8 +16,8 @@
{{ page_header('Change your {}'.format(thing)) }} {{ page_header('Change your {}'.format(thing)) }}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
{% call form_wrapper() %} {% call form_wrapper() %}
{{ form_field(error_message_with_html=True) }} {{ form_field(error_message_with_html=True) }}
{% if current_user.auth_type == 'email_auth' and (current_user.mobile_number and thing == "mobile number") %} {% if current_user.auth_type == 'email_auth' and (current_user.mobile_number and thing == "mobile number") %}

4
app/templates/views/user-profile/confirm.html
View File

@@ -16,8 +16,8 @@
{{ page_header('Change your {}'.format(thing)) }} {{ page_header('Change your {}'.format(thing)) }}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
<p> <p>
We’ve sent a security code to your new {{ thing }}. We’ve sent a security code to your new {{ thing }}.
</p> </p>

4
app/templates/views/user-profile/disable-platform-admin-view.html
View File

@@ -15,8 +15,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
{% call form_wrapper(class="govuk-!-margin-top-3") %} {% call form_wrapper(class="govuk-!-margin-top-3") %}
{{ form.enabled(param_extensions={ {{ form.enabled(param_extensions={

4
app/templates/views/user-profile/manage-security-key.html
View File

@@ -17,8 +17,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
{{ page_header(page_title) }} {{ page_header(page_title) }}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-three-quarters"> <div class="grid-col-9">
{% call form_wrapper(autocomplete=True) %} {% call form_wrapper(autocomplete=True) %}
{{ form.security_key_name }} {{ form.security_key_name }}
{{ page_footer( {{ page_footer(

8
app/templates/views/user-profile/security-keys.html
View File

@@ -45,7 +45,7 @@
}) }} }) }}
{% endset %} {% endset %}
<div class="govuk-grid-row"> <div class="grid-row">
{{ govukErrorMessage({ {{ govukErrorMessage({
"classes": "banner-dangerous govuk-!-display-none", "classes": "banner-dangerous govuk-!-display-none",
@@ -63,7 +63,7 @@
}) }} }) }}
{% if credentials %} {% if credentials %}
<div class="govuk-grid-column-five-sixths"> <div class="grid-col-10">
{{ page_header(page_title) }} {{ page_header(page_title) }}
<div class="body-copy-table"> <div class="body-copy-table">
{% call mapping_table( {% call mapping_table(
@@ -86,7 +86,7 @@
{{ webauthn_button }} {{ webauthn_button }}
</div> </div>
{% else %} {% else %}
<div class="govuk-grid-column-one-half"> <div class="grid-col-6">
{{ page_header(page_title) }} {{ page_header(page_title) }}
<p> <p>
Security keys are an alternative way of signing in to Notify, Security keys are an alternative way of signing in to Notify,
@@ -98,7 +98,7 @@
</p> </p>
{{ webauthn_button }} {{ webauthn_button }}
</div> </div>
<div class="govuk-grid-column-one-quarter"> <div class="grid-col-3">
<img src="{{ asset_url('images/security-key.svg') }}" alt="" class="webauthn-illustration" width="149" height="150"> <img src="{{ asset_url('images/security-key.svg') }}" alt="" class="webauthn-illustration" width="149" height="150">
</div> </div>
{% endif %} {% endif %}

6
app/templates/views/using-notify.html
View File

@@ -7,11 +7,11 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-one-third"> <div class="grid-col-4">
{{ sub_navigation(navigation_links) }} {{ sub_navigation(navigation_links) }}
</div> </div>
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">Using Notify</h1> <h1 class="font-body-2xl margin-bottom-3">Using Notify</h1>

4
app/templates/views/verification-not-received.html
View File

@@ -7,8 +7,8 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="grid-col-8">
<h1 class="font-body-2xl margin-bottom-3">Resend security code</h1> <h1 class="font-body-2xl margin-bottom-3">Resend security code</h1>
<p>Text messages sometimes take a few minutes to arrive. If you do not receive a security code, Notify can send you a new one.</p> <p>Text messages sometimes take a few minutes to arrive. If you do not receive a security code, Notify can send you a new one.</p>

6
paas-failwhale/index.html
View File

@@ -80,9 +80,9 @@
</header> </header>
<div class="govuk-width-container"> <div class="govuk-width-container">
<main class="govuk-main-wrapper govuk-!-padding-top-0 govuk-!-padding-bottom-12" id="main-content" role="main"> <main class="govuk-main-wrapper govuk-!-padding-top-0" id="main-content" role="main">
<div class="govuk-grid-row"> <div class="grid-row">
<div class="govuk-grid-column-full"> <div class="grid-col-12">
<h1 class="govuk-heading-l govuk-!-padding-top-7"> <h1 class="govuk-heading-l govuk-!-padding-top-7">
Sorry, the service is unavailable Sorry, the service is unavailable
</h1> </h1>

Some files were not shown because too many files have changed in this diff Show More