darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 21:49:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

New columns for email branding

Browse Source 
Added banner_colour, single_id_colour and domain to email branding view. Now able to set the fields.

However, the new fields are not being used yet.
This commit is contained in:
Rebecca Law
2018-08-20 13:27:17 +01:00
parent b6d56af9d4
commit 3fda171f80
7 changed files with 111 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/main/forms.py
View File

@@ -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!')])

13
app/main/views/email_branding.py
View File

@@ -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'))