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

Merge pull request #3025 from alphagov/bump-utils

Browse Source 
Bump utils to add alt text to email branding
This commit is contained in:
Katie Smith
2019-06-26 10:22:10 +01:00
committed by GitHub
parent 0dddd0f5dc a9ff4b1d48
commit 458b37d0aa
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/main/views/index.py
View File

@@ -112,19 +112,21 @@ def email_template():
branding_type = email_branding['brand_type'] branding_type = email_branding['brand_type']
if branding_type == 'govuk': if branding_type == 'govuk':
brand_name = None brand_text = None
brand_colour = None brand_colour = None
brand_logo = None brand_logo = None
govuk_banner = True govuk_banner = True
brand_banner = False brand_banner = False
brand_name = None
else: else:
colour = email_branding['colour'] colour = email_branding['colour']
brand_name = email_branding['text'] brand_text = email_branding['text']
brand_colour = colour brand_colour = colour
brand_logo = ('https://{}/{}'.format(get_logo_cdn_domain(), email_branding['logo']) brand_logo = ('https://{}/{}'.format(get_logo_cdn_domain(), email_branding['logo'])
if email_branding['logo'] else None) if email_branding['logo'] else None)
govuk_banner = branding_type in ['govuk', 'both'] govuk_banner = branding_type in ['govuk', 'both']
brand_banner = branding_type == 'org_banner' brand_banner = branding_type == 'org_banner'
brand_name = email_branding['name']
template = { template = {
'subject': 'foo', 'subject': 'foo',
@@ -174,10 +176,11 @@ def email_template():
resp = make_response(str(HTMLEmailTemplate( resp = make_response(str(HTMLEmailTemplate(
template, template,
govuk_banner=govuk_banner, govuk_banner=govuk_banner,
brand_name=brand_name, brand_text=brand_text,
brand_colour=brand_colour, brand_colour=brand_colour,
brand_logo=brand_logo, brand_logo=brand_logo,
brand_banner=brand_banner, brand_banner=brand_banner,
brand_name=brand_name,
))) )))
resp.headers['X-Frame-Options'] = 'SAMEORIGIN' resp.headers['X-Frame-Options'] = 'SAMEORIGIN'

2
requirements-app.txt
View File

@@ -23,4 +23,4 @@ awscli-cwlogs>=1.4,<1.5
# Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default # Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default
itsdangerous==0.24 # pyup: <1.0.0 itsdangerous==0.24 # pyup: <1.0.0
git+https://github.com/alphagov/notifications-utils.git@32.0.1#egg=notifications-utils==32.0.1 git+https://github.com/alphagov/notifications-utils.git@33.0.0#egg=notifications-utils==33.0.0

8
requirements.txt
View File

@@ -25,13 +25,13 @@ awscli-cwlogs>=1.4,<1.5
# Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default # Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default
itsdangerous==0.24 # pyup: <1.0.0 itsdangerous==0.24 # pyup: <1.0.0
git+https://github.com/alphagov/notifications-utils.git@32.0.1#egg=notifications-utils==32.0.1 git+https://github.com/alphagov/notifications-utils.git@33.0.0#egg=notifications-utils==33.0.0
## The following requirements were added by pip freeze: ## The following requirements were added by pip freeze:
awscli==1.16.181 awscli==1.16.185
bleach==3.1.0 bleach==3.1.0
boto3==1.6.16 boto3==1.6.16
botocore==1.12.171 botocore==1.12.175
certifi==2019.6.16 certifi==2019.6.16
chardet==3.0.4 chardet==3.0.4
Click==7.0 Click==7.0
@@ -61,7 +61,7 @@ PyJWT==1.7.1
PyPDF2==1.26.0 PyPDF2==1.26.0
python-dateutil==2.8.0 python-dateutil==2.8.0
python-json-logger==0.1.11 python-json-logger==0.1.11
PyYAML==3.13 PyYAML==4.2b1
redis==3.2.1 redis==3.2.1
requests==2.22.0 requests==2.22.0
rsa==3.4.2 rsa==3.4.2