From 2794187e2df550095c5cde7cbbe7797258256f1d Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Tue, 13 Aug 2019 10:35:35 +0100 Subject: [PATCH 1/3] Bump utils to 33.3.0 --- requirements-app.txt | 2 +- requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-app.txt b/requirements-app.txt index dc565f60c..dce4074d8 100644 --- a/requirements-app.txt +++ b/requirements-app.txt @@ -23,5 +23,5 @@ awscli-cwlogs>=1.4,<1.5 # Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default itsdangerous==0.24 # pyup: <1.0.0 -git+https://github.com/alphagov/notifications-utils.git@36.2.1#egg=notifications-utils==36.2.1 +git+https://github.com/alphagov/notifications-utils.git@36.3.0#egg=notifications-utils==36.3.0 git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.3.0-alpha#egg=govuk-frontend-jinja==0.3.0-alpha diff --git a/requirements.txt b/requirements.txt index ae6352185..334fb0431 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,7 +25,7 @@ awscli-cwlogs>=1.4,<1.5 # Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default itsdangerous==0.24 # pyup: <1.0.0 -git+https://github.com/alphagov/notifications-utils.git@36.2.1#egg=notifications-utils==36.2.1 +git+https://github.com/alphagov/notifications-utils.git@36.3.0#egg=notifications-utils==36.3.0 git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.3.0-alpha#egg=govuk-frontend-jinja==0.3.0-alpha ## The following requirements were added by pip freeze: @@ -33,7 +33,7 @@ awscli==1.16.292 bleach==3.1.0 boto3==1.9.221 botocore==1.13.28 -certifi==2019.9.11 +certifi==2019.11.28 chardet==3.0.4 Click==7.0 colorama==0.4.1 From da414beab9c3437e3b0ec54a50c1ba335eeca4ab Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Thu, 8 Aug 2019 16:23:59 +0100 Subject: [PATCH 2/3] Update pricing page with full welsh alphabet for SMS accented characters rather than special characters. call them accented as special is a bit wishy washy and doesn't explain what they actually are. "Diacritics" is correct but too technical. Accented characters is a happy middle ground screanreaders struggle to distinguish accented letters, capitals, etc, so by having a simple two column layout we can have the full unicode glyph name, removing any ambiguity. --- app/templates/views/pricing/index.html | 72 ++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 3 deletions(-) diff --git a/app/templates/views/pricing/index.html b/app/templates/views/pricing/index.html index 176709188..5b94dd1ae 100644 --- a/app/templates/views/pricing/index.html +++ b/app/templates/views/pricing/index.html @@ -1,5 +1,4 @@ {% from "components/table.html" import mapping_table, row, text_field, field, row_heading %} -{% from "components/textbox.html" import textbox %} {% from "components/live-search.html" import live_search %} {% extends "content_template.html" %} @@ -64,10 +63,76 @@ {% endfor %} {% endcall %} -

Long text messages containing Welsh characters (Â, â, Ê, ê, Î, î, Ô, ô, Û, û, Ŵ, ŵ, Ŷ, and ŷ) are charged differently:

+

Accents and accented characters

+

Some languages, such as Welsh, use accented characters.

+

Text messages containing the following accented characters are charged at the normal rate: Ä, É, Ö, Ü, à, ä, é, è, ì, ò, ö, ù, ü.

+

Using other accented characters can increase the cost of sending text messages.

+

+ Accented characters that affect text message charges +
+ {% call mapping_table( + caption='Accented characters that affect text message charges', + field_headings=['Character', 'Description'], + field_headings_visible=True, + caption_visible=False + ) %} + {% for letter, description in [ + ('Â', 'Capital letter A with circumflex'), + ('Á', 'Capital letter A with acute'), + ('À', 'Capital letter A with grave'), + ('Ê', 'Capital letter E with circumflex'), + ('È', 'Capital letter E with grave'), + ('Ë', 'Capital letter E with dieresis'), + ('Î', 'Capital letter I with circumflex'), + ('Í', 'Capital letter I with acute'), + ('Ì', 'Capital letter I with grave'), + ('Ï', 'Capital letter I with dieresis'), + ('Ô', 'Capital letter O with circumflex'), + ('Ó', 'Capital letter O with acute'), + ('Ò', 'Capital letter O with grave'), + ('Û', 'Capital letter U with circumflex'), + ('Ú', 'Capital letter U with acute'), + ('Ù', 'Capital letter U with grave'), + ('Ŵ', 'Capital letter W with circumflex'), + ('Ẃ', 'Capital letter W with acute'), + ('Ẁ', 'Capital letter W with grave'), + ('Ẅ', 'Capital letter W with dieresis'), + ('Ŷ', 'Capital letter Y with circumflex'), + ('Ý', 'Capital letter Y with acute'), + ('Ỳ', 'Capital letter Y with grave'), + ('Ÿ', 'Capital letter Y with dieresis'), + ('â', 'Lower case letter a with circumflex'), + ('á', 'Lower case letter a with acute'), + ('ê', 'Lower case letter e with circumflex'), + ('ë', 'Lower case letter e with dieresis'), + ('î', 'Lower case letter i with circumflex'), + ('í', 'Lower case letter i with acute'), + ('ï', 'Lower case letter i with dieresis'), + ('ô', 'Lower case letter o with circumflex'), + ('ó', 'Lower case letter o with acute'), + ('û', 'Lower case letter u with circumflex'), + ('ú', 'Lower case letter u with acute'), + ('ŵ', 'Lower case letter w with circumflex'), + ('ẃ', 'Lower case letter w with acute'), + ('ẁ', 'Lower case letter w with grave'), + ('ẅ', 'Lower case letter w with dieresis'), + ('ŷ', 'Lower case letter y with circumflex'), + ('ý', 'Lower case letter y with acute'), + ('ỳ', 'Lower case letter y with grave'), + ('ÿ', 'Lower case letter y with dieresis'), + ] %} + {% call row() %} + {{ text_field(letter) }} + {{ text_field(description) }} + {% endcall %} + {% endfor %} + {% endcall %} +
+
+
{% call mapping_table( - caption='Text message pricing', + caption='Pricing for text messages containing accented characters that affect the charges', field_headings=['Message length', 'Charge'], field_headings_visible=True, caption_visible=False @@ -86,6 +151,7 @@ {% endfor %} {% endcall %}
+

Sending text messages to international numbers

It might cost more to send text messages to international numbers than UK ones, depending on the country.

From 6b0b0dd263e4b7ce240bf4053fb5fb11d30e98fc Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Thu, 15 Aug 2019 12:23:21 +0100 Subject: [PATCH 3/3] Change method of getting scrollTop The current method reports `0` in Safari, whatever the scroll position. Some testing across our browser matrix shows: 1. this is also the case on IOS 2. browsers in the matrix all support `$(window).scrollTop()` https://scroll-position-test-page.glitch.me/#results This changes the method to use `$(window).scrollTop()` instead. --- app/assets/javascripts/fullscreenTable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/fullscreenTable.js b/app/assets/javascripts/fullscreenTable.js index 5f3cd073a..99bfc7313 100644 --- a/app/assets/javascripts/fullscreenTable.js +++ b/app/assets/javascripts/fullscreenTable.js @@ -65,7 +65,7 @@ this.maintainHeight = () => { let height = Math.min( - $(window).height() - this.topOffset + $('html, body').scrollTop(), + $(window).height() - this.topOffset + $(window).scrollTop(), this.nativeHeight );