From 077dc194c674f8431ae8fd1644624915db327afb Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Thu, 12 Sep 2019 14:53:40 +0100
Subject: [PATCH] Tell people to change their branding
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In some cases it’s not appropriate for teams to have GOV.UK branding.
But they all start with it by default, if we can’t make a better guess.
We should be more explicit about this to reduce the number of teams
sending emails with the wrong branding.
---
 app/models/service.py                                     | 4 ++++
 .../views/service-settings/branding/email-options.html    | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/models/service.py b/app/models/service.py
index 68e3d364f..1d5e26af6 100644
--- a/app/models/service.py
+++ b/app/models/service.py
@@ -417,6 +417,10 @@ class Service(JSONModel):
             return 'GOV.UK'
         return self.email_branding['name']
 
+    @property
+    def needs_to_change_email_branding(self):
+        return self.email_branding_id is None and self.organisation_type != 'central'
+
     @property
     def letter_branding_id(self):
         return self._dict['letter_branding']
diff --git a/app/templates/views/service-settings/branding/email-options.html b/app/templates/views/service-settings/branding/email-options.html
index 10b4dff5b..aca111b87 100644
--- a/app/templates/views/service-settings/branding/email-options.html
+++ b/app/templates/views/service-settings/branding/email-options.html
@@ -17,10 +17,16 @@
     back_link=url_for('main.service_settings', service_id=current_service.id)
   ) }}
 
-  <p class="form-group">
+  <p>
     Your emails currently have {{ current_service.email_branding_name }} branding.
   </p>
 
+  {% if current_service.needs_to_change_email_branding %}
+    <p>
+      You should be using your own branding instead. We can help you to set this up.
+    </p>
+  {% endif %}
+
   {% call form_wrapper() %}
     {% if form.something_else_is_only_option %}
       {{ textbox(