diff --git a/app/main/forms.py b/app/main/forms.py index 746809b8c..6f7833184 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -729,7 +729,8 @@ class ServiceSelectEmailBranding(StripWhitespaceForm): class ServiceUpdateEmailBranding(StripWhitespaceForm): - name = StringField('Name') + name = StringField('Name of brand') + text = StringField('Text') colour = StringField( 'Colour', render_kw={'onchange': 'update_colour(this)'}, @@ -742,7 +743,8 @@ class ServiceUpdateEmailBranding(StripWhitespaceForm): class ServiceCreateEmailBranding(StripWhitespaceForm): - name = StringField('Name') + name = StringField('Name of brand') + text = StringField('Text') colour = StringField( 'Colour', render_kw={'onchange': 'update_colour(this)'}, diff --git a/app/main/views/email_branding.py b/app/main/views/email_branding.py index f9b72c493..60a9745d7 100644 --- a/app/main/views/email_branding.py +++ b/app/main/views/email_branding.py @@ -78,12 +78,14 @@ def update_email_branding(branding_id, logo=None): branding_id=branding_id, logo=logo, name=form.name.data, + text=form.text.data, colour=form.colour.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'] return render_template( @@ -124,6 +126,7 @@ def create_email_branding(logo=None): email_branding_client.create_email_branding( logo=logo, name=form.name.data, + text=form.text.data, colour=form.colour.data ) diff --git a/app/notify_client/email_branding_client.py b/app/notify_client/email_branding_client.py index cadafecc5..59ebbde3f 100644 --- a/app/notify_client/email_branding_client.py +++ b/app/notify_client/email_branding_client.py @@ -15,18 +15,20 @@ class EmailBrandingClient(NotifyAdminAPIClient): def get_letter_email_branding(self): return self.get(url='/dvla_organisations') - def create_email_branding(self, logo, name, colour): + def create_email_branding(self, logo, name, text, colour): data = { "logo": logo, "name": name, + "text": text, "colour": colour } return self.post(url="/email-branding", data=data) - def update_email_branding(self, branding_id, logo, name, colour): + def update_email_branding(self, branding_id, logo, name, text, colour): data = { "logo": logo, "name": name, + "text": text, "colour": colour } return self.post(url="/email-branding/{}".format(branding_id), data=data) diff --git a/app/templates/components/radios.html b/app/templates/components/radios.html index 26c9e512f..0604c9361 100644 --- a/app/templates/components/radios.html +++ b/app/templates/components/radios.html @@ -91,51 +91,6 @@ {% endmacro %} -{% macro branding_radios( - field, - hint=None, - branding_dict={}, - show_header=True -) %} -