From ee33f9162122509981106177fd47a0c3fa57ce8d Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 20 May 2019 15:56:49 +0100
Subject: [PATCH] =?UTF-8?q?Use=20new=20=E2=80=98add=E2=80=99=20buttons=20o?=
 =?UTF-8?q?n=20branding=20management=20pages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

‘Add’ buttons are generally:
- at the bottom of the page
- sticky
- grey
---
 .../views/email-branding/select-branding.html       | 13 +++++--------
 .../letter-branding/select-letter-branding.html     | 13 +++++--------
 tests/app/main/views/test_email_branding.py         |  2 +-
 tests/app/main/views/test_letter_branding.py        |  2 +-
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/app/templates/views/email-branding/select-branding.html b/app/templates/views/email-branding/select-branding.html
index 27c8086ef..9fc697e8c 100644
--- a/app/templates/views/email-branding/select-branding.html
+++ b/app/templates/views/email-branding/select-branding.html
@@ -1,4 +1,5 @@
 {% extends "views/platform-admin/_base_template.html" %}
+{% from "components/page-header.html" import page_header %}
 {% from "components/live-search.html" import live_search %}
 
 {% block per_page_title %}
@@ -7,14 +8,7 @@
 
 {% block platform_admin_content %}
 
-  <div class="grid-row bottom-gutter-2-3">
-    <div class="column-two-thirds">
-      <h1 class="heading-large">Email branding</h1>
-    </div>
-    <div class="column-one-third">
-      <a href="{{ url_for('.create_email_branding') }}" class="button align-with-heading">Add new brand</a>
-    </div>
-  </div>
+  {{ page_header('Email branding') }}
   {{ live_search(target_selector='.email-brand', show=True, form=search_form) }}
   <nav>
     {% for brand in email_brandings %}
@@ -27,5 +21,8 @@
       </div>
     {% endfor %}
   </nav>
+  <div class="js-stick-at-bottom-when-scrolling">
+    <a href="{{ url_for('.create_email_branding') }}" class="button-secondary">New brand</a>
+  </div>
 
 {% endblock %}
diff --git a/app/templates/views/letter-branding/select-letter-branding.html b/app/templates/views/letter-branding/select-letter-branding.html
index 3b50744f5..3f9b320a4 100644
--- a/app/templates/views/letter-branding/select-letter-branding.html
+++ b/app/templates/views/letter-branding/select-letter-branding.html
@@ -1,4 +1,5 @@
 {% extends "views/platform-admin/_base_template.html" %}
+{% from "components/page-header.html" import page_header %}
 {% from "components/live-search.html" import live_search %}
 
 {% block per_page_title %}
@@ -7,14 +8,7 @@
 
 {% block platform_admin_content %}
 
-  <div class="grid-row bottom-gutter-2-3">
-    <div class="column-two-thirds">
-      <h1 class="heading-large">Letter branding</h1>
-    </div>
-    <div class="column-one-third">
-      <a href="{{ url_for('.create_letter_branding') }}" class="button align-with-heading">Add new brand</a>
-    </div>
-  </div>
+  {{ page_header('Letter branding') }}
   {{ live_search(target_selector='.letter-brand', show=True, form=search_form) }}
   <nav>
     {% for brand in letter_brandings %}
@@ -27,5 +21,8 @@
       </div>
     {% endfor %}
   </nav>
+  <div class="js-stick-at-bottom-when-scrolling">
+    <a href="{{ url_for('.create_letter_branding') }}" class="button-secondary">New brand</a>
+  </div>
 
 {% endblock %}
diff --git a/tests/app/main/views/test_email_branding.py b/tests/app/main/views/test_email_branding.py
index e49f8ecef..a91b2b6b4 100644
--- a/tests/app/main/views/test_email_branding.py
+++ b/tests/app/main/views/test_email_branding.py
@@ -33,7 +33,7 @@ def test_email_branding_page_shows_full_branding_list(
         page.select_one('h1').text
     ) == "Email branding"
 
-    assert page.select_one('.column-three-quarters a')['href'] == url_for('main.create_email_branding')
+    assert page.select('.column-three-quarters a')[-1]['href'] == url_for('main.create_email_branding')
 
     assert brand_names == [
         'org 1',
diff --git a/tests/app/main/views/test_letter_branding.py b/tests/app/main/views/test_letter_branding.py
index 89ef8bc43..d9c463727 100644
--- a/tests/app/main/views/test_letter_branding.py
+++ b/tests/app/main/views/test_letter_branding.py
@@ -33,7 +33,7 @@ def test_letter_branding_page_shows_full_branding_list(
         page.select_one('h1').text
     ) == "Letter branding"
 
-    assert page.select_one('.column-three-quarters a')['href'] == url_for('main.create_letter_branding')
+    assert page.select('.column-three-quarters a')[-1]['href'] == url_for('main.create_letter_branding')
 
     assert brand_names == [
         'HM Government',