From 245d9ed75eb745084817af83cae3b1e9a48e37dd Mon Sep 17 00:00:00 2001
From: Katie Smith <katie.smith@digital.cabinet-office.gov.uk>
Date: Tue, 3 Aug 2021 11:23:43 +0100
Subject: [PATCH] Fix styling for platform admin template

The layout for the platform admin base template needed to be changed so
that the back link appears in the same place as before.

Previously, the left hand nav was inside `<main>`, but that did not need
to be and was inconsistent with other pages, so has been taken out.
---
 .../views/platform-admin/_base_template.html  | 84 ++++++++++---------
 1 file changed, 43 insertions(+), 41 deletions(-)

diff --git a/app/templates/views/platform-admin/_base_template.html b/app/templates/views/platform-admin/_base_template.html
index c1f5b0f7f..941e8ce1a 100644
--- a/app/templates/views/platform-admin/_base_template.html
+++ b/app/templates/views/platform-admin/_base_template.html
@@ -1,48 +1,50 @@
 {% extends "withoutnav_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 
-
-{% block beforeContent %}
-  <div class="navigation-service">
-    <div class="navigation-service-name govuk-!-font-weight-bold">
-      Platform admin
+{% block main %}
+<div class="govuk-width-container {{ mainClasses }}">
+    <div class="navigation-service">
+      <div class="navigation-service-name govuk-!-font-weight-bold">
+        Platform admin
+      </div>
+      <a href="{{ url_for('main.choose_account') }}" class="govuk-link govuk-link--no-visited-state navigation-service-switch">Switch service</a>
     </div>
-    <a href="{{ url_for('main.choose_account') }}" class="govuk-link govuk-link--no-visited-state navigation-service-switch">Switch service</a>
-  </div>
-  {% block backLink %}{% endblock %}
-{% endblock %}
-
-{% block content %}
-  <div class="govuk-grid-row">
-    <div class="govuk-grid-column-one-quarter">
-      <nav class="navigation">
-          {% for link_text, url in [
-          ('Summary', url_for('main.platform_admin')),
-          ('Live services', url_for('main.live_services')),
-          ('Trial mode services', url_for('main.trial_services')),
-          ('Organisations', url_for('main.organisations')),
-          ('Providers', url_for('main.view_providers')),
-          ('Reports', url_for('main.platform_admin_reports')),
-          ('Email branding', url_for('main.email_branding')),
-          ('Letter branding', url_for('main.letter_branding')),
-          ('Inbound SMS numbers', url_for('main.inbound_sms_admin')),
-          ('Find services by name', url_for('main.find_services_by_name')),
-          ('Find users by email', url_for('main.find_users_by_email')),
-          ('Email complaints', url_for('main.platform_admin_list_complaints')),
-          ('Returned letters', url_for('main.platform_admin_returned_letters')),
-          ('Clear cache', url_for('main.clear_cache')),
-        ] %}
-          <li>
-            <a class="govuk-link govuk-link--no-visited-state" href="{{ url }}">
-              {{ link_text }}
-            </a>
-          </li>
-        {% endfor %}
-      </nav>
-    </div>
-    <div class="govuk-grid-column-three-quarters column-main">
-      {% include 'flash_messages.html' %}
-      {% block platform_admin_content %}{% endblock %}
+    <div class="govuk-grid-row">
+      <div class="govuk-grid-column-one-quarter">
+        <nav class="navigation">
+            {% for link_text, url in [
+            ('Summary', url_for('main.platform_admin')),
+            ('Live services', url_for('main.live_services')),
+            ('Trial mode services', url_for('main.trial_services')),
+            ('Organisations', url_for('main.organisations')),
+            ('Providers', url_for('main.view_providers')),
+            ('Reports', url_for('main.platform_admin_reports')),
+            ('Email branding', url_for('main.email_branding')),
+            ('Letter branding', url_for('main.letter_branding')),
+            ('Inbound SMS numbers', url_for('main.inbound_sms_admin')),
+            ('Find services by name', url_for('main.find_services_by_name')),
+            ('Find users by email', url_for('main.find_users_by_email')),
+            ('Email complaints', url_for('main.platform_admin_list_complaints')),
+            ('Returned letters', url_for('main.platform_admin_returned_letters')),
+            ('Clear cache', url_for('main.clear_cache')),
+          ] %}
+            <li>
+              <a class="govuk-link govuk-link--no-visited-state" href="{{ url }}">
+                {{ link_text }}
+              </a>
+            </li>
+          {% endfor %}
+        </nav>
+      </div>
+      <div class="govuk-grid-column-three-quarters">
+      {% block backLink %}{% endblock %}
+        <main class="govuk-main-wrapper column-main govuk-!-padding-top-0 govuk-!-padding-bottom-0" id="main-content" role="main">
+          {% block content %}
+            {% include 'flash_messages.html' %}
+            {% block platform_admin_content %}{% endblock %}
+          {% endblock %}
+        </main>
+      </div>
     </div>
   </div>