From b9b9a138f9a0f6d559bf9ee4763b25b9303f698f Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Wed, 19 Feb 2020 11:57:15 +0000 Subject: [PATCH] Replace `grid-row` with `govuk-grid-row` Replaced all instances of `grid-row` in the HTML and JavaScript with `govuk-grid-row`, which is the new GOV.UK Frontend class. --- app/assets/javascripts/previewPane.js | 2 +- app/assets/stylesheets/components/message.scss | 2 +- app/assets/stylesheets/components/tick-cross.scss | 2 -- app/templates/content_template.html | 2 +- app/templates/error/401.html | 2 +- app/templates/error/403.html | 2 +- app/templates/error/404.html | 2 +- app/templates/error/410.html | 2 +- app/templates/error/413.html | 4 ++-- app/templates/error/500.html | 2 +- app/templates/org_template.html | 2 +- app/templates/partials/count.html | 2 +- app/templates/partials/jobs/count-letters.html | 2 +- app/templates/partials/tour.html | 6 +++--- app/templates/views/add-service.html | 2 +- .../views/agreement/agreement-accept.html | 2 +- .../views/agreement/agreement-confirm.html | 2 +- .../views/agreement/agreement-public.html | 2 +- .../views/agreement/service-agreement-choose.html | 2 +- .../views/agreement/service-agreement-signed.html | 2 +- .../views/agreement/service-agreement.html | 2 +- .../api/callbacks/delivery-status-callback.html | 2 +- .../callbacks/received-text-messages-callback.html | 2 +- app/templates/views/api/index.html | 4 ++-- app/templates/views/api/whitelist.html | 2 +- app/templates/views/cancelled-invitation.html | 2 +- app/templates/views/choose-account.html | 6 +++--- app/templates/views/conversations/messages.html | 2 +- app/templates/views/cookies.html | 4 ++-- app/templates/views/dashboard/_totals.html | 2 +- app/templates/views/dashboard/_usage.html | 2 +- app/templates/views/edit-email-template.html | 2 +- app/templates/views/edit-letter-template.html | 2 +- app/templates/views/edit-sms-template.html | 2 +- app/templates/views/edit-user-permissions.html | 2 +- .../views/email-branding/manage-branding.html | 2 +- app/templates/views/email-link-invalid.html | 2 +- app/templates/views/email-not-received.html | 2 +- .../views/find-services/find-services-by-name.html | 2 +- .../views/find-users/find-users-by-email.html | 2 +- .../views/find-users/user-information.html | 2 +- app/templates/views/forgot-password.html | 2 +- app/templates/views/inbound-sms-admin.html | 2 +- app/templates/views/integration-testing.html | 2 +- .../letter-branding/manage-letter-branding.html | 2 +- app/templates/views/manage-users.html | 4 ++-- .../manage-users/confirm-edit-user-email.html | 2 +- .../confirm-edit-user-mobile-number.html | 2 +- .../views/manage-users/edit-user-mobile.html | 2 +- app/templates/views/new-password.html | 2 +- app/templates/views/notifications.html | 2 +- .../views/organisations/add-organisation.html | 2 +- app/templates/views/organisations/index.html | 4 ++-- .../organisation/settings/edit-agreement.html | 2 +- .../organisation/settings/edit-crown-status.html | 2 +- .../organisation/settings/edit-domains.html | 2 +- .../organisation/settings/edit-go-live-notes.html | 2 +- .../organisation/settings/edit-name/confirm.html | 2 +- .../settings/preview-email-branding.html | 2 +- .../settings/preview-letter-branding.html | 2 +- .../organisation/settings/set-email-branding.html | 4 ++-- .../organisation/settings/set-letter-branding.html | 4 ++-- app/templates/views/password-reset-sent.html | 2 +- .../views/platform-admin/_base_template.html | 2 +- .../views/platform-admin/_global_stats.html | 2 +- app/templates/views/platform-admin/index.html | 4 ++-- .../views/platform-admin/returned-letters.html | 2 +- app/templates/views/privacy.html | 14 +++++++------- app/templates/views/providers/edit-provider.html | 2 +- .../views/providers/edit-sms-provider-ratio.html | 4 ++-- app/templates/views/providers/provider.html | 2 +- app/templates/views/re-validate-email-sent.html | 2 +- app/templates/views/register-from-invite.html | 2 +- app/templates/views/register-from-org-invite.html | 2 +- app/templates/views/register.html | 2 +- app/templates/views/send-test.html | 2 +- app/templates/views/service-settings/confirm.html | 2 +- .../views/service-settings/data-retention.html | 4 ++-- app/templates/views/service-settings/delete.html | 2 +- .../views/service-settings/email_reply_to.html | 2 +- .../views/service-settings/estimate-usage.html | 2 +- .../service-settings/letter-contact-details.html | 2 +- .../views/service-settings/letter-contact/add.html | 2 +- .../service-settings/preview-email-branding.html | 2 +- .../service-settings/preview-letter-branding.html | 2 +- .../views/service-settings/request-to-go-live.html | 2 +- .../service-settings/send-files-by-email.html | 2 +- .../views/service-settings/set-auth-type.html | 2 +- .../views/service-settings/set-email-branding.html | 4 ++-- .../views/service-settings/set-email.html | 2 +- .../views/service-settings/set-inbound-sms.html | 2 +- .../service-settings/set-international-sms.html | 2 +- .../service-settings/set-letter-branding.html | 4 ++-- .../service-settings/set-letter-contact-block.html | 2 +- .../views/service-settings/set-letter.html | 2 +- .../service-settings/set-service-setting.html | 2 +- app/templates/views/service-settings/set-sms.html | 2 +- .../views/service-settings/sms-senders.html | 2 +- app/templates/views/signedout.html | 14 +++++++------- app/templates/views/signin.html | 2 +- app/templates/views/styleguide.html | 6 +++--- .../views/support/ask-question-give-feedback.html | 2 +- app/templates/views/support/bat-phone.html | 2 +- app/templates/views/support/index.html | 6 +++--- app/templates/views/support/report-problem.html | 2 +- app/templates/views/support/triage.html | 2 +- app/templates/views/temp-history.html | 2 +- app/templates/views/templates/_template.html | 2 +- app/templates/views/templates/action_blocked.html | 2 +- app/templates/views/templates/breaking-change.html | 2 +- app/templates/views/templates/choose.html | 2 +- app/templates/views/templates/choose_history.html | 2 +- .../views/templates/edit-template-postage.html | 2 +- .../views/templates/manage-template-folder.html | 2 +- app/templates/views/templates/set-sender.html | 2 +- .../views/templates/set-template-sender.html | 2 +- app/templates/views/templates/template.html | 4 ++-- .../views/templates/template_history.html | 2 +- app/templates/views/text-not-received.html | 2 +- app/templates/views/two-factor-email.html | 2 +- app/templates/views/two-factor.html | 2 +- app/templates/views/uploads/choose-file.html | 2 +- app/templates/views/usage.html | 6 +++--- app/templates/views/user-profile/authenticate.html | 2 +- .../views/user-profile/change-password.html | 2 +- app/templates/views/user-profile/change.html | 2 +- app/templates/views/user-profile/confirm.html | 2 +- .../user-profile/disable-platform-admin-view.html | 2 +- app/templates/views/using-notify.html | 2 +- app/templates/views/verification-not-received.html | 2 +- app/templates/withnav_template.html | 2 +- tests/app/main/views/test_index.py | 4 ++-- tests/javascripts/liveSearch.test.js | 4 ++-- tests/javascripts/previewPane.test.js | 4 ++-- .../stick-to-window-when-scrolling.test.js | 6 +++--- 135 files changed, 174 insertions(+), 176 deletions(-) diff --git a/app/assets/javascripts/previewPane.js b/app/assets/javascripts/previewPane.js index 514b02274..6f376dd51 100644 --- a/app/assets/javascripts/previewPane.js +++ b/app/assets/javascripts/previewPane.js @@ -28,7 +28,7 @@ } $paneWrapper.append($previewPane); - $form.find('.grid-row').eq(0).prepend($paneWrapper); + $form.find('.govuk-grid-row').eq(0).prepend($paneWrapper); $form.attr('action', location.pathname.replace(new RegExp(`set-${previewType}-branding$`), `preview-${previewType}-branding`)); $form.find('button[type="submit"]').text('Save'); diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss index 4b6b889be..7844997f1 100644 --- a/app/assets/stylesheets/components/message.scss +++ b/app/assets/stylesheets/components/message.scss @@ -172,7 +172,7 @@ .folder-heading { - .grid-row & { + .govuk-grid-row & { margin: $gutter-half 0 20px 0; word-wrap: break-word; } diff --git a/app/assets/stylesheets/components/tick-cross.scss b/app/assets/stylesheets/components/tick-cross.scss index 53bf6588c..b0a5938bc 100644 --- a/app/assets/stylesheets/components/tick-cross.scss +++ b/app/assets/stylesheets/components/tick-cross.scss @@ -23,12 +23,10 @@ &-list { - @extend %grid-row; position: relative; &-permissions { - @include grid-column(3/4); margin-top: 5px; li { diff --git a/app/templates/content_template.html b/app/templates/content_template.html index 95c0f63f1..7cebc5d6e 100644 --- a/app/templates/content_template.html +++ b/app/templates/content_template.html @@ -8,7 +8,7 @@ {% block maincolumn_content %} -
+
{% if navigation_links %}
diff --git a/app/templates/error/401.html b/app/templates/error/401.html index be999a765..2e6645dd0 100644 --- a/app/templates/error/401.html +++ b/app/templates/error/401.html @@ -1,7 +1,7 @@ {% 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 GOV.UK Notify and try again.

diff --git a/app/templates/error/403.html b/app/templates/error/403.html index 13b4602b8..a4b3ae2da 100644 --- a/app/templates/error/403.html +++ b/app/templates/error/403.html @@ -1,7 +1,7 @@ {% 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 170b4acc0..e7b8f734e 100644 --- a/app/templates/error/404.html +++ b/app/templates/error/404.html @@ -1,7 +1,7 @@ {% 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 170b4acc0..e7b8f734e 100644 --- a/app/templates/error/410.html +++ b/app/templates/error/410.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %}Page not found{% endblock %} {% block maincolumn_content %} -
+

Page not found diff --git a/app/templates/error/413.html b/app/templates/error/413.html index 28304e083..43fa42259 100644 --- a/app/templates/error/413.html +++ b/app/templates/error/413.html @@ -1,12 +1,12 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %}File too big{% endblock %} {% block maincolumn_content %} -
+

The file you uploaded was too big

-
+

Files must be smaller than 5 MB. diff --git a/app/templates/error/500.html b/app/templates/error/500.html index 0d352163b..4e7250bd1 100644 --- a/app/templates/error/500.html +++ b/app/templates/error/500.html @@ -1,7 +1,7 @@ {% 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 GOV.UK Notify diff --git a/app/templates/org_template.html b/app/templates/org_template.html index be9994c86..979c82c0e 100644 --- a/app/templates/org_template.html +++ b/app/templates/org_template.html @@ -15,7 +15,7 @@

Switch service
-
+
{% include "org_nav.html" %}
diff --git a/app/templates/partials/count.html b/app/templates/partials/count.html index c66b6bff2..63b59d16f 100644 --- a/app/templates/partials/count.html +++ b/app/templates/partials/count.html @@ -3,7 +3,7 @@
{% if notifications_deleted %} -
+
{% for label, query_param, url, count in counts %}
{{ big_number(count, label, smaller=True) }} diff --git a/app/templates/partials/jobs/count-letters.html b/app/templates/partials/jobs/count-letters.html index 6d844ad4e..3bfb13cd0 100644 --- a/app/templates/partials/jobs/count-letters.html +++ b/app/templates/partials/jobs/count-letters.html @@ -1,7 +1,7 @@ {% from 'components/big-number.html' import big_number %} {% from 'components/message-count-label.html' import message_count_label %} -
+
{{ big_number( diff --git a/app/templates/partials/tour.html b/app/templates/partials/tour.html index c117862fa..737d1605a 100644 --- a/app/templates/partials/tour.html +++ b/app/templates/partials/tour.html @@ -2,7 +2,7 @@ {% call banner_wrapper(type='tour') %}

Try sending yourself this example

-
+

1.

@@ -12,7 +12,7 @@

-
+

2.

@@ -22,7 +22,7 @@

-
+

3.

diff --git a/app/templates/views/add-service.html b/app/templates/views/add-service.html index adf2191cc..2a07f065a 100644 --- a/app/templates/views/add-service.html +++ b/app/templates/views/add-service.html @@ -11,7 +11,7 @@ {% block maincolumn_content %} -
+
{{ page_header('About your service') }} diff --git a/app/templates/views/agreement/agreement-accept.html b/app/templates/views/agreement/agreement-accept.html index 42e80bddc..2e0aa2b1d 100644 --- a/app/templates/views/agreement/agreement-accept.html +++ b/app/templates/views/agreement/agreement-accept.html @@ -12,7 +12,7 @@ {% block maincolumn_content %} -
+
{{ page_header( diff --git a/app/templates/views/agreement/agreement-confirm.html b/app/templates/views/agreement/agreement-confirm.html index 9f16c9581..caf6ecf08 100644 --- a/app/templates/views/agreement/agreement-confirm.html +++ b/app/templates/views/agreement/agreement-confirm.html @@ -9,7 +9,7 @@ {% block maincolumn_content %} -
+
{{ page_header( diff --git a/app/templates/views/agreement/agreement-public.html b/app/templates/views/agreement/agreement-public.html index 6da38cea5..c14e8c601 100644 --- a/app/templates/views/agreement/agreement-public.html +++ b/app/templates/views/agreement/agreement-public.html @@ -7,7 +7,7 @@ {% block maincolumn_content %} -
+

diff --git a/app/templates/views/agreement/service-agreement-choose.html b/app/templates/views/agreement/service-agreement-choose.html index 1922f13af..1199a1469 100644 --- a/app/templates/views/agreement/service-agreement-choose.html +++ b/app/templates/views/agreement/service-agreement-choose.html @@ -7,7 +7,7 @@ {% block maincolumn_content %} -
+
{{ page_header( diff --git a/app/templates/views/agreement/service-agreement-signed.html b/app/templates/views/agreement/service-agreement-signed.html index 9669ac714..160690b9b 100644 --- a/app/templates/views/agreement/service-agreement-signed.html +++ b/app/templates/views/agreement/service-agreement-signed.html @@ -7,7 +7,7 @@ {% block maincolumn_content %} -
+
{{ page_header( diff --git a/app/templates/views/agreement/service-agreement.html b/app/templates/views/agreement/service-agreement.html index 8dd4dad78..ab97a5092 100644 --- a/app/templates/views/agreement/service-agreement.html +++ b/app/templates/views/agreement/service-agreement.html @@ -8,7 +8,7 @@ {% block maincolumn_content %} -
+
{{ page_header( diff --git a/app/templates/views/api/callbacks/delivery-status-callback.html b/app/templates/views/api/callbacks/delivery-status-callback.html index 575c8df1f..e14a54b6c 100644 --- a/app/templates/views/api/callbacks/delivery-status-callback.html +++ b/app/templates/views/api/callbacks/delivery-status-callback.html @@ -9,7 +9,7 @@ {% endblock %} {% block maincolumn_content %} -
+
{{ page_header( 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 0c62a0b73..5adcbae1e 100644 --- a/app/templates/views/api/callbacks/received-text-messages-callback.html +++ b/app/templates/views/api/callbacks/received-text-messages-callback.html @@ -13,7 +13,7 @@ 'Callbacks for received text messages', back_link=url_for('.api_callbacks', service_id=current_service.id) ) }} -
+

When you receive a text message in Notify, we can forward it to your system. diff --git a/app/templates/views/api/index.html b/app/templates/views/api/index.html index f9f1d3250..59c094eca 100644 --- a/app/templates/views/api/index.html +++ b/app/templates/views/api/index.html @@ -14,7 +14,7 @@ API integration

-
-
+

Message log diff --git a/app/templates/views/api/whitelist.html b/app/templates/views/api/whitelist.html index ad2750650..b443299b6 100644 --- a/app/templates/views/api/whitelist.html +++ b/app/templates/views/api/whitelist.html @@ -47,7 +47,7 @@ {% call form_wrapper() %} -
+
{{ list_entry( diff --git a/app/templates/views/cancelled-invitation.html b/app/templates/views/cancelled-invitation.html index d817ecaa9..fc868bff2 100644 --- a/app/templates/views/cancelled-invitation.html +++ b/app/templates/views/cancelled-invitation.html @@ -1,7 +1,7 @@ {% extends "withoutnav_template.html" %} {% block per_page_title %}Invitation has been cancelled{% endblock %} {% block maincolumn_content %} -
+

The invitation you were sent has been cancelled diff --git a/app/templates/views/choose-account.html b/app/templates/views/choose-account.html index 144696473..af740e582 100644 --- a/app/templates/views/choose-account.html +++ b/app/templates/views/choose-account.html @@ -8,7 +8,7 @@ services=[] ) %} {% if show_heading %} -
+

{{ heading }} @@ -56,7 +56,7 @@ -
+

Send emails, text messages and letters to your users @@ -47,7 +47,7 @@

-
+

Control your content @@ -63,7 +63,7 @@

-
+

See how your messages perform @@ -85,7 +85,7 @@

Send messages manually or automatically

-
+

Upload a spreadsheet of email addresses or @@ -121,7 +121,7 @@

Who’s using GOV.UK Notify

-
+

Services

{{ counts.services|format_thousands }}
@@ -142,7 +142,7 @@

Pricing

-
+

Emails

Unlimited
@@ -170,7 +170,7 @@
-
+

The team diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html index e23f71cd2..16e81d2b7 100644 --- a/app/templates/views/signin.html +++ b/app/templates/views/signin.html @@ -9,7 +9,7 @@ {% block maincolumn_content %} -
+
{% if again %} diff --git a/app/templates/views/styleguide.html b/app/templates/views/styleguide.html index 34cbe4ea6..5ad9cad21 100644 --- a/app/templates/views/styleguide.html +++ b/app/templates/views/styleguide.html @@ -24,7 +24,7 @@

Banner

-
+

Used to show the status of a thing or action.

@@ -42,7 +42,7 @@

Used to show some important statistics.

-
+
{{ big_number("567") }}
@@ -109,7 +109,7 @@ ) }}

Tables

-
+

Used for comparing rows of data. diff --git a/app/templates/views/support/ask-question-give-feedback.html b/app/templates/views/support/ask-question-give-feedback.html index 8aa8f92dc..33de7dcaf 100644 --- a/app/templates/views/support/ask-question-give-feedback.html +++ b/app/templates/views/support/ask-question-give-feedback.html @@ -14,7 +14,7 @@ 'Ask a question or give feedback', back_link=url_for('.support') ) }} -

+
{% call form_wrapper() %} {{ textbox(form.feedback, width='1-1', hint='', rows=10, autosize=True) }} diff --git a/app/templates/views/support/bat-phone.html b/app/templates/views/support/bat-phone.html index 82b7b6972..40b1e021e 100644 --- a/app/templates/views/support/bat-phone.html +++ b/app/templates/views/support/bat-phone.html @@ -11,7 +11,7 @@

Out of hours emergencies

-
+

First, check the diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html index 77ba37be2..c412eee9e 100644 --- a/app/templates/views/support/index.html +++ b/app/templates/views/support/index.html @@ -9,7 +9,7 @@ {% block maincolumn_content %} -

+

Support

@@ -21,11 +21,11 @@ {% endcall %}

You can also contact us on Slack.

- +

Office hours

Our office hours are 9:30am to 5:30pm, Monday to Friday.

When you report a problem in office hours, we’ll aim to read it within 30 minutes and reply within one working day.

- +

Out-of-hours

Outside office hours, response times depend on whether you’re reporting an emergency.

If it’s an emergency, we’ll reply within 30 minutes and update you every hour until the problem’s fixed.

diff --git a/app/templates/views/support/report-problem.html b/app/templates/views/support/report-problem.html index 99c250640..3b21ae56b 100644 --- a/app/templates/views/support/report-problem.html +++ b/app/templates/views/support/report-problem.html @@ -15,7 +15,7 @@ 'Report a problem', back_link=url_for('.support') ) }} -
+

diff --git a/app/templates/views/support/triage.html b/app/templates/views/support/triage.html index 9ca1fef04..b60501379 100644 --- a/app/templates/views/support/triage.html +++ b/app/templates/views/support/triage.html @@ -10,7 +10,7 @@ {% block maincolumn_content %} -

+
{{ page_header( 'Report a problem', diff --git a/app/templates/views/temp-history.html b/app/templates/views/temp-history.html index 0c1d79f76..011366863 100644 --- a/app/templates/views/temp-history.html +++ b/app/templates/views/temp-history.html @@ -32,7 +32,7 @@
    {% for event in events %}
  • -
    +
    {{ user_getter(event.user_id) }} diff --git a/app/templates/views/templates/_template.html b/app/templates/views/templates/_template.html index a6550a7a7..899967ee4 100644 --- a/app/templates/views/templates/_template.html +++ b/app/templates/views/templates/_template.html @@ -14,7 +14,7 @@

    {% else %}
    -
    +
    {% if template.template_type == 'letter' %} {% if letter_too_long %} {% call banner_wrapper(type='dangerous') %} diff --git a/app/templates/views/templates/action_blocked.html b/app/templates/views/templates/action_blocked.html index c7b4b09c3..e5564ec6f 100644 --- a/app/templates/views/templates/action_blocked.html +++ b/app/templates/views/templates/action_blocked.html @@ -10,7 +10,7 @@ {% block maincolumn_content %} -
    +
    {{ page_header( '{} are disabled'.format(notification_type.capitalize()), diff --git a/app/templates/views/templates/breaking-change.html b/app/templates/views/templates/breaking-change.html index 4727b98dd..f771961d1 100644 --- a/app/templates/views/templates/breaking-change.html +++ b/app/templates/views/templates/breaking-change.html @@ -15,7 +15,7 @@ 'Confirm changes', back_link=url_for(".edit_service_template", service_id=current_service.id, template_id=new_template.id) ) }} -
    +
    {% if template_change.placeholders_removed %}

    diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index e0143ac72..acba5422e 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -43,7 +43,7 @@ {% else %} -

    +
    {{ folder_path( folders=template_folder_path, diff --git a/app/templates/views/templates/choose_history.html b/app/templates/views/templates/choose_history.html index 327932172..7ef3e5b26 100644 --- a/app/templates/views/templates/choose_history.html +++ b/app/templates/views/templates/choose_history.html @@ -6,7 +6,7 @@ {% block maincolumn_content %}

    Previous versions

    -
    +
    {% for template in versions %} {% with show_title=True %} {% include 'views/templates/_template_history.html' %} diff --git a/app/templates/views/templates/edit-template-postage.html b/app/templates/views/templates/edit-template-postage.html index d2555bae4..aa6ac0447 100644 --- a/app/templates/views/templates/edit-template-postage.html +++ b/app/templates/views/templates/edit-template-postage.html @@ -15,7 +15,7 @@ back_link=url_for('.view_template', service_id=service_id, template_id=template_id) ) }} {% call form_wrapper() %} -
    +
    {{ radios(form.postage) }} {{ page_footer('Save') }} diff --git a/app/templates/views/templates/manage-template-folder.html b/app/templates/views/templates/manage-template-folder.html index a6aefa20a..038ecbc4a 100644 --- a/app/templates/views/templates/manage-template-folder.html +++ b/app/templates/views/templates/manage-template-folder.html @@ -11,7 +11,7 @@ {% block maincolumn_content %} -
    +
    {{ folder_path( folders=template_folder_path, diff --git a/app/templates/views/templates/set-sender.html b/app/templates/views/templates/set-sender.html index a570c0c38..76b5ed41d 100644 --- a/app/templates/views/templates/set-sender.html +++ b/app/templates/views/templates/set-sender.html @@ -15,7 +15,7 @@ back_link=url_for('.view_template', service_id=current_service.id, template_id=template_id) ) }} -
    +
    {% call form_wrapper() %} {{ radios( diff --git a/app/templates/views/templates/set-template-sender.html b/app/templates/views/templates/set-template-sender.html index 5f8d449bf..01242663b 100644 --- a/app/templates/views/templates/set-template-sender.html +++ b/app/templates/views/templates/set-template-sender.html @@ -14,7 +14,7 @@ 'Set letter contact block', back_link=url_for('.view_template', service_id=current_service.id, template_id=template_id) ) }} -
    +
    {% call form_wrapper() %} {{ radios( diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html index f9e00c136..f14a606d4 100644 --- a/app/templates/views/templates/template.html +++ b/app/templates/views/templates/template.html @@ -30,7 +30,7 @@ {% endcall %}
    {% else %} -
    +
    {{ folder_path( folders=current_service.get_template_path(template._template), @@ -42,7 +42,7 @@
    {% endif %} -
    +
    {% include 'views/templates/_template.html' %}
    diff --git a/app/templates/views/templates/template_history.html b/app/templates/views/templates/template_history.html index fb3236b4d..fff8c9b2f 100644 --- a/app/templates/views/templates/template_history.html +++ b/app/templates/views/templates/template_history.html @@ -11,7 +11,7 @@

    {{ template.name }}

    -
    +
    {% with show_title=False %} {% include 'views/templates/_template_history.html' %} {% endwith %} diff --git a/app/templates/views/text-not-received.html b/app/templates/views/text-not-received.html index 56a4a2aa4..6e934ae10 100644 --- a/app/templates/views/text-not-received.html +++ b/app/templates/views/text-not-received.html @@ -9,7 +9,7 @@ Check your mobile number {% block maincolumn_content %} -
    +

    Check your mobile number

    diff --git a/app/templates/views/two-factor-email.html b/app/templates/views/two-factor-email.html index 105f66351..06751c70a 100644 --- a/app/templates/views/two-factor-email.html +++ b/app/templates/views/two-factor-email.html @@ -7,7 +7,7 @@ {% block maincolumn_content %} -
    +

    {{ title }}

    We’ve emailed you a link to sign in to Notify.

    diff --git a/app/templates/views/two-factor.html b/app/templates/views/two-factor.html index 1a5faaadc..ce7c2b65d 100644 --- a/app/templates/views/two-factor.html +++ b/app/templates/views/two-factor.html @@ -10,7 +10,7 @@ {% block maincolumn_content %} -
    +

    Check your phone

    diff --git a/app/templates/views/uploads/choose-file.html b/app/templates/views/uploads/choose-file.html index 69626e55c..306309497 100644 --- a/app/templates/views/uploads/choose-file.html +++ b/app/templates/views/uploads/choose-file.html @@ -8,7 +8,7 @@ {% endblock %} {% block maincolumn_content %} -
    +
    {% if error %} {% call banner_wrapper(type='dangerous') %} diff --git a/app/templates/views/usage.html b/app/templates/views/usage.html index a91a4814f..ed0b4aeee 100644 --- a/app/templates/views/usage.html +++ b/app/templates/views/usage.html @@ -17,7 +17,7 @@ {{ pill(years, selected_year, big_number_args={'smallest': True}) }}
    -
    +

    Emails

    @@ -48,7 +48,7 @@
    -
    +
      @@ -123,7 +123,7 @@ {% endif %}
    -
    +

    Financial year ends 31 March diff --git a/app/templates/views/user-profile/authenticate.html b/app/templates/views/user-profile/authenticate.html index a4cdfb759..2b964907c 100644 --- a/app/templates/views/user-profile/authenticate.html +++ b/app/templates/views/user-profile/authenticate.html @@ -15,7 +15,7 @@ back_link=back_link ) }} -

    +
    {% call form_wrapper(autocomplete=True) %} diff --git a/app/templates/views/user-profile/change-password.html b/app/templates/views/user-profile/change-password.html index 68e50d911..9f7d983d1 100644 --- a/app/templates/views/user-profile/change-password.html +++ b/app/templates/views/user-profile/change-password.html @@ -15,7 +15,7 @@ back_link=url_for('.user_profile') ) }} -
    +
    {% call form_wrapper(autocomplete=True) %} {{ textbox(form.old_password) }} diff --git a/app/templates/views/user-profile/change.html b/app/templates/views/user-profile/change.html index 23ac0af83..768d2e0fa 100644 --- a/app/templates/views/user-profile/change.html +++ b/app/templates/views/user-profile/change.html @@ -15,7 +15,7 @@ back_link=url_for('.user_profile') ) }} -
    +
    {% call form_wrapper() %} {{ textbox(form_field, safe_error_message=True) }} diff --git a/app/templates/views/user-profile/confirm.html b/app/templates/views/user-profile/confirm.html index a0adea2f6..a84a1305e 100644 --- a/app/templates/views/user-profile/confirm.html +++ b/app/templates/views/user-profile/confirm.html @@ -15,7 +15,7 @@ back_link=url_for('.user_profile') ) }} -
    +

    We’ve sent a security code to your new {{ thing }}. diff --git a/app/templates/views/user-profile/disable-platform-admin-view.html b/app/templates/views/user-profile/disable-platform-admin-view.html index 334de0b13..197f07087 100644 --- a/app/templates/views/user-profile/disable-platform-admin-view.html +++ b/app/templates/views/user-profile/disable-platform-admin-view.html @@ -10,7 +10,7 @@ {% block maincolumn_content %} -

    +
    {{ page_header( 'Use platform admin view', diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html index 41127b2b6..b919e31f2 100644 --- a/app/templates/views/using-notify.html +++ b/app/templates/views/using-notify.html @@ -7,7 +7,7 @@ {% block maincolumn_content %} -
    +
    {{ sub_navigation(navigation_links) }}
    diff --git a/app/templates/views/verification-not-received.html b/app/templates/views/verification-not-received.html index a24eca45f..45f4661f7 100644 --- a/app/templates/views/verification-not-received.html +++ b/app/templates/views/verification-not-received.html @@ -7,7 +7,7 @@ {% block maincolumn_content %} -
    +

    Resend security code

    diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html index 424f85836..27bb6ff5d 100644 --- a/app/templates/withnav_template.html +++ b/app/templates/withnav_template.html @@ -20,7 +20,7 @@
    Switch service
    -
    +
    {% if help %}
    {% else %} diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py index bd4cea5a4..246cdfdd3 100644 --- a/tests/app/main/views/test_index.py +++ b/tests/app/main/views/test_index.py @@ -181,12 +181,12 @@ def test_old_integration_testing_page( 'main.integration_testing', _expected_status=410, ) - assert normalize_spaces(page.select_one('.grid-row').text) == ( + assert normalize_spaces(page.select_one('.govuk-grid-row').text) == ( 'Integration testing ' 'This information has moved. ' 'Refer to the documentation for the client library you are using.' ) - assert page.select_one('.grid-row a')['href'] == url_for( + assert page.select_one('.govuk-grid-row a')['href'] == url_for( 'main.documentation' ) diff --git a/tests/javascripts/liveSearch.test.js b/tests/javascripts/liveSearch.test.js index c2e47ff40..94fc99c94 100644 --- a/tests/javascripts/liveSearch.test.js +++ b/tests/javascripts/liveSearch.test.js @@ -476,8 +476,8 @@ describe('Live search', () => { ${user.label} (${user.email}) (invited)

-
    -
    +
      +
      ${getPermissionsHTML(user.permissions)}
      Can see 15 folders diff --git a/tests/javascripts/previewPane.test.js b/tests/javascripts/previewPane.test.js index c4ed22425..f2c8ea590 100644 --- a/tests/javascripts/previewPane.test.js +++ b/tests/javascripts/previewPane.test.js @@ -61,8 +61,8 @@ describe('Preview pane', () => { // set up DOM document.body.innerHTML = `
      -
      -
      +
      +
      diff --git a/tests/javascripts/stick-to-window-when-scrolling.test.js b/tests/javascripts/stick-to-window-when-scrolling.test.js index 130b9467c..22bce991a 100644 --- a/tests/javascripts/stick-to-window-when-scrolling.test.js +++ b/tests/javascripts/stick-to-window-when-scrolling.test.js @@ -77,10 +77,10 @@ describe("Stick to top/bottom of window when scrolling", () => { beforeEach(() => { document.body.innerHTML = ` -
      +
      -
      +
      `; - inputForm = document.querySelector('form > .grid-row'); + inputForm = document.querySelector('form > .govuk-grid-row'); formFooter = document.querySelector('.page-footer'); footer = document.querySelector('.js-footer');