Commit Graph

9362 Commits

Author SHA1 Message Date
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
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
8a91068682 Merge pull request #3312 from alphagov/revert-3311-revert-3295-restyle-template-stats
Revert "Revert "Restyle template statistics and received text messages""
2020-02-19 13:17:56 +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
Pea M. Tyczynska
a8ca8c1835 Merge pull request #3311 from alphagov/revert-3295-restyle-template-stats
Revert "Restyle template statistics and received text messages"
2020-02-18 15:04:59 +00:00
Pea M. Tyczynska
e97f9f7fa4 Merge pull request #3310 from alphagov/fix-reset-password
Fix reset password flow
2020-02-18 15:03:11 +00:00
Chris Hill-Scott
6bdd776780 Revert "Restyle template statistics and received text messages" 2020-02-18 14:58:33 +00:00
Pea Tyczynska
3a93fe6892 Fix reset password flow
It was broken because of mismatch in update password argument
2020-02-18 14:50:27 +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
Chris Hill-Scott
583213c29f Merge pull request #3309 from alphagov/conversation-title
Updating the page title attribute on text message conversations
2020-02-18 13:44:35 +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
Tom Byers
0335e7ad17 Give dashboard banner items some vertical space
Giving the count-label some vertical margin means
it has enough space when the flexbox contents
wrap.

This requires a bit extra on the top to counter
the negative margin the count has subtracting 5px
from the parent box.
2020-02-18 13:14:56 +00:00
Tom Byers
08781a497f Update app/assets/stylesheets/components/banner.scss
Put borders back on dashboard banner focus state

Co-Authored-By: Chris Hill-Scott <me@quis.cc>
2020-02-18 11:55:20 +00:00
Tom Byers
6911319298 Update app/assets/stylesheets/components/banner.scss
Adjustment to the vertical padding on the dashboard

Co-Authored-By: Chris Hill-Scott <me@quis.cc>
2020-02-18 11:54:26 +00:00
Tom Byers
484bcfbae7 Update app/assets/stylesheets/components/banner.scss
Slight adjustment to vertical spacing on the dashboard banner count. See: https://github.com/alphagov/notifications-admin/pull/3295#discussion_r380616204

Co-Authored-By: Chris Hill-Scott <me@quis.cc>
2020-02-18 11:53:21 +00:00
Pea M. Tyczynska
49eb2a8354 Merge pull request #3281 from alphagov/re-validate-email
Check access to email address after 90 days
2020-02-18 11:10:31 +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
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
e413798b4d Change email_access_validated_at formatting to be more in line with other dates on User model 2020-02-17 11:34:25 +00:00
Pea Tyczynska
7d460fe483 Move date-checking logic to utils and unit test it 2020-02-17 11:34:25 +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
Katie Smith
a4fb1b6c06 Merge pull request #3290 from alphagov/frontend-buttons
Update buttons to use govuk-frontend component
2020-02-17 10:07:24 +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
Katie Smith
f40f709e4f Stop importing old style buttons 2020-02-17 08:05:05 +00:00
Katie Smith
e53a97423b Update radio-select to use govuk-frontend buttons 2020-02-17 08:05:05 +00:00
Katie Smith
0d0b71af63 Update buttons on api key pages to govuk-frontend buttons 2020-02-17 08:05:05 +00:00
Katie Smith
485d25b120 Update start button on signed out homepage 2020-02-17 08:05:05 +00:00
Katie Smith
e53c5e17b3 Update file upload component to use govuk-frontend buttons 2020-02-17 08:05:05 +00:00
Katie Smith
2cbfaf1b6f Update the buttons on template folder form 2020-02-17 08:05:05 +00:00
Katie Smith
583a925e89 Add buttons for list entries
As part of updating the stylesheet, moved `.button-secondary` to the
global stylesheet, since this is not related to list entries but instead
affects all buttons with that class (this class wlil be removed once all
the buttons are using the new macro).
2020-02-17 08:05:05 +00:00
Katie Smith
4e42fa6f5d Update buttons for collapsible checkboxes
We use collapsible checkboxes when setting which folders team members
can see (on the manage folder page and on the edit team member page).
2020-02-17 08:05:05 +00:00
Katie Smith
ba8ac41953 Update Javascript tests
This only updates the JavaScript tests where we don't need to make changes to
the actual JavaScript too.
2020-02-17 08:05:05 +00:00
Katie Smith
a26e8c55ef Remove unused pages with buttons
We had two templates that contained a link styled as an old style
button but that weren't being used anywhere (one would actually give a
`500` if you tried to visit it). This removes them and the view function
for one of them (the other no longer had a view function).
2020-02-17 08:05:05 +00:00
Katie Smith
dca6d1690f Use govuk-button in page footer component 2020-02-17 08:05:05 +00:00
Katie Smith
ac41a22329 Use new button in banner macro
This means we can delete a class from the banner scss.
2020-02-17 08:05:05 +00:00
Katie Smith
9c9fffcbb1 Add buttons that require extra spacing
These get added using the macro as usual, but with the special spacing
classes added to ensure there's no change to their appearance.
2020-02-17 08:05:05 +00:00
Katie Smith
7ff8b73088 Update buttons that are inline with search box
There were 3 pages where we had a search button inline with a text box.
This replaces the search button with a button from govuk-frontend and
updates the way we style this button to use BEM, which is the style we
now want to use.
2020-02-17 08:05:05 +00:00
Katie Smith
f3bb93f460 Replace straightforward buttons and links styled like buttons
This replaces the buttons that aren't part of a macro and that we don't
need to write additional styles for with their govuk-frontend equivalent.

There were some links that were styled to look like buttons, so these
have also been replaced with the new govuk-frontend macro.

There was one button on the `choose-account.html` template that was in a
section of code that was never reached - this has been deleted.
2020-02-17 08:05:05 +00:00
Katie Smith
a62658ce8c Add override to govuk-frontend button
The button style we were using had no bottom margin, but the
govuk-frontend button has a bottom margin of 10px. This override removes
the added margin to keep the look of our buttons consistent.
2020-02-17 08:05:05 +00:00
Katie Smith
66967e1d96 Import / require all code for the govuk frontend button 2020-02-17 08:05:05 +00:00
Tom Byers
97d6855ff7 Merge pull request #3301 from alphagov/fix-details-on-pricing-page
Use details component on pricing page
2020-02-14 14:52:42 +00:00
Tom Byers
1b1591cf20 Use details component on pricing page
Native `<details>` elements will work in most
evergreen browsers but the details component from
GOVUK Frontend adds missing accessibility
information through ARIA.
2020-02-14 14:41:17 +00:00
Tom Byers
51594cdcf7 Merge pull request #3298 from alphagov/update-Using-Notify-pages
Update Using Notify pages, features and guidance
2020-02-14 14:10:03 +00:00