From 412fad89ff636a6b882854af5ce3afcda02c02b0 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Wed, 23 Aug 2023 16:18:25 -0400 Subject: [PATCH 01/17] Changing the govuk grid to USWDS --- app/assets/error_pages/5xx.html | 6 +-- app/templates/error/401.html | 4 +- app/templates/error/403.html | 4 +- app/templates/error/404.html | 4 +- app/templates/error/410.html | 4 +- app/templates/error/500.html | 4 +- app/templates/fullwidth_template.html | 2 +- app/templates/main_template.html | 2 +- app/templates/org_template.html | 6 +-- app/templates/partials/count.html | 6 +-- app/templates/partials/tour.html | 18 ++++---- app/templates/views/add-service-local.html | 4 +- app/templates/views/add-service.html | 4 +- .../callbacks/delivery-status-callback.html | 4 +- .../received-text-messages-callback.html | 4 +- app/templates/views/api/guest-list.html | 4 +- app/templates/views/api/index.html | 20 ++++----- app/templates/views/cancelled-invitation.html | 4 +- app/templates/views/choose-account.html | 18 ++++---- .../views/conversations/messages.html | 8 ++-- app/templates/views/cookies.html | 4 +- app/templates/views/dashboard/_jobs.html | 8 ++-- app/templates/views/edit-email-template.html | 6 +-- app/templates/views/edit-sms-template.html | 8 ++-- .../views/email-branding/manage-branding.html | 4 +- app/templates/views/email-link-invalid.html | 4 +- app/templates/views/email-not-received.html | 4 +- app/templates/views/find-users/auth_type.html | 4 +- .../views/find-users/user-information.html | 4 +- app/templates/views/forgot-password.html | 4 +- app/templates/views/integration-testing.html | 4 +- app/templates/views/manage-users.html | 6 +-- .../manage-users/confirm-edit-user-email.html | 4 +- .../confirm-edit-user-mobile-number.html | 4 +- .../views/manage-users/edit-user-mobile.html | 4 +- app/templates/views/new-password.html | 4 +- .../views/organizations/add-organization.html | 6 +-- .../organizations/organization/index.html | 12 +++--- .../organization/settings/edit-domains.html | 4 +- .../settings/edit-go-live-notes.html | 4 +- .../settings/preview-email-branding.html | 4 +- .../settings/set-email-branding.html | 8 ++-- .../organization/users/index.html | 6 +-- app/templates/views/password-reset-sent.html | 4 +- app/templates/views/performance.html | 26 ++++++------ .../views/platform-admin/_global_stats.html | 6 +-- app/templates/views/platform-admin/index.html | 8 ++-- app/templates/views/privacy.html | 4 +- app/templates/views/providers/provider.html | 4 +- .../views/re-validate-email-sent.html | 4 +- app/templates/views/register-from-invite.html | 4 +- .../views/register-from-org-invite.html | 4 +- app/templates/views/register.html | 4 +- app/templates/views/send-test.html | 6 +-- .../views/service-settings/confirm.html | 4 +- .../service-settings/data-retention.html | 10 ++--- .../service-settings/email_reply_to.html | 16 +++---- .../service-settings/estimate-usage.html | 4 +- .../preview-email-branding.html | 4 +- .../service-settings/request-to-go-live.html | 4 +- .../service-settings/send-files-by-email.html | 4 +- .../service-already-live.html | 4 +- .../views/service-settings/set-auth-type.html | 4 +- .../service-settings/set-email-branding.html | 8 ++-- .../views/service-settings/set-email.html | 4 +- .../service-settings/set-inbound-sms.html | 4 +- .../set-international-sms.html | 4 +- .../service-settings/set-service-setting.html | 4 +- .../views/service-settings/sms-senders.html | 4 +- app/templates/views/signedout.html | 42 +++++++++---------- app/templates/views/support/bat-phone.html | 4 +- app/templates/views/support/form.html | 4 +- app/templates/views/support/index.html | 4 +- app/templates/views/support/public.html | 4 +- app/templates/views/support/triage.html | 4 +- app/templates/views/temp-history.html | 6 +-- .../views/templates/_template_history.html | 4 +- .../views/templates/action_blocked.html | 4 +- .../views/templates/breaking-change.html | 4 +- app/templates/views/templates/choose.html | 6 +-- .../views/templates/choose_history.html | 2 +- .../templates/manage-template-folder.html | 4 +- app/templates/views/templates/set-sender.html | 8 ++-- .../views/templates/set-template-sender.html | 8 ++-- .../views/templates/template_history.html | 2 +- app/templates/views/text-not-received.html | 4 +- app/templates/views/two-factor-email.html | 4 +- app/templates/views/two-factor-sms.html | 4 +- app/templates/views/two-factor-webauthn.html | 6 +-- app/templates/views/usage.html | 18 ++++---- .../views/user-profile/authenticate.html | 4 +- .../views/user-profile/change-password.html | 4 +- app/templates/views/user-profile/change.html | 4 +- app/templates/views/user-profile/confirm.html | 4 +- .../disable-platform-admin-view.html | 4 +- .../user-profile/manage-security-key.html | 4 +- .../views/user-profile/security-keys.html | 8 ++-- app/templates/views/using-notify.html | 6 +-- .../views/verification-not-received.html | 4 +- paas-failwhale/index.html | 6 +-- .../views/accounts/test_choose_accounts.py | 2 +- .../views/organizations/test_organizations.py | 4 +- tests/app/main/views/test_dashboard.py | 6 +-- tests/app/main/views/test_index.py | 2 +- tests/app/main/views/test_jobs.py | 2 +- tests/app/main/views/test_platform_admin.py | 6 +-- tests/app/main/views/test_tour.py | 6 +-- 107 files changed, 314 insertions(+), 314 deletions(-) diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html index 84498d041..d98023e0c 100644 --- a/app/assets/error_pages/5xx.html +++ b/app/assets/error_pages/5xx.html @@ -66,9 +66,9 @@
-
-
-
+
+
+

Sorry, there is a problem with the service

diff --git a/app/templates/error/401.html b/app/templates/error/401.html index d8d30b399..cf458405d 100644 --- a/app/templates/error/401.html +++ b/app/templates/error/401.html @@ -1,8 +1,8 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %}You’re not authorised to see this page{% endblock %} {% block maincolumn_content %} -
-
+
+

You’re not authorised to see this page

Sign in to Notify.gov and try again.

diff --git a/app/templates/error/403.html b/app/templates/error/403.html index 7c2c86a90..2e7c136f6 100644 --- a/app/templates/error/403.html +++ b/app/templates/error/403.html @@ -1,8 +1,8 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %}You’re not allowed to see this page{% endblock %} {% block maincolumn_content %} -
-
+
+

You’re not allowed to see this page

diff --git a/app/templates/error/404.html b/app/templates/error/404.html index ba607bc02..1b530a7e2 100644 --- a/app/templates/error/404.html +++ b/app/templates/error/404.html @@ -1,8 +1,8 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %}Page not found{% endblock %} {% block maincolumn_content %} -
-
+
+

Page not found

diff --git a/app/templates/error/410.html b/app/templates/error/410.html index ba607bc02..1b530a7e2 100644 --- a/app/templates/error/410.html +++ b/app/templates/error/410.html @@ -1,8 +1,8 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %}Page not found{% endblock %} {% block maincolumn_content %} -
-
+
+

Page not found

diff --git a/app/templates/error/500.html b/app/templates/error/500.html index b8e5f9144..63fa1ea18 100644 --- a/app/templates/error/500.html +++ b/app/templates/error/500.html @@ -1,8 +1,8 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %}Sorry, there’s a problem with the service{% endblock %} {% block maincolumn_content %} -
-
+
+

Sorry, there’s a problem with Notify.gov

diff --git a/app/templates/fullwidth_template.html b/app/templates/fullwidth_template.html index 21aee5299..707f0e1bb 100644 --- a/app/templates/fullwidth_template.html +++ b/app/templates/fullwidth_template.html @@ -1,6 +1,6 @@ {% extends "admin_template.html" %} -{% set mainClasses = "govuk-!-padding-top-0 govuk-!-padding-bottom-0" %} +{% set mainClasses = "" %} {% block main %} {% block beforeContent %}{% endblock %} diff --git a/app/templates/main_template.html b/app/templates/main_template.html index 02c9b3904..a191d7f88 100644 --- a/app/templates/main_template.html +++ b/app/templates/main_template.html @@ -4,7 +4,7 @@ {# specify absolute url for the static assets folder e.g. http://wwww.domain.com/assets #} {%- set assetUrl = assetUrl | default(assetPath) -%} - + {% block pageTitle %}Notify.gov{% endblock %} diff --git a/app/templates/org_template.html b/app/templates/org_template.html index cf195a2e9..b466d6717 100644 --- a/app/templates/org_template.html +++ b/app/templates/org_template.html @@ -15,11 +15,11 @@
Switch service
-
-
+
+
{% include "org_nav.html" %}
-
+
{% block beforeContent %} {% block backLink %}{% endblock %} {% endblock %} diff --git a/app/templates/partials/count.html b/app/templates/partials/count.html index 001130a1b..902d38a1a 100644 --- a/app/templates/partials/count.html +++ b/app/templates/partials/count.html @@ -3,12 +3,12 @@
{% if notifications_deleted %} -
+
{% for label, query_param, url, count in counts %} {% if query_param == 'pending' %} -
{{ big_number(count, query_param, smaller=True) }}
+
{{ big_number(count, query_param, smaller=True) }}
{% else %} -
{{ big_number(count, label, smaller=True) }}
+
{{ big_number(count, label, smaller=True) }}
{% endif %} {% endfor %} diff --git a/app/templates/partials/tour.html b/app/templates/partials/tour.html index 9174559bc..acae011f9 100644 --- a/app/templates/partials/tour.html +++ b/app/templates/partials/tour.html @@ -2,31 +2,31 @@ {% call banner_wrapper(type='tour') %}

Try sending yourself this example

-
-
+
+

1.

-
+

Every message is sent from a template

-
-
+
+

2.

-
+

The template pulls in the data you provide

-
-
+
+

3.

-
+

Notify delivers the message

diff --git a/app/templates/views/add-service-local.html b/app/templates/views/add-service-local.html index 65ecbd100..ffb103bbe 100644 --- a/app/templates/views/add-service-local.html +++ b/app/templates/views/add-service-local.html @@ -9,8 +9,8 @@ {% block maincolumn_content %} -
-
+
+
{{ page_header('About your service') }} diff --git a/app/templates/views/add-service.html b/app/templates/views/add-service.html index eafdb29f1..aba589e37 100644 --- a/app/templates/views/add-service.html +++ b/app/templates/views/add-service.html @@ -9,8 +9,8 @@ {% block maincolumn_content %} -
-
+
+
{{ page_header('About your service') }} diff --git a/app/templates/views/api/callbacks/delivery-status-callback.html b/app/templates/views/api/callbacks/delivery-status-callback.html index b99a80d95..a3e1ad99a 100644 --- a/app/templates/views/api/callbacks/delivery-status-callback.html +++ b/app/templates/views/api/callbacks/delivery-status-callback.html @@ -14,8 +14,8 @@ {% endblock %} {% block maincolumn_content %} -
-
+
+
{{ page_header('Callbacks for delivery receipts') }} diff --git a/app/templates/views/api/callbacks/received-text-messages-callback.html b/app/templates/views/api/callbacks/received-text-messages-callback.html index 405fb52cd..ab189428a 100644 --- a/app/templates/views/api/callbacks/received-text-messages-callback.html +++ b/app/templates/views/api/callbacks/received-text-messages-callback.html @@ -14,8 +14,8 @@ {% block maincolumn_content %} {{ page_header('Callbacks for received text messages') }} -
-
+
+

When you receive a text message in Notify, we can forward it to your system. Check the callback documentation for more information. diff --git a/app/templates/views/api/guest-list.html b/app/templates/views/api/guest-list.html index d3a551a3c..83785d54b 100644 --- a/app/templates/views/api/guest-list.html +++ b/app/templates/views/api/guest-list.html @@ -50,8 +50,8 @@ {% call form_wrapper() %} -

-
+
+
{{ list_entry( form.email_addresses, diff --git a/app/templates/views/api/index.html b/app/templates/views/api/index.html index d05520086..fef6b6cec 100644 --- a/app/templates/views/api/index.html +++ b/app/templates/views/api/index.html @@ -12,25 +12,25 @@ API integration -