Revert "Replace govuk template with govuk frontend components"

app/templates/views/check/column-errors.html

@@ -8,7 +8,7 @@
 
 {% set file_contents_header_id = 'file-preview' %}
 {% macro skip_to_file_contents() %}
-  <p class="govuk-visually-hidden">
+  <p class="visually-hidden">
     <a href="#{{ file_contents_header_id }}">Skip to file contents</a>
   </p>
 {% endmacro %}
@@ -165,7 +165,7 @@
         caption=original_file_name,
         caption_visible=False,
         field_headings=[
-          '<span class="govuk-visually-hidden">Row in file</span><span aria-hidden="true">1</span>'|safe
+          '<span class="visually-hidden">Row in file</span><span aria-hidden="true">1</span>'|safe
         ] + column_headers
       ) %}
         {% call index_field() %}

app/templates/views/check/ok.html

@@ -9,7 +9,7 @@
 
 {% set file_contents_header_id = 'file-preview' %}
 {% macro skip_to_file_contents() %}
-  <p class="govuk-visually-hidden">
+  <p class="visually-hidden">
     <a href="#{{ file_contents_header_id }}">Skip to file contents</a>
   </p>
 {% endmacro %}
@@ -62,7 +62,7 @@
         caption=original_file_name,
         caption_visible=False,
         field_headings=[
-          '<span class="govuk-visually-hidden">Row in file</span><span aria-hidden="true">1</span>'|safe
+          '<span class="visually-hidden">Row in file</span><span aria-hidden="true">1</span>'|safe
         ] + recipients.column_headers
       ) %}
         {% call index_field() %}

app/templates/views/check/row-errors.html

@@ -8,7 +8,7 @@
 
 {% set file_contents_header_id = 'file-preview' %}
 {% macro skip_to_file_contents() %}
-  <p class="govuk-visually-hidden">
+  <p class="visually-hidden">
     <a href="#{{ file_contents_header_id }}">Skip to file contents</a>
   </p>
 {% endmacro %}
@@ -64,7 +64,7 @@
       caption=original_file_name,
       caption_visible=False,
       field_headings=[
-        '<span class="govuk-visually-hidden">Row in file</span><span aria-hidden="true" class="table-field-invisible-error">1</span>'|safe
+        '<span class="visually-hidden">Row in file</span><span aria-hidden="true" class="table-field-invisible-error">1</span>'|safe
       ] + recipients.column_headers
     ) %}
       {% call index_field() %}

app/templates/views/choose-account.html

@@ -53,7 +53,7 @@
 
 {% block maincolumn_content %}
 
-  <h1 class="heading-large {% if current_user.has_access_to_live_and_trial_mode_services %}govuk-visually-hidden{% endif %}">
+  <h1 class="heading-large {% if current_user.has_access_to_live_and_trial_mode_services %}visually-hidden{% endif %}">
     Choose service
   </h1>
 

app/templates/views/dashboard/dashboard.html

@@ -14,7 +14,7 @@
 
   <div class="dashboard">
 
-    <h1 class="govuk-visually-hidden">Dashboard</h1>
+    <h1 class="visuallyhidden">Dashboard</h1>
     {% if current_user.has_permissions('manage_templates') and not current_service.all_templates %}
       {% include 'views/dashboard/write-first-messages.html' %}
     {% endif %}

app/templates/views/organisations/add-organisation.html

@@ -9,32 +9,29 @@
   New organisation
 {% endblock %}
 
-{% block main %}
-  <div class="govuk-width-container">
+{% block fullwidth_content %}
+  <div id="content">
     <div class="navigation-service">
       <a href="{{ url_for('.organisations') }}" class="navigation-service-back-to">All organisations</a>
       <a href="{{ url_for('main.choose_account') }}" class="navigation-service-switch">Switch service</a>
     </div>
 
-    <div class="grid-row">
-      <div class="column-one-quarter">
-        &nbsp;
+    <main role="main">
+      <div class="grid-row">
+        <div class="column-one-quarter">
+          &nbsp;
+        </div>
+        <div class="column-three-quarters">
+          {{ page_header('New organisation') }}
+          {% call form_wrapper() %}
+            {{textbox(form.name)}}
+            {{radios(form.organisation_type)}}
+            {{radios(form.crown_status)}}
+            {{ page_footer('Save') }}
+          {% endcall %}
+        </div>
       </div>
-      <div class="column-three-quarters">
-        <main class="govuk-main-wrapper column-main govuk-!-padding-top-0 govuk-!-padding-bottom-0" id="main-content" role="main" >
-          {% block beforeContent %}{% endblock %}
-          {% block content %}
-            {{ page_header('New organisation') }}
-            {% call form_wrapper() %}
-              {{textbox(form.name)}}
-              {{radios(form.organisation_type)}}
-              {{radios(form.crown_status)}}
-              {{ page_footer('Save') }}
-            {% endcall %}
-          {% endblock %}
-        </main>
-      </div>
-    </div>
+    </main>
   </div>
 
 {% endblock %}

app/templates/views/organisations/index.html

@@ -7,10 +7,9 @@
   All organisations
 {% endblock %}
 
-{% block beforeContent %}{% endblock %}
-
-{% block maincolumn_content %}
+{% block fullwidth_content %}
 
+  <div id="content">
     <div class="navigation-service">
       <div class="navigation-service-name">
         &nbsp;
@@ -18,45 +17,47 @@
       <a href="{{ url_for('main.choose_account') }}" class="navigation-service-switch">Switch service</a>
     </div>
 
-    <div class="grid-row top-gutter-2-3">
-      <div class="column-one-quarter">
-        <h1>
-          All organisations
-        </h1>
-      </div>
-      <div class="column-three-quarters">
-
-        {{ live_search(target_selector='.browse-list-item', show=True, form=search_form, label='Search by name') }}
-
-        <nav class="browse-list">
-          <ul>
-            {% for org in organisations %}
-              <li class="browse-list-item">
-                <a href="{{ url_for('main.organisation_dashboard', org_id=org.id) }}" class="browse-list-link">{{ org.name }}</a>
-                <p class="browse-list-hint">
-                  {{ org.count_of_live_services }}
-                  live service{% if org.count_of_live_services != 1 %}s{% endif %}
-                </p>
-                {% if not org.active %}
-                  <span class="table-field-status-default heading-medium">- archived</span>
-                {% endif %}
-              </li>
-            {% endfor %}
-          </ul>
-        </nav>
-
-      </div>
-    </div>
-    <div class="js-stick-at-bottom-when-scrolling">
-      <div class="grid-row">
+    <main role="main">
+      <div class="grid-row top-gutter-2-3">
         <div class="column-one-quarter">
-          &nbsp;
+          <h1>
+            All organisations
+          </h1>
         </div>
         <div class="column-three-quarters">
-          <a href="{{ url_for('main.add_organisation') }}" class="button-secondary">New organisation</a>
+
+          {{ live_search(target_selector='.browse-list-item', show=True, form=search_form, label='Search by name') }}
+
+          <nav class="browse-list">
+            <ul>
+              {% for org in organisations %}
+                <li class="browse-list-item">
+                  <a href="{{ url_for('main.organisation_dashboard', org_id=org.id) }}" class="browse-list-link">{{ org.name }}</a>
+                  <p class="browse-list-hint">
+                    {{ org.count_of_live_services }}
+                    live service{% if org.count_of_live_services != 1 %}s{% endif %}
+                  </p>
+                  {% if not org.active %}
+                    <span class="table-field-status-default heading-medium">- archived</span>
+                  {% endif %}
+                </li>
+              {% endfor %}
+            </ul>
+          </nav>
+
         </div>
       </div>
-    </div>
+      <div class="js-stick-at-bottom-when-scrolling">
+        <div class="grid-row">
+          <div class="column-one-quarter">
+            &nbsp;
+          </div>
+          <div class="column-three-quarters">
+            <a href="{{ url_for('main.add_organisation') }}" class="button-secondary">New organisation</a>
+          </div>
+        </div>
+      </div>
+    </main>
   </div>
 
 {% endblock %}

app/templates/views/register.html

@@ -18,7 +18,7 @@ Create an account
       <div class="extra-tracking">
         {{ textbox(form.mobile_number, width='3-4', hint='We’ll send you a security code by text message') }}
       </div>
-      <input class="govuk-visually-hidden" aria-hidden="true" tabindex="-1" id="defeat-chrome-autocomplete">
+      <input class="visually-hidden" aria-hidden="true" tabindex="-1" id="defeat-chrome-autocomplete">
       {{ textbox(form.password, hint="At least 8 characters", width='3-4', autocomplete='new-password') }}
       {{form.auth_type}}
       {{ page_footer("Continue") }}

app/templates/views/signedout.html

@@ -4,11 +4,11 @@
   <meta name="description" content="GOV.UK Notify lets you send emails, text messages and letters to your users. Try it now if you work in central government, a local authority, or the NHS.">
 {% endblock %}
 
-{% block pageTitle %}
+{% block page_title %}
   GOV.UK Notify
 {% endblock %}
 
-{% block content %}
+{% block maincolumn_content %}
 
   <div class="product-page-intro">
     <div class="product-page-intro-wrapper override-elements-content" id="content">
@@ -119,12 +119,12 @@
       <h2>Who’s using GOV.UK Notify</h2>
       <div class="grid-row bottom-gutter">
         <div class="column-half">
-          <h3 class="govuk-visually-hidden">Services</h3>
+          <h3 class="visually-hidden">Services</h3>
           <div class="product-page-big-number">{{ counts.services|format_thousands }}</div>
           services
         </div>
         <div class="column-half">
-          <h3 class="govuk-visually-hidden">Organisations</h3>
+          <h3 class="visually-hidden">Organisations</h3>
           <div class="product-page-big-number">{{ counts.organisations|format_thousands }}</div>
           organisations
         </div>
@@ -140,18 +140,18 @@
       <h2>Pricing</h2>
       <div class="grid-row bottom-gutter">
         <div class="column-half">
-          <h3 class="govuk-visually-hidden">Emails</h3>
+          <h3 class="visually-hidden">Emails</h3>
           <div class="product-page-big-number">Unlimited</div>
           free emails
         </div>
         <div class="column-half">
-          <h3 class="govuk-visually-hidden">Text messages</h3>
+          <h3 class="visually-hidden">Text messages</h3>
           <div class="product-page-big-number">Up to 250,000</div>
           free text messages a year,<br>
           then 1.58 pence per message
         </div>
         <div class="column-half">
-          <h3 class="govuk-visually-hidden">Letters</h3>
+          <h3 class="visually-hidden">Letters</h3>
           <div class="product-page-big-number">35 pence</div>
           to print and post a one page letter
         </div>

app/templates/views/templates/_move_to.html

@@ -15,7 +15,7 @@
     </div>
     <div id="move_to_new_folder_form">
       <fieldset class="js-will-stick-at-bottom-when-scrolling">
-        <legend class="govuk-visually-hidden">Add to new folder</legend>
+        <legend class="visuallyhidden">Add to new folder</legend>
         {{ textbox(templates_and_folders_form.move_to_new_folder_name, width='1-1') }}
         {{ page_footer('Add to new folder', button_name='operation', button_value='move-to-new-folder') }}
       </fieldset>
@@ -23,7 +23,7 @@
   {% endif %}
   <div id="add_new_folder_form">
     <fieldset class="js-will-stick-at-bottom-when-scrolling">
-      <legend class="govuk-visually-hidden">Add new folder</legend>
+      <legend class="visuallyhidden">Add new folder</legend>
       {{ textbox(templates_and_folders_form.add_new_folder_name, width='1-1') }}
       {{ page_footer('Add new folder', button_name='operation', button_value='add-new-folder') }}
     </fieldset>
@@ -36,7 +36,7 @@
     {{ page_footer('Continue', button_name='operation', button_value='add-new-template') }}
     </div>
   </div>
-  <div class="selection-counter govuk-visually-hidden" role="status" aria-live="polite">
+  <div class="selection-counter visuallyhidden" role="status" aria-live="polite">
     Nothing selected
   </div>
 </div>