Commit Graph

3956 Commits

Author SHA1 Message Date
Chris Hill-Scott
d7f42a868c Merge pull request #2244 from alphagov/request-letter-branding
Tell people they can have their logo on letters
2018-08-29 15:52:58 +01:00
Sakis
162fd3773e Merge pull request #2258 from alphagov/remove-header-check-preview
Disable paas-proxy header check on preview
2018-08-29 14:58:54 +01:00
Pete Herlihy
1569babc57 Update service count to 346 and orgs to 112 2018-08-29 11:41:30 +01:00
Athanasios Voutsadakis
c7cce495bd Disable paas-proxy header check on preview
See: https://github.com/alphagov/notifications-api/pull/2052
2018-08-28 13:58:31 +01:00
Chris Hill-Scott
b0694977c2 Alias Barking and Dagenham council’s domain 2018-08-28 09:47:24 +01:00
Chris Hill-Scott
cfc41085a1 Mark agreement signed by Mid Sussex District Council 2018-08-24 17:20:29 +01:00
Rebecca Law
54b63ed5e5 Merge pull request #2249 from alphagov/add-brand-type-to-email-branding
Add brand type to email branding.
2018-08-24 13:50:36 +01:00
Rebecca Law
be050657f6 Default the brand_type for new email brands 2018-08-24 13:11:40 +01:00
Chris Hill-Scott
74b480d967 Mark agreement signed by Herefordshire council 2018-08-24 12:24:31 +01:00
Rebecca Law
2b08b84c9e Merge branch 'master' into add-brand-type-to-email-branding 2018-08-24 11:09:31 +01:00
Rebecca Law
f7f202b670 Fix the EmailBranding 2018-08-23 17:44:34 +01:00
Rebecca Law
34d938ce18 Add brand type to email branding.
Removed banner_colour and single_id_colour.
We only really need one colour now.
2018-08-23 14:21:41 +01:00
Chris Hill-Scott
d68cc68def Make page title semi-consistent
We tend to use ‘Add’ rather than ‘Create’ in other places.
2018-08-23 09:52:50 +01:00
Chris Hill-Scott
9b9acfa291 Select a branding with a link, not form
Selecting a branding just takes you to a new page, it doesn’t change
any state.

Links are generally the way you go from one page to another on the web.
2018-08-23 09:52:50 +01:00
Chris Hill-Scott
1e28fe4ffd Remove redundant argument
This `branding_dict` is not used in the Jinja template anywhere.
2018-08-23 09:51:33 +01:00
Chris Hill-Scott
0e7ed2b0cf Put ‘add new’ button at top of page
One of the most frequent tasks done on this page is adding a new
branding.

Current to do this you have to:
- scroll to the bottom
- scan for the ‘Create a new email branding’ option that visually looks
  just like all the other brandings
- submit a form

This commit makes change it to one clearly differentiated button at the
top of the page. This is consistent for how we let users add templates
and team members.
2018-08-23 09:49:23 +01:00
Tom Byers
cff43abfc6 Add live-search to /email-branding page 2018-08-22 19:03:46 +01:00
Tom Byers
3ea94128c6 Add live-search to set-email-branding page 2018-08-22 19:03:38 +01:00
Tom Byers
47798b218c Make live-search into a component 2018-08-22 17:42:04 +01:00
Chris Hill-Scott
3483490f03 Fix colour preview not loading on page load
The event was changed from `change` to `input`. The trigger was not updated accordingly.
2018-08-22 16:51:16 +01:00
Chris Hill-Scott
b10f0747ae Use input event not keyup
The `oninput` event is a more performant way to detect changes to a
textbox’s contents (compared to `onkeydown`, `onpaste`, etc).

It’s not supported in older browsers, but since this is a likely to be
used by platform admin users only that’s OK.
2018-08-22 16:31:05 +01:00
Chris Hill-Scott
6501105768 Refactor to not repeat lots of Jinja code 2018-08-22 16:31:05 +01:00
Chris Hill-Scott
b73e42650d Refactor hex colour preview Javascript
This commit improves the code that previews a hex colour when setting up
or changing an email branding.

Specifically it:
- refactors the Javascript to conform to our patterns (module pattern,
  preprocessed with Gulp)
- makes the code work when there are multiple colour previews on one
  page

It also does some visual prettifying, because I couldn’t help myself…
2018-08-22 16:31:05 +01:00
Chris Hill-Scott
864e732c38 Merge pull request #2241 from alphagov/add-colours-and-domain-to-email-branding
New columns for email branding
2018-08-22 16:29:42 +01:00
Rebecca Law
473c8378fc Created a method to decide which colour to pass into the notifications-utils method to preview the template.
Removed the ServiceCreateEmailBranding form - it is identical to the other form.
2018-08-22 12:56:08 +01:00
Chris Hill-Scott
b2d8937f94 Tweak wording 2018-08-21 15:19:26 +01:00
Chris Hill-Scott
0b86a12fdd Tell people they can have their logo on letters
At the moment there’s nothing in Notify that says the logo on letter
templates can be changed from ‘HM Government’. While some people guess
that it’s possible, or are motivated enough to enquire, others might be
assuming that the branding can’t be changed (and thus deciding Notify
letters aren’t for them).

In the future we should make this process slicker (eg with a file
upload) but the easiest, quickest improvement to make for now is:
- let people know that the branding can be changed
- direct them to support if they do want to change it
2018-08-21 09:56:20 +01:00
Chris Hill-Scott
7530fbf731 Fix the tests and catch a few more examples 2018-08-20 18:05:46 +01:00
karlchillmaid
36e8a9b3cc Corrected the page title
Corrected the page title to 'Data retention'
2018-08-20 16:59:35 +01:00
karlchillmaid
60f64ee5e5 'Email reply-to address' updated
Updated 'reply-to address' to include a hyphen
2018-08-20 16:50:56 +01:00
karlchillmaid
e18f1727d1 'Email reply-to addresses' updated
Updated 'reply-to address' to include a hyphen
2018-08-20 16:48:21 +01:00
karlchillmaid
2c635faf5f 'Email reply-to address' updated
Updated 'reply-to address' to include a hyphen
2018-08-20 16:46:28 +01:00
karlchillmaid
15ed2e624a 'Email reply-to address' updated
Updated 'reply-to address' to include a hyphen
2018-08-20 16:45:08 +01:00
karlchillmaid
fb717e6933 'Email reply-to address' updated
Updated 'reply-to address' to include a hyphen
2018-08-20 16:43:42 +01:00
karlchillmaid
abed956a5a 'Email reply-to address' label change
Updated 'reply-to address' to include a hyphen
2018-08-20 16:41:16 +01:00
Rebecca Law
3fda171f80 New columns for email branding
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.
2018-08-20 13:27:17 +01:00
fidejoseph
3fbe85cdf8 Update email_domains.yml
update: hscni.net
2018-08-20 12:14:03 +01:00
Pete Herlihy
bbccbd8784 Adding derrystrabane.com (local council)
For *reasons* they've gone with dot com addresses.
2018-08-17 15:12:24 +01:00
Katie Smith
43e3ddb73a Merge pull request #2233 from alphagov/increase-sms-length
Increase SMS maximum length from 459 to 612
2018-08-17 14:03:29 +01:00
Katie Smith
6b5eaf7fff Improve number formatting on platform-admin page
Minor changes to the number formatting for the `/platform-admin` page to
- Show the complaint percentage to 2 decimal places. (The number of
complaints is often below 0.0% so 1 decimal place isn't useful)
- Format the numbers in the status boxes to use a comma as a thousands
separator.
2018-08-16 16:57:02 +01:00
Katie Smith
1b6c357dea Use new value of SMS_CHAR_COUNT_LIMIT from utils
Admin, API and utils were all defining a value for SMS_CHAR_COUNT_LIMIT.
This value has been updated in notifications-utils to allow text
messages to be 4 fragments long and notifications-admin now gets the value of
SMS_CHAR_COUNT_LIMIT from notifications-utils instead of defining it in
config.
2018-08-16 16:56:32 +01:00
Tom Byers
6249f4826b Merge pull request #2235 from alphagov/sort-branding-radios-alphabetically
Sort branding radios alphabetically
2018-08-16 16:49:12 +01:00
Alexey Bezhan
3a00574034 Merge pull request #2224 from alphagov/notifications-page-data-retention-period
Notifications page data retention period
2018-08-16 13:55:55 +01:00
Tom Byers
f85a9306a6 Move brandings sort into email_branding_client 2018-08-16 13:40:24 +01:00
Pete Herlihy
d5bd220378 Adding fire-uk.org to the list of domains 2018-08-15 16:35:59 +01:00
Tom Byers
853f13c70b Sort email branding selection alphabetically
For branding combinations in service settings and
branding creation/editing in platform admin.
2018-08-15 16:13:27 +01:00
Sakis
85ec7a28cb Merge pull request #2231 from alphagov/zipkin-headers
Both trace_id and span_id headers must be present
2018-08-15 16:10:09 +01:00
Tom Byers
6b0d79ad72 Stop email preview showing brand name
This is a leftover from when email brands didn't
have a 'text' field.

It also adds some tests to check the brand name
is displaying correctly.
2018-08-15 13:52:17 +01:00
Athanasios Voutsadakis
984e09cc6a Both trace_id and span_id headers must be present 2018-08-14 18:12:06 +01:00
Tom Byers
8ba8606963 Merge pull request #2230 from alphagov/add-branding-name-to-ui
Show the 'name' of the email branding in the adding and editing screens
2018-08-14 16:05:56 +01:00