diff --git a/app/main/forms.py b/app/main/forms.py index 6f7833184..e2efb9cfa 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -731,6 +731,7 @@ class ServiceUpdateEmailBranding(StripWhitespaceForm): name = StringField('Name of brand') text = StringField('Text') + domain = StringField('Domain') colour = StringField( 'Colour', render_kw={'onchange': 'update_colour(this)'}, @@ -738,6 +739,20 @@ 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', + render_kw={'onchange': 'update_colour(this)'}, + 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', + render_kw={'onchange': 'update_colour(this)'}, + 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!')]) @@ -745,6 +760,7 @@ class ServiceCreateEmailBranding(StripWhitespaceForm): name = StringField('Name of brand') text = StringField('Text') + domain = StringField('Domain') colour = StringField( 'Colour', render_kw={'onchange': 'update_colour(this)'}, @@ -752,6 +768,20 @@ class ServiceCreateEmailBranding(StripWhitespaceForm): Regexp(regex="^$|^#(?:[0-9a-fA-F]{3}){1,2}$", message='Must be a valid color hex code') ] ) + banner_colour = StringField( + 'Banner colour', + render_kw={'onchange': 'update_colour(this)'}, + 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', + render_kw={'onchange': 'update_colour(this)'}, + 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!')]) diff --git a/app/main/views/email_branding.py b/app/main/views/email_branding.py index 4f55b1e7f..008b94052 100644 --- a/app/main/views/email_branding.py +++ b/app/main/views/email_branding.py @@ -80,7 +80,10 @@ def update_email_branding(branding_id, logo=None): logo=logo, name=form.name.data, text=form.text.data, - colour=form.colour.data + colour=form.colour.data, + banner_colour=form.banner_colour.data, + single_id_colour=form.single_id_colour.data, + domain=form.domain.data, ) return redirect(url_for('.email_branding', branding_id=branding_id)) @@ -88,6 +91,9 @@ def update_email_branding(branding_id, logo=None): 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', @@ -128,7 +134,10 @@ def create_email_branding(logo=None): logo=logo, name=form.name.data, text=form.text.data, - colour=form.colour.data + colour=form.colour.data, + banner_colour=form.banner_colour.data, + single_id_colour=form.single_id_colour.data, + domain=form.domain.data ) return redirect(url_for('.email_branding')) diff --git a/app/notify_client/email_branding_client.py b/app/notify_client/email_branding_client.py index ae2375144..0349c3f84 100644 --- a/app/notify_client/email_branding_client.py +++ b/app/notify_client/email_branding_client.py @@ -18,20 +18,26 @@ class EmailBrandingClient(NotifyAdminAPIClient): def get_letter_email_branding(self): return self.get(url='/dvla_organisations') - def create_email_branding(self, logo, name, text, colour): + def create_email_branding(self, logo, name, text, colour, banner_colour, single_id_colour, domain): data = { "logo": logo, "name": name, "text": text, - "colour": colour + "colour": colour, + "banner_colour": banner_colour, + "single_id_colour": single_id_colour, + "domain": domain, } return self.post(url="/email-branding", data=data) - def update_email_branding(self, branding_id, logo, name, text, colour): + def update_email_branding(self, branding_id, logo, name, text, colour, banner_colour, single_id_colour, domain): data = { "logo": logo, "name": name, "text": text, - "colour": colour + "colour": colour, + "banner_colour": banner_colour, + "single_id_colour": single_id_colour, + "domain": domain, } return self.post(url="/email-branding/{}".format(branding_id), data=data) diff --git a/app/templates/views/email-branding/manage-branding.html b/app/templates/views/email-branding/manage-branding.html index d8927ad65..8b628a9a4 100644 --- a/app/templates/views/email-branding/manage-branding.html +++ b/app/templates/views/email-branding/manage-branding.html @@ -12,7 +12,6 @@