Commit Graph

14648 Commits

Author SHA1 Message Date
pyup-bot
ba5cf7dbad Update pytz from 2020.1 to 2020.4 2020-11-02 13:53:15 +00:00
pyup-bot
2d07dc490b Update pyexcel-io from 0.6.3 to 0.6.4 2020-11-02 13:53:14 +00:00
Tom Byers
36708ccad0 Merge pull request #3700 from alphagov/fix-template-list-item-focus-style
Fix template list item focus style
2020-10-30 15:58:35 +00:00
David McDonald
c620e4425c Merge pull request #3708 from alphagov/send-file-by-email-feature
Remove old line from send file by email feature
2020-10-30 15:19:38 +00:00
David McDonald
79ff26d6b5 Remove old line from send file by email feature
You do not need to contact us to use it anymore. You can set it up
yourself and is documented in our API docs.
2020-10-30 15:10:27 +00:00
Tom Byers
cad8953e25 Fix indent for folder items without ancestors
These make space for the folder icon using
padding-left when they have ancestors as they are
inline so it only effects the line the first link
is on. Without ancestors they are block-level so
padding-left pads the whole block.

We had a block of CSS that fixed this, by using
text-indent for those without ancestors but the
selector was broken by changes to the HTML (it was
no longer the :first-child).

This uses the :first-of-type pseudo-class instead
to ignore preceding elements of different types.

Also includes changes that move styles for links
out from under elements with a class of
.message-name, which was removed in the previous
commit.
2020-10-30 13:44:02 +00:00
Katie Smith
f00217703d Merge pull request #3701 from alphagov/filenames-in-metadata
Store filenames in metadata, not query strings
2020-10-29 14:02:14 +00:00
Katie Smith
6940291c96 Put filename in metadata when sending via a CSV
When sending from an uploaded CSV `.send_messages` now puts the filename
in the metadata. It previously used the query string to pass the
filename to `.check_messages`, where it can be lost.
2020-10-29 13:53:50 +00:00
Katie Smith
a6c103841e Check metadata for file name when sending from contact list
The `.send_from_contact_list` function redirected to `.check_messages`
with `original_file_name` in the query string. Contact lists already
have `original_file_name` as part of their metadata, so we can stop
sending it in the query string and use the metadata instead.
2020-10-29 13:53:50 +00:00
Katie Smith
e07651ed80 Use metadata to store filename when uploading contact list
We were passing `original_file_name` from the `.upload_contact_list`
view function to the `.check_contact_list` view function as a query
param. We now store it in the metadata instead. `.check_contact_list`
still checks for `original_file_name` in the query string if it's not in
the metadata - this is necessary until the code has been deployed for a
few days and we can be sure that there are no contact lists that are
mid-way through the upload stage.
2020-10-29 13:53:50 +00:00
Katie Smith
e074fb0631 Delete unused function 2020-10-29 13:53:50 +00:00
Chris Hill-Scott
9aa2f9cede Merge pull request #3706 from alphagov/still-training-mode
Remove word ‘still’ from training mode slide
2020-10-29 11:42:53 +00:00
Chris Hill-Scott
51af3dcac6 Remove word ‘still’ from training mode slide
You might alternate between training mode and live mode. It’s not like
normal Notify where you start in one mode and then transition out of it
– which is what ‘still’ implies.
2020-10-28 17:20:59 +00:00
Chris Hill-Scott
b6e100448d Merge pull request #3687 from alphagov/remove-custom-getattr
Remove custom `getattr` implementation from JSONModel
2020-10-28 10:46:13 +00:00
Chris Hill-Scott
38e9e84f77 Raise exception when overriding a custom property
If a subclass of `JSONModel` defines a property then we shouldn’t try
to override it with the value from the underlying dictionary.

Rather than silently fail we should raise an exception because it will
help keep our list of `ALLOWED_PROPERTIES` nice and tidy.
2020-10-28 10:08:45 +00:00
Chris Hill-Scott
91eccd2ca7 Merge pull request #3705 from alphagov/full-width-area-list-dashboard
Make list of areas on dashboard use full width
2020-10-28 10:03:50 +00:00
Tom Byers
2d5a165a2d Swap headings for list items in template list
I'm mainly making this change because it's useful
for the CSS that styles the hint text when the
link is focused for the link to have no parent
container.

That being said, there isn't really enough content
underneath these headings to justify them as it is.
I've wrapped them in a list instead because:
- they're structured like a list
- we already called them a `template-list`

This commit also replaces the `message-type` class
on the paragraph below where the headings went,
for consistency. It also removes the CSS for that
class as I couldn't find anywhere else that used
it now.
2020-10-27 21:31:08 +00:00
Tom Byers
0aa1dd89e9 Make hint text focus colour match link 2020-10-27 17:15:58 +00:00
Tom Byers
ae24f7b707 Remove backslash from choose-reply page
Looks like it was missed out from when they were
all changed to chevrons:

e731dd70d1
2020-10-27 17:15:58 +00:00
Tom Byers
a5c87367ee Fix class names of copy template links 2020-10-27 15:55:57 +00:00
Tom Byers
91faa1a874 Fix class names of choose-reply links
The links for templates without ancestors didn't
have a `.template-list-template` class so miss out
on styling given to the other links in the list.
2020-10-27 15:55:57 +00:00
Tom Byers
43d7d0a034 Fix hint text colour contrast when focused
Uses a colour that will be added to the core
palette in GOVUK Frontend.

See: https://design-system.service.gov.uk/styles/colour/#main-colours
2020-10-27 15:55:57 +00:00
Tom Byers
744d76e8d9 Replace old focus CSS for message-name/-type
Template list items without checkboxes use the
`.message-name` and `.message-type` classes for
their links and hints.

This means styles used to expand the focus area
previously are clashing with the new approach.

This removes the old ones and gives
`.message-type` paragraphs a non-static position
to give them a z-position and so raise them above
the expanded link area.
2020-10-27 15:55:57 +00:00
Tom Byers
5058727587 Tweak template-list items on mobile
The font-size goes down to 16px on mobile. This
changes the line-height too which makes it too
small. This bumps it back up the be the same as on
desktop which makes space for the icon (if a
folder) and gives the link more space.

Also reduces the horizontal space between the icon
and its link by the same amount the font-size
changes.
2020-10-27 15:55:57 +00:00
Tom Byers
3263706fcd Reset click size of template list link
Was previously larger for links at the root level
but this was lost when the HTML for these items
was changed.

See
https://github.com/alphagov/notifications-admin/pull/2750
for details on the previous style.
2020-10-27 15:55:57 +00:00
Chris Hill-Scott
cc04a924d0 Make list of areas on dashboard use full width
When the list of areas is restricted to half the width of the page it
starts to look pretty higgledy-piggledy when you have lots of areas or
areas with very long names.

To do this I’ve ripped out the table markup in favour of headings,
paragraphs and lists. Probably pros and cons for each, but it was really
hard to do the layout with the content in a table.
2020-10-27 15:19:10 +00:00
Chris Hill-Scott
340d66246a Merge pull request #3702 from alphagov/combine-pending-current
Combine pending and live alerts
2020-10-27 15:15:55 +00:00
Chris Hill-Scott
e2e04b51fc Sort broadcasts by start time
For emails and text messages we sort by the time the user (or API) sent
them.

This makes sense for broadcasts too, since most users will receive the
alert within seconds of it being broadcast.

For alerts that haven’t started yet we can sort by `updated_at`, which
is when the user preparing the broadcast submitted it for approval.
2020-10-27 13:12:46 +00:00
Chris Hill-Scott
74e92e708e Add status to alerts pending approval
Now that pending alerts aren’t in their own section there’s nothing to
label them as pending. So this commit replaces the extra metadata we
show for a pending alert (the name of the person who created it, which
was only ever a reckon) with an explicit label that says it’s waiting
for approval.
2020-10-27 13:12:36 +00:00
Chris Hill-Scott
24bafba29c Combine current and pending broadcasts
Splitting the dashboard into multiple sections was confusing, and people
sometimes mistook the headings as labels, especially when a section was
empty. It just wasn’t clear what the hierarchy of the page was.

This commit combines the current and pending broadcasts into one list
on the dashboard. Previous broadcasts have already moved to their own
page.
2020-10-27 13:12:25 +00:00
Katie Smith
0ff0807853 Merge pull request #3704 from alphagov/letters-optional-content
Document optional content in letters
2020-10-27 11:36:40 +00:00
Katie Smith
b98f817903 Document optional content in letters 2020-10-27 09:19:19 +00:00
David McDonald
ef68970a8d Merge pull request #3703 from alphagov/pyup-scheduled-update-2020-10-26
Scheduled weekly dependency update for week 43
2020-10-26 14:37:53 +00:00
David McDonald
657bd72d73 make freeze 2020-10-26 14:00:12 +00:00
pyup-bot
5e7d3b1d07 Update eventlet from 0.28.0 to 0.29.1 2020-10-26 13:53:04 +00:00
pyup-bot
bd2f6e7cd1 Update humanize from 3.0.1 to 3.1.0 2020-10-26 13:53:03 +00:00
karlchillmaid
5424f511f9 Merge pull request #3697 from alphagov/update-roadmap
Remove July to September section from roadmap
2020-10-26 12:57:04 +00:00
Chris Hill-Scott
b02ebe34b4 Merge pull request #3682 from alphagov/broadcast-highlighted-navigation
Make sure the correct navigation item is highlighted when viewing broadcasts
2020-10-26 12:25:36 +00:00
Chris Hill-Scott
f3cf080a5c Rename variable to be more precise 2020-10-26 11:09:13 +00:00
Chris Hill-Scott
725df2e7fa Add test for back link on view broadcast page 2020-10-26 11:06:27 +00:00
Chris Hill-Scott
eec4602efc Redirect to correct endpoint based on state
If you refresh the page on a current broadcast while someone has
cancelled it you’ll see the wrong navigation item selected. This commit
adds redirects to take you to the correct endpoint in these edge cases.
2020-10-26 10:50:09 +00:00
Chris Hill-Scott
d793d08ae7 Fix back links when viewing a broadcast
Where you go back to from a broadcast can now depend on whether it’s
a current or previous broadcast.
2020-10-26 10:50:09 +00:00
Chris Hill-Scott
b54d49196b Ensure correct selected nav item on broadcast page
Once a broadcast has been submitted for approval it either lives on the
‘Current alerts’ or ‘Previous alerts’ page, depending on where it is
in its lifecycle.

Therefore when clicking into a broadcast from one of those pages the
same navigation item should remain selected.

Because we select the navigation items based on the request endpoint,
this means we need an endpoint for each navigation page, even if the
content of the pages will be the same in both cases.

This commit adds the two new end points, removes the old, single
endpoint and updates links to point to the new endpoint.
2020-10-26 10:50:09 +00:00
karlchillmaid
7975c62d60 Update order of roadmap items 2020-10-23 15:28:41 +01:00
karlchillmaid
8d391e7761 Update roadmap 2020-10-23 15:25:38 +01:00
karlchillmaid
d884d11e1a Update app/templates/views/roadmap.html
Co-authored-by: Chris Hill-Scott <me@quis.cc>
2020-10-23 13:43:47 +01:00
Tom Byers
92b735f6e4 Merge pull request #3694 from alphagov/remove-issue-from-accessibility-statement
Remove issue from accessibility statement
2020-10-23 13:37:41 +01:00
Chris Hill-Scott
e65f910f87 Merge pull request #3699 from alphagov/allow-update-rate-limit
Allow rate limit to be updated
2020-10-23 13:15:23 +01:00
Chris Hill-Scott
d930c885e7 Allow rate limit to be updated
This bit of code is just a safety check to make sure we don’t
inadvertently updating something we shouldn’t (see
0cfe10639a for context).

`rate_limit` is something we allow the admin app to update now (as of
939029a9be).
2020-10-23 13:00:28 +01:00
Chris Hill-Scott
57fc209f44 Merge pull request #3690 from alphagov/set-message-limit
Remove the `upload_letters` permission
2020-10-23 12:27:28 +01:00