From 3eb03695118e5eacbb6b19c665e0f6a5020718d7 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 29 Jul 2016 09:46:02 +0100 Subject: [PATCH 1/7] Tell invited users why we need their phone number Copies the hint text from the normal register page --- app/templates/views/register-from-invite.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/register-from-invite.html b/app/templates/views/register-from-invite.html index df9cf8221..38b277c31 100644 --- a/app/templates/views/register-from-invite.html +++ b/app/templates/views/register-from-invite.html @@ -14,7 +14,7 @@ Create an account – GOV.UK Notify

Your account will be created with this email: {{email_address}}

{{ textbox(form.name, width='3-4') }} - {{ textbox(form.mobile_number, width='3-4') }} + {{ textbox(form.mobile_number, width='3-4', hint='We’ll send you a verification code by text message') }} {{ textbox(form.password, hint="Your password must have at least 10 characters", width='3-4') }} {{ page_footer("Continue") }} {{form.service}} From 52cdf389b01b17fa4105a23d2dc01f3449ee72ab Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 1 Aug 2016 07:41:16 +0100 Subject: [PATCH 2/7] Upgrade GOV.UK template Full changes: https://github.com/alphagov/govuk_template/compare/v0.17.1...v0.18.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e51d2b135..c3f8fd139 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "diff-dom": "2.0.3", "govuk-elements-sass": "1.1.1", "govuk_frontend_toolkit": "4.6.0", - "govuk_template_jinja": "https://github.com/alphagov/govuk_template/releases/download/v0.17.1/jinja_govuk_template-0.17.1.tgz", + "govuk_template_jinja": "https://github.com/alphagov/govuk_template/releases/download/v0.18.0/jinja_govuk_template-0.18.0.tgz", "gulp": "3.9.0", "gulp-add-src": "0.2.0", "gulp-babel": "6.1.1", From e6a0382243b5daaa567cf80f620b595a24afd45e Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 1 Aug 2016 07:33:30 +0100 Subject: [PATCH 3/7] Make page on API info match page heading Otherwise you might get it mixed up with the API integration page when you have a bunch of tabs open. --- app/templates/views/send-from-api.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/send-from-api.html b/app/templates/views/send-from-api.html index 50536c2a0..9add19598 100644 --- a/app/templates/views/send-from-api.html +++ b/app/templates/views/send-from-api.html @@ -4,7 +4,7 @@ {% from "components/api-key.html" import api_key %} {% block page_title %} - API integration – GOV.UK Notify + API info – GOV.UK Notify {% endblock %} {% block maincolumn_content %} From d673cb1e9ca51f0e11b25dfeb989a75a8620e78c Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott <me@quis.cc> Date: Mon, 1 Aug 2016 10:19:59 +0100 Subject: [PATCH 4/7] Make page title match on API integration --- app/templates/views/api-keys.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/api-keys.html b/app/templates/views/api-keys.html index 34dac7304..78ba560ed 100644 --- a/app/templates/views/api-keys.html +++ b/app/templates/views/api-keys.html @@ -3,7 +3,7 @@ {% from "components/api-key.html" import api_key %} {% block page_title %} - API keys – GOV.UK Notify + API integration – GOV.UK Notify {% endblock %} {% block maincolumn_content %} From 7d99308d4e0463efefb0f61bc64c7b04da3a3ef0 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott <me@quis.cc> Date: Fri, 29 Jul 2016 08:36:35 +0100 Subject: [PATCH 5/7] Fix Markdown/HTML email oddities Depends on: - [ ] https://github.com/alphagov/notifications-utils/pull/59 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4594e6bb3..c893e6bb8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,4 +19,4 @@ pytz==2016.4 git+https://github.com/alphagov/notifications-python-client.git@1.0.0#egg=notifications-python-client==1.0.0 -git+https://github.com/alphagov/notifications-utils.git@8.6.0#egg=notifications-utils==8.6.0 +git+https://github.com/alphagov/notifications-utils.git@8.6.1#egg=notifications-utils==8.6.1 From 06d6718035cef756f0ed05fcc8d2f768e6d899a7 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott <me@quis.cc> Date: Mon, 1 Aug 2016 11:15:46 +0100 Subject: [PATCH 6/7] Update to correct version Got mixed up on https://github.com/alphagov/notifications-admin/pull/816 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c893e6bb8..a1ce67cba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,4 +19,4 @@ pytz==2016.4 git+https://github.com/alphagov/notifications-python-client.git@1.0.0#egg=notifications-python-client==1.0.0 -git+https://github.com/alphagov/notifications-utils.git@8.6.1#egg=notifications-utils==8.6.1 +git+https://github.com/alphagov/notifications-utils.git@8.7.1#egg=notifications-utils==8.7.1 From 30261cf385fea305b5e3c39d9215b9271b3e29ab Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott <me@quis.cc> Date: Mon, 1 Aug 2016 14:25:28 +0100 Subject: [PATCH 7/7] Fix newlines in HTML emails This problem was masked because the email message component was also replacing newlines with `<br>`s. Implements: - [ ] https://github.com/alphagov/notifications-utils/pull/60 --- app/templates/components/email-message.html | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/components/email-message.html b/app/templates/components/email-message.html index 6099d4341..9766c17d6 100644 --- a/app/templates/components/email-message.html +++ b/app/templates/components/email-message.html @@ -50,7 +50,7 @@ {% if not expanded %} <div class="email-message-body-wrapper"> {% endif %} - {{ body|nl2br }} + {{ body }} {% if not expanded %} </div> <div class='toggle' tabindex='0'>...<span class='visually-hidden'>show full email</span></div> diff --git a/requirements.txt b/requirements.txt index a1ce67cba..b04cc336c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,4 +19,4 @@ pytz==2016.4 git+https://github.com/alphagov/notifications-python-client.git@1.0.0#egg=notifications-python-client==1.0.0 -git+https://github.com/alphagov/notifications-utils.git@8.7.1#egg=notifications-utils==8.7.1 +git+https://github.com/alphagov/notifications-utils.git@8.7.2#egg=notifications-utils==8.7.2