From 896072f16991738e883dda7f43cb7d93f00df585 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Thu, 30 Aug 2018 09:11:06 +0100
Subject: [PATCH] Remove reference to service branding on settings

This attribute is deprecated in favour of an attribute on the
`email_branding` itself.
---
 app/templates/views/service-settings.html | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index f84809dcb..ad6b64909 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -101,9 +101,7 @@
 
         {% call settings_row(if_has_permission='email') %}
           {{ text_field('Email branding') }}
-          {{ text_field(
-            'GOV.UK' if current_service.branding == 'govuk' else 'Your branding'
-          ) }}
+          {{ text_field('Your branding' if email_branding else 'GOV.UK') }}
           {{ edit_field(
             'Change',
             url_for('.branding_request', service_id=current_service.id),
@@ -301,17 +299,7 @@
         {% endcall %}
         {% call row() %}
           {{ text_field('Email branding' )}}
-          {% call field() %}
-            {% if current_service.branding == 'govuk' %}
-              GOV.UK
-            {% elif current_service.branding == 'both' %}
-              GOV.UK and {{ email_branding.name if email_branding else None }}
-            {% elif current_service.branding == 'org' %}
-              Only {{ email_branding.name if email_branding else None }}
-            {% elif current_service.branding == 'org_banner' %}
-              Only {{ email_branding.name if email_branding else None }} banner
-            {% endif %}
-          {% endcall %}
+          {{ text_field(email_branding.name or 'GOV.UK') }}
           {{ edit_field('Change', url_for('.service_set_email_branding', service_id=current_service.id)) }}
         {% endcall %}
         {% call row() %}