Commit Graph

6836 Commits

Author SHA1 Message Date
Chris Hill-Scott
606641a35e Merge pull request #2645 from alphagov/cne-siar.gov.uk
Add Comhairle nan Eilean Siar to domains list
2019-01-09 12:26:46 +00:00
Chris Hill-Scott
a34e1ea1f0 Merge pull request #2638 from alphagov/copy-template-from-folders
Allow users to navigate folders when copying
2019-01-09 12:26:29 +00:00
Chris Hill-Scott
668b0a91b2 Add Comhairle nan Eilean Siar to domains list
Comhairle nan Eilean Siar (Scottish Gaelic pronunciation: [ˈkʰõ.ərˠʎə nə ˈɲelan ˈʃiəɾ]) is the local government council for Na h-Eileanan Siar council area of Scotland, comprising the Outer Hebrides.
2019-01-09 12:02:02 +00:00
Chris Hill-Scott
f77b101261 Merge pull request #2634 from alphagov/pyup-update-pytest-cov-2.6.0-to-2.6.1
Update pytest-cov to 2.6.1
2019-01-09 11:49:32 +00:00
Chris Hill-Scott
30886c3cdb Merge pull request #2626 from alphagov/empty-service-state-folders
Use grey buttons to add templates when service is new
2019-01-09 10:26:43 +00:00
Chris Hill-Scott
c751f6ba1f Merge pull request #2627 from alphagov/fix-zindex-template-form
Fix z-index on templates page
2019-01-09 10:25:58 +00:00
Chris Hill-Scott
13d20cf7a9 Merge pull request #2641 from alphagov/nlwed
Mark agreement signed by North Lincs, Walsall and East Dunbartonshire
2019-01-08 16:07:03 +00:00
Chris Hill-Scott
a093b8d976 Use Babergh as the example in tests
Because Aberdeenshire have signed the agreement.
2019-01-08 15:12:52 +00:00
Chris Hill-Scott
2ef4d1c401 Resolve aliases for Ayrshire 2019-01-08 15:12:44 +00:00
Pete Herlihy
59f260c785 And South Ayrshire... 2019-01-08 13:59:40 +00:00
Chris Hill-Scott
61b902554f …and Aberdeenshire 2019-01-08 13:03:06 +00:00
Chris Hill-Scott
206a7806d4 Allow users to navigate folders when copying
We already have a pattern for navigation folders and searching for
templates – let’s use it for the copy page too. And I reckon we can
represent services as folders if the user has multiple services they
could copy a template from.
2019-01-08 12:21:32 +00:00
Chris Hill-Scott
a1e02d1fec Mark agreement signed by North Lincs, Walsall and East Dunbartonshire 2019-01-08 11:54:14 +00:00
Pea (Malgorzata Tyczynska)
0b22fff751 Merge pull request #2639 from alphagov/quick_fix_letter_status
Format letter statuses so they make more sense to our users
2019-01-08 11:06:35 +00:00
Chris Hill-Scott
42e1b2bc08 Merge pull request #2635 from alphagov/pyup-update-beautifulsoup4-4.7.0-to-4.7.1
Update beautifulsoup4 to 4.7.1
2019-01-07 16:16:58 +00:00
Chris Hill-Scott
c2eee08aae Merge pull request #2640 from alphagov/hounslow.gov.uk
Mark agreement signed by Hounslow council
2019-01-07 15:59:33 +00:00
Chris Hill-Scott
cbe5e77e69 Mark agreement signed by Hounslow council 2019-01-07 15:46:32 +00:00
Chris Hill-Scott
933dd1245b Merge pull request #2637 from alphagov/doncaster.gov.uk
Mark agreement signed by Doncaster Council
2019-01-07 15:42:23 +00:00
Pea Tyczynska
b8318c491b Format letter statuses so they make more sense to our users 2019-01-07 15:17:09 +00:00
Tom Byers
1685e492ca Merge pull request #2630 from alphagov/nest-destination-folders
Nest destination folders
2019-01-07 10:31:41 +00:00
Chris Hill-Scott
d13c071431 Mark agreement signed by Doncaster Council 2019-01-07 10:22:28 +00:00
pyup-bot
67685fb601 Update beautifulsoup4 from 4.7.0 to 4.7.1 2019-01-07 01:07:37 +00:00
pyup-bot
4c62a1c0a7 Update pytest-cov from 2.6.0 to 2.6.1 2019-01-07 01:07:33 +00:00
Tom Byers
bdc4a1056d Add a test to ensure move_to has no default folder
As requested in:

https://github.com/alphagov/notifications-admin/pull/2630#pullrequestreview-189414780
2019-01-04 17:21:54 +00:00
Leo Hemsted
ad904e587c Merge pull request #2631 from alphagov/utils-bump
bump utils
2019-01-04 16:37:32 +00:00
Leo Hemsted
addb54b84f bump utils
brings in alphagov/notifications-utils#563
2019-01-04 16:21:12 +00:00
Chris Hill-Scott
d907fc9ce6 Update tests/app/main/views/test_template_folders.py
Remove quotes around variable. Were added by mistake.

Co-Authored-By: tombye <tombaromba@gmail.com>
2019-01-04 15:40:34 +00:00
Chris Hill-Scott
f5321346c4 Add left padding to nested radios
This makes them align horizontally with the label of their parent, so
that the layout is a bit calmer.
2019-01-04 15:30:39 +00:00
Chris Hill-Scott
3be03072a7 Reflect expanded scope of radio SASS file 2019-01-04 15:15:59 +00:00
Chris Hill-Scott
4aa4970fc9 Add grey lines to visually show level of nesting
Uses some CSS to draw some grey lines to show which radios descend from
which.

I don’t feel like the intentation is enough, and it looks a bit messy
because the circles of the radio buttons don’t have straight edges
easily suggest visual alignment.

Copies the design from conditionally revealing content in the design
system:
https://design-system.service.gov.uk/components/radios/#conditionally-revealing-content

Implementation is done with pseudo elements, because borders can’t be
positionned exactly enough.
2019-01-04 15:15:59 +00:00
Chris Hill-Scott
39506c4794 Rename ‘All templates’ 2019-01-04 15:15:58 +00:00
Tom Byers
33800c5f27 Add styles for nested lists of radios
Assumes lists that are descendants of a radio
control should be indented at the same amount as
their label text.
2019-01-04 11:59:25 +00:00
Chris Hill-Scott
62d424b01e Merge pull request #2625 from alphagov/trailing-new-line-before-markdown
Bump utils to 30.7.2
2019-01-04 11:48:22 +00:00
Chris Hill-Scott
c1b61a3658 Merge pull request #2617 from alphagov/pytest4
Pytest 4: don't call pytest.mark directly
2019-01-04 11:48:16 +00:00
Chris Hill-Scott
0c1a797a82 Keep param on multiple lines
so it scans the same as preceeding test cases

Co-Authored-By: leohemsted <leohemsted@gmail.com>
2019-01-04 11:34:26 +00:00
Tom Byers
9bce22f766 Swap order of move_to validators
If Optional runs before required_for_ops, it stops
the validation chain so it doesn't get to
required_for_ops. The move_to field isn't required
for the 'move-to-new-folder' operation, so this has
been removed.

This also adds comments explaining why we set
default to an empty string when instantiating the
move_to field.
2019-01-03 17:09:00 +00:00
Katie Smith
3cf36c592f Change move folder form to not have default radio btn and to show hint
Updated the move folder form to add a hint for the radio button for the
current folder saying 'current folder'. This hint does not get shown if
you are viewing all folders (so you are not inside a folder).

Also stopped a default radio button from being selected on the form.
2019-01-03 16:51:47 +00:00
Tom Byers
501ec2a534 Make all options descend from 'all templates' 2019-01-03 16:51:47 +00:00
Tom Byers
3c4a186a25 Display the template folders nested on the move template/folder form
Before, all the folders were displayed in a list which was ordered but
not nested. This changes the move form to nest the template folders.
2019-01-03 16:51:47 +00:00
Chris Hill-Scott
36656fd6ba Merge pull request #2628 from alphagov/hide-postage-for-those-who-cant-choose
Don’t show postage to users who can’t choose it
2019-01-03 16:26:45 +00:00
Chris Hill-Scott
3439611b11 Merge pull request #2629 from alphagov/stoke.gov.uk
Mark agreement signed by Stoke on Trent council
2019-01-03 16:25:44 +00:00
Chris Hill-Scott
c02a5800c3 And Midlothian 2019-01-03 16:12:58 +00:00
Chris Hill-Scott
5b6f53ffd1 Mark agreement signed by Stoke on Trent council 2019-01-03 16:07:50 +00:00
Chris Hill-Scott
3a2cfda8b2 Don’t show postage to users who can’t choose it
If you can’t choose postage on a per-template basis, you shouldn’t be
see the thing that indicates that postage can be changed.
2019-01-03 16:04:16 +00:00
Katie Smith
593261a62f Merge pull request #2619 from alphagov/fix-redis-error
Stop Redis exception by not passing Redis an empty set to delete
2019-01-03 15:25:34 +00:00
Katie Smith
ed84e0958a Stop Redis exception by not passing Redis an empty set to delete
We use `redis_client.delete` to delete multiple keys at once, but this
raises a `redis.exceptions.ResponseError` if it is called with an empty list
or set. We should only call `redis_client.delete` when there is at least
one item to delete.
2019-01-03 15:11:31 +00:00
Chris Hill-Scott
c6a11a49cd Fix z-index on templates page
The template type selection was accidentally overlapping the sticky
footer.
2019-01-03 12:42:02 +00:00
Chris Hill-Scott
ecf6ebb126 Equalise space before/after paragraph 2019-01-03 11:19:32 +00:00
Chris Hill-Scott
a9baa36005 Hide ‘nothing selected’ if nothing to select
It’s doesn’t make sense to show the state if the state can’t change.
This is especially true when you’re in a brand new, empty service.
2019-01-03 11:16:56 +00:00
Chris Hill-Scott
aaf3322662 Use folder buttons in empty state
It’s confusing to have one way of adding things when your service is new
(green button) but a different way once you’ve added your first thing
(the new grey buttons).

For services that have a `edit_folders` permission, this commit
standardises on the grey buttons for a consistent experience.
2019-01-03 11:14:22 +00:00