Commit Graph

6583 Commits

Author SHA1 Message Date
Katie Smith
088d6ee4b0 Content changes for notification pages
This commit adds content pages for the notifications pages, particularly
the letter pages, which will make things clearer now that we will soon be allowing
letters to be cancelled.

The main changes are:
* The confirmation banner for letters sent from a CSV file now states when
printing will start.
* We state the CSV file that notifications were sent from on the
notifications page
* The notification page for letters shows when printing starts (today,
tomorrow, or that date that the letter was printed)
2018-12-03 10:42:47 +00:00
Chris Hill-Scott
07a1d903eb Merge pull request #2550 from fidejoseph/patch-5
Update email_domains.yml
2018-12-03 10:12:51 +00:00
Chris Hill-Scott
c79e8bbcd9 Merge pull request #2552 from alphagov/eastrenfrewshire.gov.uk
Mark agreement signed by East Renfrewshire Council
2018-12-03 10:12:45 +00:00
Chris Hill-Scott
d951919f40 Mark agreement signed by East Renfrewshire Council 2018-11-30 16:20:24 +00:00
Alexey Bezhan
ef4921d2f9 Merge pull request #2534 from alphagov/final_countdown
'Data available for {}' message on job page accounts for flexible data retention
2018-11-29 15:49:27 +00:00
Alexey Bezhan
8295632239 Merge pull request #2538 from alphagov/update-utils-30-7-1
Update utils to 30.7.1 to silence 'Header missing' warnings
2018-11-29 15:34:44 +00:00
Chris Hill-Scott
c41d0d5a1c Merge pull request #2549 from alphagov/cdn-images
Serve images from the CDN
2018-11-29 15:07:50 +00:00
Chris Hill-Scott
643dca0071 Use asset fingerprinter to serve images
This means we can cache them forever, and only invalidate the cache
when the image changes.
2018-11-29 14:31:31 +00:00
fidejoseph
784870fdd8 Update email_domains.yml
Adding careinspectorate.com  - they're a scrutiny body specialising in health and social care, early learning and childcare, social work, children’s services, and community justice
2018-11-29 14:24:22 +00:00
Chris Hill-Scott
8653430669 Merge pull request #2548 from alphagov/fix-app-var
Expose `application` as a variable
2018-11-29 14:10:01 +00:00
Chris Hill-Scott
5bf6bdcd20 Serve images from the CDN
Because it should be quicker than serving them from our app directly.
2018-11-29 14:09:44 +00:00
Chris Hill-Scott
58d3d70a7c Expose application as a variable
This is what Gunicorn is looking for when it’s running the app.

Renaming this variable to `app` has caused the app to break once
deployed on PaaS.

This commit also renames `app` to `flask_app` to make it clear which
app is wrapping which other app.
2018-11-29 14:02:20 +00:00
Chris Hill-Scott
e346bfeb9e Merge pull request #2546 from alphagov/make-whitenoise-audible
Make Whitenoise serve static assets
2018-11-29 13:35:49 +00:00
Chris Hill-Scott
d47e0482d4 Tell browsers not to re-fetch static assets
Since we version our asset filenames there’s no need for a browser to
ever fetch the same file twice. It should always cache fetch from its
own cache.

The accepted way to effect this behaviour is using the expires header,
which is what this argument to `WhiteNoise` does.
2018-11-29 13:22:52 +00:00
Chris Hill-Scott
d58c04d974 Make Whitenoise serve static assets
Currently it’s not configured properly, so isn’t having any effect.
This change makes it wrap the Flask app, so it intercepts any requests
for static content.

Follows the pattern documented in http://whitenoise.evans.io/en/stable/flask.html#enable-whitenoise
2018-11-29 13:22:52 +00:00
Chris Hill-Scott
c3cc4f4ded Merge pull request #2547 from alphagov/fix-asset-fingerprinter-path
Fix asset path in asset fingeprinter
2018-11-29 13:22:23 +00:00
Chris Hill-Scott
dd711f51b3 Fix asset path in asset fingeprinter
The asset fingerprinter was hard coded to always point to `/static`.

It needs to change depending on which environment the app is running
in.
2018-11-29 13:14:52 +00:00
Chris Hill-Scott
9541c02309 Merge pull request #2545 from alphagov/fix-csp-cdn
Fix content security policy for the CDN
2018-11-29 12:25:50 +00:00
Chris Hill-Scott
4e53cafd46 Use NOTIFY_ENVIRONMENT to test if running locally
This matches what we tell people, in the README, to put in their local
environment.sh

It doesn’t matter what Jenkins sets this to, as long as it’s not
`'development'`. We think Jenkins isn’t setting it at all (in which
case the value will be `undefined`)
2018-11-29 12:18:00 +00:00
Chris Hill-Scott
23cc182b6f Get config from current app 2018-11-29 12:07:48 +00:00
Chris Hill-Scott
bc6b9c7af7 Use named arguments for clearer string formatting
Helps when the string is long.

Also helps disambiguate between the CDN domain used for the logos and
those for CSS/JS.
2018-11-29 11:56:01 +00:00
Chris Hill-Scott
fe6610c221 Fix content security policy for the CDN
The CDN URLs aren’t in included in the content security policy. So
browsers will refuse to load them.

This commit:
- adds each of the CDN URLs to the
- only prepend URLs in CSS files with `/static/` if we’re running
  locally (because the CDN URLs are like `static.example.com` not
  `example.com/static`)
2018-11-29 11:29:52 +00:00
Chris Hill-Scott
74459b2f2a Merge pull request #2542 from alphagov/static-domain
Use static domains for static assets
2018-11-29 09:58:38 +00:00
Leo Hemsted
e15c698a81 Merge pull request #2517 from alphagov/new-template-button
html for templates move/new flow
2018-11-28 16:24:16 +00:00
Chris Hill-Scott
b1c0778bde Since moving to putting the admin app on Cloudfront anything on the
`www.notifications.service.gov.uk` domain is:
- not gzipped

The PaaS proxy used to GZip and set headers for anything served from a
path starting with `/static/`:
76dd511a8a/ansible/roles/paas-proxy/templates/admin.conf.j2 (L53-L64)

Anything served from `static.notifications.service.gov.uk` is:
- GZipped
- and as a bonus, cached by Cloudfront where possible (meaning the
requests won’t ever hit our app)

This commit moves to serving static asset from `/static/` to
`static.notifications.service.gov.uk`, to get the above listed benefits.

***

We could do even better by setting long cache expiry headers on the static subdomain (currently they’re only set to cache for 60 seconds). But that’s out of scope for this commit.
2018-11-28 15:50:21 +00:00
Leo Hemsted
1bb7e98722 add fieldsets to template/folder form and update docstrings
also remove erroneous pytest.ini cfg and reset button
2018-11-28 14:14:20 +00:00
Leo Hemsted
d07de58cd9 split out new folder into two separate forms
move_to_new_folder and add_new_folder are now two separate html fields
and form items - so that we can more easily manipulate them on the
front end
2018-11-28 14:14:20 +00:00
Leo Hemsted
6743bd11fa moved existing template folder tests into test_template_folders
also refactored slightly to work with new html, and separate succesful
and bad-permissions test cases
2018-11-28 14:14:20 +00:00
Leo Hemsted
690585c017 move add new folder and move to folder into one dialog box
this lets us combine the two actions to create "Move to a new folder".
If the user hits enter rather than clicking a button, there is a hidden
submit button that (for now) prevents them from taking any action.
A future commit will try and understand what the user might be doing
based on which fields are populated/selected.
2018-11-28 14:14:20 +00:00
Leo Hemsted
9dec9ed626 add new folder from the choose template page 2018-11-28 14:14:20 +00:00
Chris Hill-Scott
b872ba21a7 Merge pull request #2540 from alphagov/socialworkengland.org.uk
Add Social Work England to list of email domains
2018-11-28 10:02:35 +00:00
Chris Hill-Scott
ad4bc57aa6 Add Social Work England to list of email domains
Social Work England will be the new, specialist regulator for social workers in England.

https://www.gov.uk/government/publications/social-work-england-secondary-legislation

https://www.socialworkengland.org.uk
2018-11-28 09:57:38 +00:00
Alexey Bezhan
65f0416b77 Update utils to 30.7.1 to silence 'Header missing' warnings
Brings in changes from https://github.com/alphagov/notifications-utils/pull/553
2018-11-27 15:40:05 +00:00
Chris Hill-Scott
e5f22a3fc2 Merge pull request #2520 from alphagov/pyup-update-whitenoise-4.1.1-to-4.1.2
Update whitenoise to 4.1.2
2018-11-27 10:22:56 +00:00
Chris Hill-Scott
d03b3b3d67 Merge pull request #2537 from alphagov/pyup-update-pyexcel-ods3-0.5.2-to-0.5.3
Update pyexcel-ods3 to 0.5.3
2018-11-27 10:15:26 +00:00
Chris Hill-Scott
dfc3821e96 Merge pull request #2536 from alphagov/pyup-update-pyexcel-io-0.5.9.1-to-0.5.10
Update pyexcel-io to 0.5.10
2018-11-27 10:15:17 +00:00
Chris Hill-Scott
9a589ff98b Merge branch 'master' into pyup-update-whitenoise-4.1.1-to-4.1.2 2018-11-27 10:09:31 +00:00
Chris Hill-Scott
ab9273b215 Freeze requirements 2018-11-27 10:08:26 +00:00
Chris Hill-Scott
98822638d7 Freeze requirements 2018-11-27 09:56:57 +00:00
pyup-bot
ff3be89b8e Update pyexcel-ods3 from 0.5.2 to 0.5.3 2018-11-27 08:03:16 +00:00
pyup-bot
9c74a935b9 Update pyexcel-io from 0.5.9.1 to 0.5.10 2018-11-27 08:03:12 +00:00
Chris Hill-Scott
0000ca6629 Merge pull request #2535 from alphagov/launch-first-class
Launch first class postage feature
2018-11-26 16:33:21 +00:00
Chris Hill-Scott
d5c4c7590c Merge pull request #2531 from alphagov/search-within-folders
Make template search work across folders
2018-11-26 16:30:54 +00:00
Chris Hill-Scott
84a3c80eb4 Launch first class postage feature
This commit makes it available to everyone. Available just means they
can select 1st class for all their letters, if they want it.
2018-11-26 15:53:14 +00:00
Pea Tyczynska
6d00e1dfcb Test Data available message for jobs with flexible data retention 2018-11-26 15:28:09 +00:00
Pea Tyczynska
9d8e602ac8 time_left considers flexible data retention periods
Also update tests
2018-11-26 15:15:06 +00:00
Katie Smith
6e56a4d517 Merge pull request #2533 from alphagov/bump-utils-3.7.0
Bump notifications-utils to 30.7.0
2018-11-26 14:57:50 +00:00
Katie Smith
c48f54aba4 Bump notifications-utils to 30.7.0
Bumped the notifications-utils version. The `gmt_timezones` function in
this repo and the `utc_string_to_aware_gmt_datetime` in
notifications-utils are the same, so have updated the code to always use
the version in utils.
2018-11-26 14:43:42 +00:00
Chris Hill-Scott
7d20846d94 Render selected links with box shadow not outline
Because there’s a mystery 2px gap between the outline and the element in
Firefox.
2018-11-26 11:33:27 +00:00
Chris Hill-Scott
adcd699712 Maintain full width for items without a path 2018-11-26 10:56:48 +00:00