Update content area blocks in descendent pages

GOV.UK Frontend's template wraps all content in a
`<main>` tag and puts it in the main column.

Some of Notify's pages need to reach out of the
main column (product page).

Some have several blocks of navigation before the
main content area.

This adjusts the blocks in all the templates
where this is the case so those conditions can be
met.

app/templates/admin_template.html

@@ -121,10 +121,6 @@
   }) }}
 {% endblock %}
 
-{% block content %}
-  {% block fullwidth_content %}{% endblock %}
-{% endblock %}
-
 {% block footer %}
   {% set meta_items = [
     {

app/templates/fullwidth_template.html

@@ -1,7 +1,8 @@
 {% extends "admin_template.html" %}
 
-{% block fullwidth_content %}
+{% block main %}
-  <main role="main">
+  {% block beforeContent %}{% endblock %}
-    {% block maincolumn_content %}{% endblock %}
+  <main class="govuk-main-wrapper {{ mainClasses }}" id="main-content" role="main">
+    {% block content %}{% endblock %}
   </main>
 {% endblock %}

app/templates/org_template.html

@@ -4,8 +4,8 @@
   {% block org_page_title %}{% endblock %} – {{ current_org.name }}
 {% endblock %}
 
-{% block fullwidth_content %}
+{% block main %}
-  <div id="content">
+  <div class="govuk-width-container">
     <div class="navigation-service">
       {% if current_user.platform_admin %}
         <a href="{{ url_for('.organisations') }}" class="navigation-organisation-link">All organisations</a>
@@ -19,10 +19,15 @@
       <div class="column-one-quarter">
         {% include "org_nav.html" %}
       </div>
-      <main role="main" class="column-three-quarters column-main">
+      <div class="column-three-quarters">
+        {% block beforeContent %}{% endblock %}
+        <main class="govuk-main-wrapper column-main" id="main-content" role="main" >
+          {% block content %}
             {% include 'flash_messages.html' %}
             {% block maincolumn_content %}{% endblock %}
+          {% endblock %}
         </main>
       </div>
     </div>
+  </div>
 {% endblock %}

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

@@ -9,19 +9,21 @@
   New organisation
 {% endblock %}
 
-{% block fullwidth_content %}
+{% block main %}
-  <div id="content">
+  <div class="govuk-width-container">
     <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>
 
-    <main role="main">
     <div class="grid-row">
       <div class="column-one-quarter">
         &nbsp;
       </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)}}
@@ -29,9 +31,10 @@
               {{radios(form.crown_status)}}
               {{ page_footer('Save') }}
             {% endcall %}
-        </div>
+          {% endblock %}
-      </div>
         </main>
       </div>
+    </div>
+  </div>
 
 {% endblock %}

app/templates/views/organisations/index.html

@@ -7,9 +7,10 @@
   All organisations
 {% endblock %}
 
-{% block fullwidth_content %}
+{% block beforeContent %}{% endblock %}
+
+{% block maincolumn_content %}
 
-  <div id="content">
     <div class="navigation-service">
       <div class="navigation-service-name">
         &nbsp;
@@ -17,7 +18,6 @@
       <a href="{{ url_for('main.choose_account') }}" class="navigation-service-switch">Switch service</a>
     </div>
 
-    <main role="main">
     <div class="grid-row top-gutter-2-3">
       <div class="column-one-quarter">
         <h1>
@@ -57,7 +57,6 @@
         </div>
       </div>
     </div>
-    </main>
   </div>
 
 {% endblock %}

app/templates/views/signedout.html

@@ -8,7 +8,7 @@
   GOV.UK Notify
 {% endblock %}
 
-{% block maincolumn_content %}
+{% block content %}
 
   <div class="product-page-intro">
     <div class="product-page-intro-wrapper override-elements-content" id="content">

app/templates/withnav_template.html

@@ -4,8 +4,8 @@
   {% block service_page_title %}{% endblock %} – {{ current_service.name }}
 {% endblock %}
 
-{% block fullwidth_content %}
+{% block main %}
-  <div id="content">
+  <div class="govuk-width-container">
     <div class="navigation-service">
       {% if current_service.organisation_id %}
         {% if current_user.platform_admin or
@@ -27,13 +27,18 @@
         {% include "main_nav.html" %}
       </div>
       {% if help %}
-        <main role="main" class="column-two-thirds column-main">
+        <div class="column-two-thirds column-main">
       {% else %}
-        <main role="main" class="column-three-quarters column-main">
+        <div class="column-three-quarters column-main">
       {% endif %}
+        {% block beforeContent %}{% endblock %}
+        <main class="govuk-main-wrapper column-main {{ mainClasses }}" id="main-content" role="main">
+        {% block content %}
           {% include 'flash_messages.html' %}
           {% block maincolumn_content %}{% endblock %}
+        {% endblock %}
         </main>
       </div>
     </div>
+  </div>
 {% endblock %}

app/templates/withoutnav_template.html

@@ -1,15 +1,14 @@
 {% extends "admin_template.html" %}
 
-{% block fullwidth_content %}
+{% block beforeContent %}
-  <div id="content">
     {% if current_service and current_service.active and current_user.is_authenticated and current_user.belongs_to_service(current_service.id) %}
     <div class="navigation-service">
       <a href="{{ url_for('main.show_accounts_or_dashboard') }}" class="navigation-service-back-to">Back to {{ current_service.name }}</a>
     </div>
     {% endif %}
-    <main role="main">
+{% endblock %}
+
+{% block content %}
     {% include 'flash_messages.html' %}
     {% block maincolumn_content %}{% endblock %}
-    </main>
-  </div>
 {% endblock %}