From 151488fa784242f5de342aaff39800a96617ed37 Mon Sep 17 00:00:00 2001
From: Tom Byers <tom.byers@digital.cabinet-office.gov.uk>
Date: Wed, 29 Aug 2018 11:38:40 +0100
Subject: [PATCH] Update email preview page

No longer requires the branding_type GET param.

Retains the 'govuk' default brand.
---
 app/assets/javascripts/emailPreviewPane.js |  2 +-
 app/main/views/index.py                    | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/emailPreviewPane.js b/app/assets/javascripts/emailPreviewPane.js
index 5871118a3..0509efa27 100644
--- a/app/assets/javascripts/emailPreviewPane.js
+++ b/app/assets/javascripts/emailPreviewPane.js
@@ -13,7 +13,7 @@
 
   const $paneWrapper = $('<div class="column-full"></div>');
   const $form = $('form');
-  const $previewPane = $('<iframe src="/_email?' + 
+  const $previewPane = $('<iframe src="/_email?' +
                           buildQueryString(['branding_style', branding_style]) +
                           '" class="email-branding-preview"></iframe>');
 
diff --git a/app/main/views/index.py b/app/main/views/index.py
index ed07c2a15..685cb77f9 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -80,17 +80,20 @@ def design_content():
 
 @main.route('/_email')
 def email_template():
-    branding_type = request.args.get('branding_type', 'govuk')
-    branding_style = request.args.get('branding_style', 'None')
+    branding_type = 'govuk'
+    branding_style = request.args.get('branding_style', None)
 
-    if branding_type == 'govuk' or branding_style == 'None':
+    if branding_style:
+        email_branding = email_branding_client.get_email_branding(branding_style)['email_branding']
+        branding_type = email_branding['brand_type']
+
+    if branding_type == 'govuk':
         brand_name = None
         brand_colour = None
         brand_logo = None
         govuk_banner = True
         brand_banner = False
     else:
-        email_branding = email_branding_client.get_email_branding(branding_style)['email_branding']
         colour = email_branding['colour']
         brand_name = email_branding['text']
         brand_colour = colour