Commit Graph

7170 Commits

Author SHA1 Message Date
Chris Hill-Scott
d98d04844a Mark agreement signed by Tower Hamlets council 2018-11-22 10:29:48 +00:00
Chris Hill-Scott
c7118a80e2 Stick email status to bottom of screen
We’ve moved away from using the expand/collapse pattern on the page
where you click ‘send’. Instead we’re putting the send button in the
sticky footer.

So it’s a bit jarring to still have the expand/collapse on the page you
see after you’ve sent an email. This commit replaces it with the sticky
footer as well.

This is only relevant for emails because:

1. Text messages are generally short enough to fit on the screen
2. We don’t show the status of letters because they don’t really change
2018-11-22 10:20:39 +00:00
Chris Hill-Scott
4ac427c5ab Merge pull request #2525 from alphagov/inverclyde.gov.uk
Mark agreement signed by Inverclyde Council
2018-11-22 10:15:24 +00:00
Alexey Bezhan
82db6d7469 Merge pull request #2523 from alphagov/rename-staging-csv-uploads-bucket
Rename staging CSV uploads bucket to match other environments
2018-11-21 13:26:39 +00:00
Chris Hill-Scott
d55117e4d6 Mark agreement signed by Inverclyde Council 2018-11-21 12:33:28 +00:00
Alexey Bezhan
2f0abb9c7d Rename staging CSV uploads bucket to match other environments 2018-11-20 16:46:38 +00:00
pyup-bot
d6540211fe Update whitenoise from 4.1.1 to 4.1.2 2018-11-20 16:33:52 +00:00
Chris Hill-Scott
9147e187fb Merge pull request #2522 from alphagov/fix-search-hiding-logic
Fix logic around showing search box
2018-11-20 16:21:12 +00:00
Chris Hill-Scott
5d13c639b1 Fix logic around showing search box
It was looking at the count of items at the root level (because it was
passing `parent_folder_id=None` as an argument).

This changes it to look at the total count of items for a service (which
was the intended behaviour).
2018-11-20 16:12:50 +00:00
Chris Hill-Scott
8f2547b7a7 Merge pull request #2518 from alphagov/delete-folder-refinements
Make some refinements to the delete folder journey
2018-11-20 14:53:05 +00:00
Chris Hill-Scott
c8bb83ca3b Merge pull request #2521 from alphagov/new-orgs
Mark agreement signed by Northumberland and Lincolnshire
2018-11-20 14:30:06 +00:00
Chris Hill-Scott
c52dc8e972 Merge pull request #2488 from alphagov/copy-template-name
Put ‘copy’ at end of new template name
2018-11-20 14:14:09 +00:00
Chris Hill-Scott
7b3c04d0c2 Mark agreement signed by Northumberland and Lincolnshire 2018-11-20 14:13:02 +00:00
Chris Hill-Scott
7bbdb461b0 Merge pull request #2519 from fidejoseph/patch-4
Update email_domains.yml
2018-11-20 13:58:57 +00:00
Chris Hill-Scott
65389b0bb5 Merge pull request #2513 from alphagov/empty-folder-message
Improve the empty folder state
2018-11-20 13:50:53 +00:00
fidejoseph
d3fded694e Update email_domains.yml
Whitelisting UK SBS
2018-11-20 13:22:22 +00:00
Chris Hill-Scott
a5bbabcd7b Merge pull request #2511 from alphagov/sticky-send
Use sticky footer on the check one-off page
2018-11-20 13:15:32 +00:00
Chris Hill-Scott
400c25e15f Make search box appear based on all templates
We reckon it’s jarring to have the search box appear and disappear as
you navigate through the folders.

Instead it should appear whenever your service has more things
(templates or folders) than you can easily keep in your head (let’s go
with 7 for now).

This keeps the bahviour the same for current services that don’t have
any folders.
2018-11-20 12:29:39 +00:00
Chris Hill-Scott
4bb7519d9e Refine empty folder message
If the folder is completely empty, always say ‘This folder is empty’, so
we don’t suggest that you can click around and find other things.

If the current view is filtered, but there are templates available in
other filters, say ‘There are no text message templates in this folder’
to make it clear why you can’t see anything.
2018-11-20 12:29:39 +00:00
Chris Hill-Scott
32c36bf70b Make the empty folder state more useful
Currently if there’s nothing in a folder you just get an empty page.
This looks a bit broken, or like the page hasn’t finished loading.

This commit adds a message to the page to show that it’s intentionally
blank.

The message is contextual based on type of template, because there might
be templates in the current folder, even if you can’t see them at the
moment (because you’re filtering).
2018-11-20 12:29:38 +00:00
Chris Hill-Scott
72159ff6e3 Fix search box show/hide logic
The search box should only be shown if there are too many items to
quickly scan on the page. This number is judged to be 7; see the
original PR for more context:
https://github.com/alphagov/notifications-admin/pull/1195

This commit makes that logic work in the world of folders, by explicitly
counting the templates shown on the screen, not all the templates a
service has (which may be spread across multiple folders).
2018-11-20 12:29:38 +00:00
Chris Hill-Scott
77529f4191 Redirect to parent after deleting a folder
You lose your place if, after deleting something that’s deeply nested,
you return to the root level.
2018-11-20 11:31:31 +00:00
Chris Hill-Scott
4bccce4772 Refactor how we get template folder on delete page
It’s a bit obtuse to look it up from the `template_folder_path`,
especially now that we have a specific method on the model that does
the exact thing.
2018-11-20 11:31:31 +00:00
Chris Hill-Scott
13a962b6bd Don’t hide the rename form on delete
It’s weird that this page changes when you click delete – it looks like
you’re going to a different page.

It should feel like you’re on the same page, just with the confirmation
message.

The problem we had before is that the rename form would `POST` to
`…/delete`, which would then delete the template instead of updating
its name.

We can fix this by explicitly setting the `action` attribute on the
rename form to always post to `…/manage`, even if the user is currently
looking at the `…/delete` page.
2018-11-20 11:27:19 +00:00
Leo Hemsted
fda10c81a7 Merge pull request #2494 from alphagov/bump-reqs
bump reqs
2018-11-20 11:06:08 +00:00
Rebecca Law
ad129e92dd Merge pull request #2507 from alphagov/delete-letter-job-page
Delete letter job page
2018-11-20 09:57:52 +00:00
Rebecca Law
28b9adf4e0 Merge pull request #2510 from alphagov/fix-user-with-no-permissions
Fix the permission check for users without permissions.
2018-11-19 17:06:33 +00:00
Chris Hill-Scott
fe9cffc4d1 Merge pull request #2512 from alphagov/fix-empty-template-message
Fix missing ‘no templates’ message
2018-11-19 16:02:28 +00:00
Chris Hill-Scott
da80dfb6f3 Fix missing ‘no templates’ message
This got broken because `template_folder_path` is never an empty list
any more (it always contains at least one item, _Templates_, which is
the root).
2018-11-19 15:55:57 +00:00
Rebecca Law
dd22fa06a4 Fix the permission check for users without permissions.
A users without permissions should be redirected to choose-templates page when signing in.
2018-11-19 15:26:43 +00:00
Chris Hill-Scott
7e4ef84635 Put sticky footers on check one-off page
This page is a good use case for sticky footers because the primary
action on the page would otherwise be off the bottom of the viewport.
2018-11-19 15:26:13 +00:00
Chris Hill-Scott
9bd91ed60a Style spacing for sticky footers
Sticky footers need slightly different spacing to sticky headers so they
look balanced. They can’t just inherit the same spacing.
2018-11-19 15:24:02 +00:00
Chris Hill-Scott
65b1b142b0 Show full emails on check notifications page
Because we’re going to use a sticky footer on this page we don’t need
to show the email in its collapsed form. Showing the email is only
needed to:
- fit more things on a page
- make sure a button comes up above the fold (which the sticky footer
  will solve)
2018-11-19 15:22:34 +00:00
Chris Hill-Scott
c9908befc2 Merge pull request #2505 from alphagov/style-folder
Style folder hierarchy in headings
2018-11-19 15:21:57 +00:00
Chris Hill-Scott
d3e7557058 Link current level in hierarchy from manage folder
Because that’s the page you come directly back from.
2018-11-19 11:28:36 +00:00
Chris Hill-Scott
738043c5c4 Show path on template and manage folder pages
So the page headings stay consistent as you click around, and make it
easy to get back where you came from.
2018-11-19 11:28:35 +00:00
Chris Hill-Scott
d49622c5dc Style folder hierarchy in headings
This makes the display of folders in the `<h1>` look like the prototype.

It alters the behaviour we’ve initially built here by only ever showing
a maximum of two levels of hierarchy (the current folders and its
parent).
2018-11-19 10:50:03 +00:00
Pea (Malgorzata Tyczynska)
754ae743ca Merge pull request #2506 from alphagov/fix_delete_folder_button_breadcrumb
Fix breadcrumbs on manage_template_folder page
2018-11-19 10:49:28 +00:00
Pea (Malgorzata Tyczynska)
2b040afe00 Merge pull request #2501 from alphagov/update_confirm_delete_messages
Make deletion confirmation banner messages consistent across our app
2018-11-19 10:37:48 +00:00
Pea Tyczynska
87c92e093b Update confirmation messages for delete sms-sender and delete reply-to-email 2018-11-16 17:05:59 +00:00
Pea Tyczynska
9953229c54 Test that delete folder endpoint detects non-empty folders 2018-11-16 15:59:23 +00:00
Pea Tyczynska
69ada9a312 Hide name changing functionality when in folder deletion mode
Also add 'back' link
Also start work on additional tests for folder deletion flow
2018-11-16 15:58:18 +00:00
Rebecca Law
924e3aa6da Merge branch 'master' into delete-letter-job-page 2018-11-16 15:32:51 +00:00
Pea Tyczynska
7f4580cb82 Update content following review 2018-11-16 15:15:40 +00:00
Pea Tyczynska
4373987786 Fix breadcrumbs on manage_template_folder page 2018-11-16 11:21:27 +00:00
Pea Tyczynska
a43e6a8885 Make deletion confirmation banner messages consistent across our app
Also introduce a way to provide context to a banner / flash message
that will be displayed in plain font style.
2018-11-16 11:05:52 +00:00
Chris Hill-Scott
ce9878db91 Merge pull request #2504 from alphagov/recent-domains
Update domains for recently new organisations
2018-11-16 10:34:24 +00:00
Chris Hill-Scott
f58fbcf2d3 Merge pull request #2492 from alphagov/refactor-repetetive-methods
Refactor duplicative methods
2018-11-16 10:34:18 +00:00
Chris Hill-Scott
230ea013c6 Update domains for recently new organisations 2018-11-16 10:14:58 +00:00
Chris Hill-Scott
bc33a0411e Merge pull request #2500 from alphagov/fix-notification-page-no-message-type
Don’t ask for data retention unless channel is known
2018-11-15 17:23:57 +00:00