Commit Graph

7670 Commits

Author SHA1 Message Date
karlchillmaid
0d9f5b27cd Update description of clickable link text
Update description of clickable link text to make it clear we're talking about email. This is because we **do** hide URLs behind clickable link text on web pages.
2020-02-03 13:22:38 +00:00
karlchillmaid
6341c4adb3 Fix </b> tag 2020-02-03 13:11:41 +00:00
karlchillmaid
d9f9205e78 Add instruction 2020-02-03 13:09:55 +00:00
karlchillmaid
83bcd78e44 Delete 'name' from explanation 2020-02-03 13:05:37 +00:00
karlchillmaid
6843930d48 Update link headings 2020-02-03 13:02:55 +00:00
Chris Hill-Scott
8b9c2b7427 Fix tests 2020-02-03 12:47:42 +00:00
Rebecca Law
937c9f2adc Ensure that the session is logged out server side, not just client side.
Anytime a user clicks "sign out" we should be signing them out server side as well. This can be accomplished by setting the Users.current_session_id = null.
I found that the method User.logged_in_elsewhere doesn't need to check if the current_session_id is None. The current_session_ids in the cookie and db (redis or postgres) then the user should be forced to log in again.
2020-02-03 12:24:02 +00:00
Chris Hill-Scott
a35931a33a Swap order of usage and team members for org users
Org users, when looking at the page for their org, see:
> Usage
> Team members

When they click into a service it switches to:
> Team members
> Usage

This is jarring. It should stay consistent. I think it that _Usage_ then
_Team members_ is the natural way of ordering the navigation at the
organisation level, so let’s follow that through to the service level.

This does mean that if someone is a member of both an organisation and a
service that the nav will jump (because it’ll switch to the existing,
service-level order of _Team members_ then _Usage_) but it’s going to
jump anyway because you get all the extra navigation items when you’re a
member of a service.
2020-02-03 11:39:58 +00:00
Chris Hill-Scott
172f93e841 Refactor navigation logic
Will be easier to change if the navigation shown to org users is
separated from the navigation shown to regular users of a service.
2020-02-03 11:39:13 +00:00
Matt Hobbs
9d4b761d12 Minify SVG, other SVG's already optimised 2020-01-29 17:33:56 +00:00
Matt Hobbs
ac405f00f4 Product image optimisations 2020-01-29 16:56:40 +00:00
Matt Hobbs
d87136fb70 Letter template optimisations 2020-01-29 16:54:48 +00:00
Matt Hobbs
bf6cbace2c Image optimisations for the email-template folder. 2020-01-28 10:03:07 +00:00
Matt Hobbs
114ba1f457 Optimisation of the images in the root assets folder 2020-01-28 09:50:56 +00:00
Leo Hemsted
4e1fcfbff1 handle invalid upload errors correctly
previously it assumed that invalid_pages would always exist, however it
might be `None` if the error isn't on a specific page. Errors on
specific pages include a page not being A4 or content being outside the
boundary. Errors not on specific pages include the file not being a pdf,
or containing too many pages
2020-01-27 15:11:37 +00:00
karlchillmaid
c0bafc26fe Add link to Guidance and fix formatting
Add link to Guidance and add bold to instructions for consistency
2020-01-27 11:58:37 +00:00
Tom Byers
a4ba99b748 Redo send_messages as create_and_send_messages
Reverts changes in the following commits:
- 1e8ba88b4d
- 133a62022c
- b76066dd76

These changes `main.create_and_send_messages` to
`main.send_messages` but this name was already
taken.

Further details on Github:

https://github.com/alphagov/notifications-admin/pull/3213#pullrequestreview-348548476
2020-01-27 11:51:24 +00:00
karlchillmaid
87e42cc4bb Revert filename
Reverts part of commit 1af5136f9c
2020-01-27 11:33:39 +00:00
karlchillmaid
885b78eac5 Update if statement and instructions
Update if statement and instructions to make them consistent with the guidance pages.
2020-01-27 09:31:45 +00:00
karlchillmaid
f771e402a0 Fix <ol> tags 2020-01-27 09:15:38 +00:00
karlchillmaid
be09dee10d Fix sign in link 2020-01-27 09:06:28 +00:00
karlchillmaid
96b6d6e6ac Fix sign in link 2020-01-27 09:05:58 +00:00
karlchillmaid
40948af2fd Fix sign in links 2020-01-27 09:05:28 +00:00
karlchillmaid
bc303388d2 Fix sign in link 2020-01-27 09:04:36 +00:00
karlchillmaid
b76066dd76 Update link 2020-01-27 08:54:05 +00:00
karlchillmaid
133a62022c Update link 2020-01-27 08:53:29 +00:00
karlchillmaid
1e8ba88b4d Update link text 2020-01-27 08:51:56 +00:00
karlchillmaid
1af5136f9c Update title, H1 and filename 2020-01-27 08:51:17 +00:00
karlchillmaid
6d9e19a013 Update navigation links 2020-01-27 08:47:47 +00:00
Chris Hill-Scott
822e29138d Fix unclosed list and awkward line breaks 2020-01-24 16:25:32 +00:00
Chris Hill-Scott
d29f23bfc8 Add left hand navigation
Due to the way the navigation dictionaries are built this mean being
less smart about the view method for the guidance pages.
2020-01-24 16:25:32 +00:00
Chris Hill-Scott
da2bc29b40 Merge pull request #3263 from alphagov/fix-new-jobs-showing-as-deleted
Use time to determine why notifications don’t exist
2020-01-24 15:27:29 +00:00
karlchillmaid
4d6ab92d41 Add Using Notify navigation 2020-01-24 12:15:27 +00:00
karlchillmaid
487327cc38 Add guidance to footer
Add guidance to footer, rename 'Delivery status'
2020-01-24 12:01:00 +00:00
karlchillmaid
fff50b97b6 Add more information links 2020-01-24 11:39:50 +00:00
karlchillmaid
d36555aed0 Add bold 2020-01-24 10:29:35 +00:00
karlchillmaid
153e0300ec Add bold 2020-01-24 10:28:38 +00:00
karlchillmaid
87a1df58ef Add bold 2020-01-24 10:22:33 +00:00
karlchillmaid
a2a4ceb8d6 Add bold 2020-01-24 10:20:42 +00:00
Pea M. Tyczynska
ba6b412bca Merge pull request #3268 from alphagov/proper-form-for-letter-branding
Parametrise branding request flow so it serves both email and letter branding
2020-01-23 16:50:41 +00:00
Pea Tyczynska
a578ec23a3 Redirect to template after succesful branding request
if user entered branding request flow from a template.
2020-01-23 16:35:15 +00:00
Pea M. Tyczynska
fdff9d3b83 Ensure gov.uk branding only available for emails and not for letters
Also align and statements
2020-01-23 16:34:58 +00:00
Chris Hill-Scott
365fcb0ff8 Add guidance pages to navigation classes 2020-01-23 16:03:27 +00:00
Leo Hemsted
461ba32f4e Merge pull request #3274 from alphagov/one-more-thing
fix one more place where senders weren't sanitised
2020-01-23 15:38:45 +00:00
Tom Byers
6c2af9e696 Set cookie on document host by removing domain
Cookies using the hostname as a domain will be set
with a prefix of `.` by browsers, it seems to
ensure all subdomains are included in the scope.

When deleting the `seen_cookie_message` cookie we
want to set its domain without a `.` prefix, to
match the domain set by the original code.

Leaving the `domain` attribute out from the cookie
string will ensure the `.` prefix is not set.
2020-01-23 13:17:40 +00:00
Tom Byers
d68403f7dc Merge pull request #3272 from alphagov/stop-removing-ga-cookies
Stop removing GA cookies
2020-01-23 11:32:42 +00:00
Leo Hemsted
f3fa6a67e1 fix one more place where senders weren't sanitised
make sure everything is using the `nl2br` formatter that properly wraps
it in markdown to keep everything sanitised nicely. Also write a couple
of tests
2020-01-22 17:22:01 +00:00
karlchillmaid
b951b6a076 Fix apostrophe 2020-01-22 15:19:34 +00:00
karlchillmaid
f843862f51 Update links to letter spec 2020-01-22 15:14:43 +00:00
Chris Hill-Scott
80fe15f517 Fix links 2020-01-22 14:24:58 +00:00