Merge pull request #2249 from alphagov/add-brand-type-to-email-branding

Add brand type to email branding.

app/main/forms.py

@@ -714,7 +714,6 @@ class ServicePreviewBranding(StripWhitespaceForm):
 
 
 class ServiceUpdateEmailBranding(StripWhitespaceForm):
-
     name = StringField('Name of brand')
     text = StringField('Text')
     domain = StringField('Domain')
@@ -724,19 +723,16 @@ class ServiceUpdateEmailBranding(StripWhitespaceForm):
             Regexp(regex="^$|^#(?:[0-9a-fA-F]{3}){1,2}$", message='Must be a valid color hex code')
         ]
     )
-    banner_colour = StringField(
-        'Banner colour',
-        validators=[
-            Regexp(regex="^$|^#(?:[0-9a-fA-F]{3}){1,2}$", message='Must be a valid color hex code')
-        ]
-    )
-    single_id_colour = StringField(
-        'Single identity colour',
-        validators=[
-            Regexp(regex="^$|^#(?:[0-9a-fA-F]{3}){1,2}$", message='Must be a valid color hex code')
-        ]
-    )
     file = FileField_wtf('Upload a PNG logo', validators=[FileAllowed(['png'], 'PNG Images only!')])
+    brand_type = RadioField(
+        "Brand type",
+        choices=[
+            ('govuk', 'GOV.UK only'),
+            ('both', 'GOV.UK and branding'),
+            ('org', 'Branding only'),
+            ('org_banner', 'Branding banner'),
+        ]
+    )
 
 
 class CreateOrUpdateOrganisation(StripWhitespaceForm):

app/main/views/email_branding.py

@@ -36,7 +36,13 @@ def email_branding():
 def update_email_branding(branding_id, logo=None):
     email_branding = email_branding_client.get_email_branding(branding_id)['email_branding']
 
-    form = ServiceUpdateEmailBranding()
+    form = ServiceUpdateEmailBranding(
+        name=email_branding['name'],
+        text=email_branding['text'],
+        colour=email_branding['colour'],
+        domain=email_branding['domain'],
+        brand_type=email_branding['brand_type']
+    )
 
     logo = logo if logo else email_branding.get('logo') if email_branding else None
 
@@ -65,20 +71,12 @@ def update_email_branding(branding_id, logo=None):
             name=form.name.data,
             text=form.text.data,
             colour=form.colour.data,
-            banner_colour=form.banner_colour.data,
-            single_id_colour=form.single_id_colour.data,
             domain=form.domain.data,
+            brand_type=form.brand_type.data,
         )
 
         return redirect(url_for('.email_branding', branding_id=branding_id))
 
-    form.name.data = email_branding['name']
-    form.text.data = email_branding['text']
-    form.colour.data = email_branding['colour']
-    form.banner_colour.data = email_branding['banner_colour']
-    form.single_id_colour.data = email_branding['single_id_colour']
-    form.domain.data = email_branding['domain']
-
     return render_template(
         'views/email-branding/manage-branding.html',
         form=form,
@@ -93,7 +91,7 @@ def update_email_branding(branding_id, logo=None):
 @login_required
 @user_is_platform_admin
 def create_email_branding(logo=None):
-    form = ServiceUpdateEmailBranding()
+    form = ServiceUpdateEmailBranding(brand_type='govuk')
 
     if form.validate_on_submit():
         if form.file.data:
@@ -119,9 +117,8 @@ def create_email_branding(logo=None):
             name=form.name.data,
             text=form.text.data,
             colour=form.colour.data,
-            banner_colour=form.banner_colour.data,
-            single_id_colour=form.single_id_colour.data,
-            domain=form.domain.data
+            domain=form.domain.data,
+            brand_type=form.brand_type.data,
         )
 
         return redirect(url_for('.email_branding'))

app/main/views/index.py

@@ -78,13 +78,6 @@ def design_content():
     return render_template('views/design-patterns-content-guidance.html')
 
 
-def _set_colour(branding_style, email_branding):
-    if branding_style in ['both', 'org']:
-        return email_branding['single_id_colour'] or email_branding['colour']
-    elif branding_style == 'org_banner':
-        return email_branding['banner_colour'] or email_branding['colour']
-
-
 @main.route('/_email')
 def email_template():
     branding_type = request.args.get('branding_type', 'govuk')
@@ -98,7 +91,7 @@ def email_template():
         brand_banner = False
     else:
         email_branding = email_branding_client.get_email_branding(branding_style)['email_branding']
-        colour = _set_colour(branding_type, email_branding)
+        colour = email_branding['colour']
         brand_name = email_branding['text']
         brand_colour = colour
         brand_logo = 'https://{}/{}'.format(get_cdn_domain(), email_branding['logo'])

app/notify_client/email_branding_client.py

@@ -18,26 +18,24 @@ class EmailBrandingClient(NotifyAdminAPIClient):
     def get_letter_email_branding(self):
         return self.get(url='/dvla_organisations')
 
-    def create_email_branding(self, logo, name, text, colour, banner_colour, single_id_colour, domain):
+    def create_email_branding(self, logo, name, text, colour, domain, brand_type):
         data = {
             "logo": logo,
             "name": name,
             "text": text,
             "colour": colour,
-            "banner_colour": banner_colour,
-            "single_id_colour": single_id_colour,
             "domain": domain,
+            "brand_type": brand_type
         }
         return self.post(url="/email-branding", data=data)
 
-    def update_email_branding(self, branding_id, logo, name, text, colour, banner_colour, single_id_colour, domain):
+    def update_email_branding(self, branding_id, logo, name, text, colour, domain, brand_type):
         data = {
             "logo": logo,
             "name": name,
             "text": text,
             "colour": colour,
-            "banner_colour": banner_colour,
-            "single_id_colour": single_id_colour,
             "domain": domain,
+            "brand_type": brand_type
         }
         return self.post(url="/email-branding/{}".format(branding_id), data=data)

app/templates/views/email-branding/manage-branding.html

@@ -2,6 +2,7 @@
 {% from "components/file-upload.html" import file_upload %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/textbox.html" import textbox %}
+{% from "components/radios.html" import radios %}
 
 {% block service_page_title %}
   {{ '{} email branding'.format('Update' if email_branding else 'Create')}}
@@ -23,9 +24,8 @@
           <div style='margin-top:15px;'>{{textbox(form.name)}}</div>
           <div style='margin-top:15px;'>{{textbox(form.text)}}</div>
           {{ textbox(form.colour, width='1-4', colour_preview=True) }}
-          {{ textbox(form.banner_colour, width='1-4', colour_preview=True) }}
-          {{ textbox(form.single_id_colour, width='1-4', colour_preview=True) }}
            <div style='margin-top:15px;'>{{textbox(form.domain)}}</div>
+           {{ radios(form.brand_type) }}
           {{ page_footer(
             'Save',
             back_link=url_for('.email_branding'),