Commit Graph

3753 Commits

Author SHA1 Message Date
Chris Hill-Scott
6b703614b9 Merge pull request #3280 from alphagov/swap-nav-order-org-users
Swap order of usage and team members in navigation when organisation users are looking at a service
2020-02-11 11:21:14 +00:00
karlchillmaid
f7e1e35dcb Remove commented-out content
Co-Authored-By: Tom Byers <tombaromba@gmail.com>
2020-02-06 16:06:00 +00:00
karlchillmaid
77590bb9d3 Remove commented-out content
Co-Authored-By: Tom Byers <tombaromba@gmail.com>
2020-02-06 16:05:32 +00:00
karlchillmaid
d646238a01 Remove commented-out content
Co-Authored-By: Tom Byers <tombaromba@gmail.com>
2020-02-06 16:03:48 +00:00
karlchillmaid
ccb783c43b Update app/templates/views/guidance/index.html
Co-Authored-By: Tom Byers <tombaromba@gmail.com>
2020-02-06 16:02:41 +00:00
karlchillmaid
a5c77a6fc3 Remove commented-out content 2020-02-06 16:01:23 +00:00
karlchillmaid
74874ee78d Remove commented-out content 2020-02-06 15:59:07 +00:00
karlchillmaid
79373909bd Add 'add' 2020-02-06 12:54:27 +00:00
karlchillmaid
5775ccb5b1 Change callout to inset text 2020-02-06 12:30:22 +00:00
karlchillmaid
c7983c2396 Update app/templates/views/get-started.html
Fix b tag

Co-Authored-By: Tom Byers <tombaromba@gmail.com>
2020-02-05 09:24:59 +00:00
Leo Hemsted
5b868ff268 remove api keys from codebase
these are just used for tests so don't need to look like real api keys.
2020-02-04 14:44:19 +00:00
karlchillmaid
ca5a92c682 Comment out 'Upload your own letters'
Comment out 'Upload your own letters'  because this feature is not available to all users yet.
2020-02-04 13:51:43 +00:00
karlchillmaid
92ad395fca Comment out and update content
Comment out and update content because Upload a letter is not available to all users yet.
2020-02-04 13:50:29 +00:00
karlchillmaid
fcf1494051 Update links - comment out Send messages 2020-02-03 15:04:48 +00:00
karlchillmaid
b0e539abba Fix </ol> tag 2020-02-03 14:25:28 +00:00
karlchillmaid
6d4d176039 Edit content 2020-02-03 13:29:58 +00:00
karlchillmaid
76f46e47d7 Update description 2020-02-03 13:26:02 +00:00
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
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
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
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
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
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
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