Commit Graph

3537 Commits

Author SHA1 Message Date
Tom Byers
58c08ad89b Replace browse-list links 2020-02-25 10:52:03 +00:00
Tom Byers
ee9f348ce4 Update all links to use GOVUK Frontend style
Includes:
- turning off :visited styles to match existing
  design
- swapping heading classes used to make links bold
  for the GOVUK Frontend bold override class
- adding visually hidden text to some links to
  make them work when isolated from their context

We may need to revisit whether some links, such as
those for documentation and features, may benefit
from having some indication that their target has
been visited.
2020-02-25 10:47:24 +00:00
Chris Hill-Scott
f2f531a7e6 Summarise scheduled jobs on the dashboard
Scheduled jobs push everything else on the dashboard down, which makes
them very prominent. This is exacerbated by people scheduling more jobs
simultaneously than we expected when we originally designed the feature.

We also want to remove all jobs from the dashboard, in favour of putting
them on the uploads page.

So this commit replaces them with one of our new dashboard banners (used
for received text messages in returned letters) which summarises:
- how many scheduled jobs you have
- when the first one is going out (i.e. how long you have to stop it, if
  you need to)
2020-02-24 17:20:12 +00:00
Chris Hill-Scott
3dab9c2915 Refactor to make it logic clearer
The logic around what gets shown on the uploads page was hard to follow.
This commit makes three changes to hopefully make it easier:
- remove the passing-around of a string containing the contents of a
  rendered partial
- encapsulate everything in one `show_scheduled_jobs` variable, rather
  than mixing between `scheduled_jobs` and
  `current_service.scheduled_jobs`
- adds a comment to explain why we still render `_jobs.html` even when
  we know we have no jobs
2020-02-24 16:38:09 +00:00
Chris Hill-Scott
c20ec82cd2 Show scheduled jobs on page one of the uploads page
This is the same thing we do for caseworking users who don’t have the
dashboard. Since we’re going to summarise scheduled jobs on the
dashboard instead of listing them they need to be listed here instead
(which is where we’ll link to from the dashboard).

Design of this will probably evolve as we work out how to style single
letter uploads and letter jobs, but that’s OK for now because no-one
has the uploads page at the moment.
2020-02-24 16:38:07 +00:00
karlchillmaid
e13dba3763 Merge pull request #3324 from alphagov/change-forgot-to-forgotten
Change forgot to forgotten
2020-02-24 12:45:17 +00:00
karlchillmaid
a33892bded Change 'forgot' to 'forgotten' 2020-02-24 11:59:43 +00:00
karlchillmaid
11808cbf88 Change 'forgot' to 'forgotten' 2020-02-24 11:57:48 +00:00
Tom Byers
5b306dde4d Revert "Convert all links to govuk frontend" 2020-02-24 11:56:38 +00:00
Tom Byers
97172cca30 Merge branch 'master' into convert-all-links-to-govuk-frontend 2020-02-24 10:12:58 +00:00
karlchillmaid
95b41b6bfa Merge pull request #3317 from alphagov/remove-links-from-get-started
Remove links to templates and permissions
2020-02-24 10:04:11 +00:00
karlchillmaid
853b2b137c Remove links to templates and permissions 2020-02-24 09:36:23 +00:00
Chris Hill-Scott
0c8c4b80c9 Merge pull request #3319 from alphagov/fix-guidance-service-links
Fix links to current service pages from guidance
2020-02-21 14:25:12 +00:00
Tom Byers
1513cfa9e6 Update links missed in previous work
Includes those in:
- the static 5xx error page
- validation messaging
- guidance page about trial mode
- links used in tests

Issues raised in https://github.com/alphagov/notifications-admin/pull/3303#issuecomment-589572715
2020-02-21 13:59:04 +00:00
Leo Hemsted
106228ed09 Merge pull request #3320 from alphagov/remove-generic-400-error-page
remove admin 400 error handler
2020-02-21 13:08:53 +00:00
Chris Hill-Scott
60ea2eaa40 Merge pull request #3297 from alphagov/returned-letters-on-dashboard
Put a count of recently returned letters on the dashboard
2020-02-21 12:37:35 +00:00
Leo Hemsted
d83250c7c2 remove the generic 400 error page handler
it just shows a h1, so isn't helpful for people. We can re-use the 500
error page, which includes instructings "Try again later" and
instructions on what to do next (check the status page, email notify
support).

this required refactoring to ensure we can show the 500 error page while
still returning the required status code
2020-02-21 11:58:37 +00:00
Chris Hill-Scott
a5b7e3b93a Add Design System link classes
Co-Authored-By: Tom Byers <tombaromba@gmail.com>
2020-02-21 11:37:01 +00:00
Chris Hill-Scott
da4ff4b448 Add Design System class to remove visited state from links
Co-Authored-By: Tom Byers <tombaromba@gmail.com>
2020-02-21 09:29:37 +00:00
Chris Hill-Scott
75927a8d05 Fix links to current service pages from guidance
This wasn’t working because:
- macros don’t have access to `current_service` from within their scope
- there were no tests for this behaviour
2020-02-20 15:13:12 +00:00
Chris Hill-Scott
e49d665c44 Merge pull request #3304 from alphagov/day-of-week-on-letter-delivery
Put day of week on estimated letter delivery page
2020-02-20 14:00:43 +00:00
Chris Hill-Scott
1dcbf7755a Add a back link to the received messages page
It’s not a top level page (sits within the dashboard) so it should link
back to its parent page.
2020-02-20 12:12:53 +00:00
Chris Hill-Scott
0e8143da04 Remove ‘originally’ from returned letters report
We should remove Originally on the individual report pages.
It sounds like we're saying the letter has been sent more than once
since that date.

The dictionary definition for 'originally' as an adverb says:
> used to describe the situation that existed at the beginning of a
> particular period or activity, especially before something was changed

Examples given include:
> The book was originally published in 1935.
2020-02-20 11:58:58 +00:00
Chris Hill-Scott
678c3df53c Add some context to the list of reports
We reckon people need some context/expectation setting about what the
date of the report is.
2020-02-20 11:58:58 +00:00
Chris Hill-Scott
f369f76ae4 Count recently-returned letters on the dashboard
Currently you have no way of getting to the returned letter page. This
commit adds a link to it from the dashboard, following the pattern of
the new received text messages banner.
2020-02-20 11:58:57 +00:00
Chris Hill-Scott
74e70ed8bc Refactor summaries into model
This lets us encapsulate some of the logic that’s currently cluttering
up the view/template layer.
2020-02-20 11:58:57 +00:00
Tom Byers
5459dd8c13 Fix issues raised on pull request
Includes:
- make 'remove team member' link, on edit member
  permissions page, destructive
- convert missed links on /features pages
- convert missed links on /using-notify/guidance and sub pages
- give links in browse-lists back their size and
  weight (needed for lists of live and trial
  services on Platform Admin)
- give links on Platform Admin inbound numbers
  page back their size and weight
- update links in JS tests
2020-02-20 09:19:06 +00:00
Tom Byers
548265dbe4 Convert warning links to govuk-link--destructive
Converts links in the following:
- the page-footer component
- the table component
- the browse-list component
- the notification status, when reporting failures
- validation messaging in the whitelist page
2020-02-20 09:11:26 +00:00
Tom Byers
c51d414197 Replace links in navigation
Includes:
- removing all styling of those links
  outside of GOV.UK Frontend (except for a few fixes
  due to their interaction with our design)
- bringing together some duplicate styles into one
  block
- changing how links are marked as selected, now
  they have multiple classes

Fix Sass-lint error in navigation.scss
2020-02-20 09:11:26 +00:00
Tom Byers
a61856ffe1 Replace browse-list links 2020-02-20 09:11:26 +00:00
Tom Byers
cd36182ea6 Update all links to use GOVUK Frontend style
Includes:
- turning off :visited styles to match existing
  design
- swapping heading classes used to make links bold
  for the GOVUK Frontend bold override class
- adding visually hidden text to some links to
  make them work when isolated from their context

We may need to revisit whether some links, such as
those for documentation and features, may benefit
from having some indication that their target has
been visited.
2020-02-20 09:11:26 +00:00
Chris Hill-Scott
46e16c64fc Say ‘Uploaded’ for one-off precompiled letters
This calls back to what the user has actively done. _Provided as a PDF_
is more passive and suitable for PDF letters sent using the API.
2020-02-19 17:18:03 +00:00
Chris Hill-Scott
904007201f Make date of sending relative
This is a friendlier and better way of showing dates anywhere except in
a report which might be archived and referred back to later.

Bit trickier to implement here because a dat requires ‘on’ beforehand,
but we don’t say ‘on today’ in English.
2020-02-19 17:11:31 +00:00
karlchillmaid
5ba5ee2502 Merge pull request #3302 from alphagov/guidance-simplify-numbered-lists
Guidance simplify numbered lists
2020-02-19 16:31:31 +00:00
Chris Hill-Scott
46a4e1c612 Add a macro for generating current service links
This is a convenient way of being able to link into pages of the the app
from guidance. It handles the case where the current service is not
known, either because the user hasn’t chosen one, or because they’re not
signed in.

This commit also cleans up some unused Jinja imports.
2020-02-19 08:22:45 +00:00
Chris Hill-Scott
3bbd5381c6 Revert "Revert "Restyle template statistics and received text messages"" 2020-02-18 16:16:51 +00:00
Chris Hill-Scott
6bdd776780 Revert "Restyle template statistics and received text messages" 2020-02-18 14:58:33 +00:00
Chris Hill-Scott
a86f0a6efc Merge pull request #3295 from alphagov/restyle-template-stats
Restyle template statistics and received text messages
2020-02-18 14:30:06 +00:00
Pete Herlihy
f9e2e49dad Updating the page title attribute on text message conversations
Changing to "Received text message"
2020-02-18 13:29:18 +00:00
Chris Hill-Scott
98fba0e451 Update app/templates/views/dashboard/_inbox.html
Co-Authored-By: Tom Byers <tombaromba@gmail.com>
2020-02-18 11:07:40 +00:00
karlchillmaid
f4e4de0d03 Fix settings links 2020-02-18 10:35:21 +00:00
Tom Byers
cd262559cc Refactor dashboard banner CSS and fix its text
Switches the CSS to use flexbox for layout and
uses a macro to let the text support single and
multiple messsages.
2020-02-17 16:44:41 +00:00
Chris Hill-Scott
78ac345148 Put day of week on
This helps people understand how delivery dates fit into the week,
because if sending a letter spans the weekend it will take a bit longer.

We can remove `|string` now because `utc_string_to_aware_gmt_datetime`
now accepts datetimes.
2020-02-17 13:01:37 +00:00
Pea M. Tyczynska
c24a60a6a7 Update content following content review
Co-Authored-By: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>

Also update content for resend email and sms 2FA code page
2020-02-17 11:36:05 +00:00
Pea Tyczynska
caf77341b3 Send 2fa email and move user to waiting page when they need to re-validate email access 2020-02-17 11:34:24 +00:00
Chris Hill-Scott
84df70e520 Use a <caption> for the template statistics table
This is semantically more accurate because it’s describing the whole
table, not just the first column.

Adjusting the font-size to make it sit within the ‘In the last 7 days’
section. Adjusting the spacing because now that we have more borders we
don’t need quite so much whitespace to separate different bits of the
page.
2020-02-17 11:11:53 +00:00
Chris Hill-Scott
42373e3615 Always use smaller font size for totals
This means the font size matches the counts on the usage section, and on
the new received text messages banner.
2020-02-17 10:31:59 +00:00
Chris Hill-Scott
b65b417a08 Restyle inbound text messages
This commit adds a new kind of banner to the dashboard for summarising
things you might need to action.

This way we’ll be able to have multiple instances of this banner on the
same page without it looking too intense.

I never really liked the big blue banner for inbound text messages
because it became the most prominent thing on the page. It was an
interim solution that let us ship the feature until we had something
better.
2020-02-17 10:31:59 +00:00
Chris Hill-Scott
3eb550d297 Remove empty version of show more
We’re not using it now that tables on the dashboard have borders between
the rows.
2020-02-17 09:55:53 +00:00
Chris Hill-Scott
89b88ee4cb Restyle template statistics
This makes the template statistics section of the dashboard look less
like its own weird thing and more like:
- the templates page
- the upcoming changes to the styling of the received text messages
  banner on the dashboard
2020-02-17 09:55:52 +00:00