From 892ea01fad87ac08087c61eaccb1baae2dbe2bb3 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 11 Oct 2019 16:44:17 +0100 Subject: [PATCH] Update content area blocks in descendent pages GOV.UK Frontend's template wraps all content in a `
` 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 | 4 - app/templates/fullwidth_template.html | 7 +- app/templates/org_template.html | 17 +++-- .../views/organisations/add-organisation.html | 37 ++++----- app/templates/views/organisations/index.html | 75 +++++++++---------- app/templates/views/signedout.html | 2 +- app/templates/withnav_template.html | 19 +++-- app/templates/withoutnav_template.html | 13 ++-- 8 files changed, 91 insertions(+), 83 deletions(-) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index db664c343..3152a60d5 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -121,10 +121,6 @@ }) }} {% endblock %} -{% block content %} - {% block fullwidth_content %}{% endblock %} -{% endblock %} - {% block footer %} {% set meta_items = [ { diff --git a/app/templates/fullwidth_template.html b/app/templates/fullwidth_template.html index 137088d1d..9ed74ee0f 100644 --- a/app/templates/fullwidth_template.html +++ b/app/templates/fullwidth_template.html @@ -1,7 +1,8 @@ {% extends "admin_template.html" %} -{% block fullwidth_content %} -
- {% block maincolumn_content %}{% endblock %} +{% block main %} + {% block beforeContent %}{% endblock %} +
+ {% block content %}{% endblock %}
{% endblock %} diff --git a/app/templates/org_template.html b/app/templates/org_template.html index 3d2eb417f..b0031c118 100644 --- a/app/templates/org_template.html +++ b/app/templates/org_template.html @@ -4,8 +4,8 @@ {% block org_page_title %}{% endblock %} – {{ current_org.name }} {% endblock %} -{% block fullwidth_content %} -
+{% block main %} +
{% if current_user.platform_admin %} All organisations @@ -19,10 +19,15 @@
{% include "org_nav.html" %}
-
- {% include 'flash_messages.html' %} - {% block maincolumn_content %}{% endblock %} -
+
+ {% block beforeContent %}{% endblock %} +
+ {% block content %} + {% include 'flash_messages.html' %} + {% block maincolumn_content %}{% endblock %} + {% endblock %} +
+
{% endblock %} diff --git a/app/templates/views/organisations/add-organisation.html b/app/templates/views/organisations/add-organisation.html index 8d2a28077..42966327c 100644 --- a/app/templates/views/organisations/add-organisation.html +++ b/app/templates/views/organisations/add-organisation.html @@ -9,29 +9,32 @@ New organisation {% endblock %} -{% block fullwidth_content %} -
+{% block main %} +
All organisations Switch service
-
-
-
-   -
-
- {{ page_header('New organisation') }} - {% call form_wrapper() %} - {{textbox(form.name)}} - {{radios(form.organisation_type)}} - {{radios(form.crown_status)}} - {{ page_footer('Save') }} - {% endcall %} -
+
+
+  
-
+
+
+ {% 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 %} +
+
+
{% endblock %} diff --git a/app/templates/views/organisations/index.html b/app/templates/views/organisations/index.html index a7706b189..6be932260 100644 --- a/app/templates/views/organisations/index.html +++ b/app/templates/views/organisations/index.html @@ -7,9 +7,10 @@ All organisations {% endblock %} -{% block fullwidth_content %} +{% block beforeContent %}{% endblock %} + +{% block maincolumn_content %} -
  @@ -17,47 +18,45 @@ Switch service
-
-
+
+
+

+ All organisations +

+
+
+ + {{ live_search(target_selector='.browse-list-item', show=True, form=search_form, label='Search by name') }} + + + +
+
+
+
-

- All organisations -

+  
- - {{ live_search(target_selector='.browse-list-item', show=True, form=search_form, label='Search by name') }} - - - + New organisation
-
-
-
-   -
-
- New organisation -
-
-
-
+
{% endblock %} diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html index 41b3d1264..e78999d2d 100644 --- a/app/templates/views/signedout.html +++ b/app/templates/views/signedout.html @@ -8,7 +8,7 @@ GOV.UK Notify {% endblock %} -{% block maincolumn_content %} +{% block content %}
diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html index 523a17a08..41dc9b3fb 100644 --- a/app/templates/withnav_template.html +++ b/app/templates/withnav_template.html @@ -4,8 +4,8 @@ {% block service_page_title %}{% endblock %} – {{ current_service.name }} {% endblock %} -{% block fullwidth_content %} -
+{% block main %} +
{% if current_service.organisation_id %} {% if current_user.platform_admin or @@ -27,13 +27,18 @@ {% include "main_nav.html" %}
{% if help %} -
+
{% else %} -
+
{% endif %} - {% include 'flash_messages.html' %} - {% block maincolumn_content %}{% endblock %} -
+ {% block beforeContent %}{% endblock %} +
+ {% block content %} + {% include 'flash_messages.html' %} + {% block maincolumn_content %}{% endblock %} + {% endblock %} +
+
{% endblock %} diff --git a/app/templates/withoutnav_template.html b/app/templates/withoutnav_template.html index cd4f318c5..74362fd87 100644 --- a/app/templates/withoutnav_template.html +++ b/app/templates/withoutnav_template.html @@ -1,15 +1,14 @@ {% extends "admin_template.html" %} -{% block fullwidth_content %} -
+{% block beforeContent %} {% if current_service and current_service.active and current_user.is_authenticated and current_user.belongs_to_service(current_service.id) %}
Back to {{ current_service.name }}
{% endif %} -
- {% include 'flash_messages.html' %} - {% block maincolumn_content %}{% endblock %} -
-
+{% endblock %} + +{% block content %} + {% include 'flash_messages.html' %} + {% block maincolumn_content %}{% endblock %} {% endblock %}