Commit Graph

6993 Commits

Author SHA1 Message Date
Chris Hill-Scott
bba22b056f Remove unused assets 2019-02-01 10:28:29 +00:00
Chris Hill-Scott
88ad982bf7 Improve display of folder path when deeply nested
It’s a bit rudimentary to only show the current place in the hierarchy
and the parent. You lose a sense of how deep you are.

But we can’t just show the full path, because it can be arbitrarily
long. So what this commit does is show the full path, but truncates the
display of any items. Further-up than the current folder or its parent.

This also helps disambiguate between folders and templates, because
folders are always shown with the folder icon.

This probably won’t affect many teams, because we don’t anticipate a lot
of deep nesting.
2019-02-01 10:28:29 +00:00
Chris Hill-Scott
02f7d7708a Merge pull request #2710 from alphagov/clacks.gov.uk
Mark agreement signed by Clackmannanshire Council
2019-02-01 09:38:45 +00:00
Chris Hill-Scott
769befe01d Mark agreement signed by Clackmannanshire Council 2019-02-01 09:19:05 +00:00
Tom Byers
4446f40b38 Merge pull request #2708 from alphagov/fix-sticky-overflow-final-final
Add adjustment for padding missed from previous
2019-01-31 16:57:43 +00:00
Tom Byers
fd3ca31e44 Add adjustment for padding missed from previous
The work done to stack sticky elements closer
together only effected the stack when stuck to the
top/bottom edge:

707c426b9a

It should have included the same for when a stack
of sticky elements is stopped at the end of it's
scroll area. This adds code to deal with that.
2019-01-31 15:56:16 +00:00
Pea (Malgorzata Tyczynska)
aa74977315 Merge pull request #2707 from alphagov/pyup-update-flake8-3.7.1-to-3.7.3
Update flake8 to 3.7.3
2019-01-31 15:13:30 +00:00
Tom Byers
cc8147dd5a Merge pull request #2702 from alphagov/fix-bugs-with-sticky-overflow-code
Fix bugs with sticky overflow code
2019-01-31 13:55:45 +00:00
pyup-bot
716eefa533 Update flake8 from 3.7.1 to 3.7.3 2019-01-31 05:40:27 +00:00
Tom Byers
c89ad9635b Fix switch between modes and scrolling on adjust
The templateFolderForm JS was setting the mode to
'dialog' but not back when the state was changed
back to a normal sticky element. This caused
adjustments and scrolling when no adjustment
needed to be accommodated.

There were also problems with adjustForResize. It
was manipulating the same flag that resizing the
window did and returned a value never used.
2019-01-30 19:12:14 +00:00
Chris Hill-Scott
18651ad6be Merge pull request #2704 from alphagov/nao.org.uk
Add National Audit Office domain
2019-01-30 16:15:00 +00:00
Chris Hill-Scott
823bf70133 Merge pull request #2703 from alphagov/ealing.gov.uk
Mark agreement signed by Ealing Council
2019-01-30 16:14:41 +00:00
Chris Hill-Scott
11708dbb22 Add National Audit Office to domains 2019-01-30 16:07:05 +00:00
Chris Hill-Scott
4c30de7c2c Add National Audit Office domain 2019-01-30 16:05:37 +00:00
Chris Hill-Scott
8fcd7e9fad Mark agreement signed by Ealing Council 2019-01-30 15:42:34 +00:00
Tom Byers
707c426b9a Remove padding between stickys when stacked 2019-01-30 14:59:30 +00:00
Chris Hill-Scott
7c59d7323b Merge pull request #2690 from alphagov/client-init-refactor
Refactor API client code to be less duplicative/repetitive
2019-01-30 14:06:38 +00:00
Chris Hill-Scott
94ce9a76fe Merge pull request #2692 from alphagov/self-serve-channels
Let users switch channels on and off by themselves
2019-01-30 13:46:39 +00:00
Chris Hill-Scott
17c6446b85 Organise client initialisation
- groups them into sensible chunks
- alphabetises them
2019-01-30 13:45:05 +00:00
Chris Hill-Scott
2fae31a1ee Use 301 to redirect old URL
301 is a `permanent redirect`, which is semantically more accurate.
2019-01-30 13:36:01 +00:00
Chris Hill-Scott
54e9e6401d Merge pull request #2696 from alphagov/pyup-update-pytest-xdist-1.26.0-to-1.26.1
Update pytest-xdist to 1.26.1
2019-01-30 13:34:06 +00:00
Chris Hill-Scott
13425dad3e Merge pull request #2694 from alphagov/grey-not-set-email-reply-to-address
Grey-out ‘Not set’ for email reply-to address
2019-01-30 13:33:13 +00:00
Chris Hill-Scott
92159b15b8 Merge pull request #2700 from alphagov/n-somerset.gov.uk
Mark agreement signed by North Somerset council
2019-01-30 12:15:40 +00:00
Chris Hill-Scott
31a47a4621 Merge pull request #2699 from alphagov/trafford.gov.uk
Mark agreement signed by Trafford
2019-01-30 12:15:27 +00:00
Chris Hill-Scott
f3eeb4a87f Merge pull request #2698 from alphagov/pyup-update-flake8-3.6.0-to-3.7.1
Update flake8 to 3.7.1
2019-01-30 12:15:17 +00:00
Chris Hill-Scott
b760703b26 Fix indentation 2019-01-30 12:02:45 +00:00
Chris Hill-Scott
e04087ba93 Mark agreement signed by North Somerset council 2019-01-30 11:54:25 +00:00
Tom Byers
f4d9c37940 Move setting of sticky mode out of recalculate
The `recalculate` method currently does three
things:
1. sync's the internal store with the DOM
2. updates the saved positional and dimensional
data from the new DOM
3. allows the mode to be set

The problem with using it as the way to set the
mode is that, every call to it is effectively
setting the mode but this isn't always the
intention.

This splits off setting the mode so other modules
have to explicity set it and those that don't
intend to can just call `recalculate` to notify of
DOM changes.
2019-01-30 11:45:24 +00:00
Tom Byers
177f30248e Fix bug with DOM sync'ing
If a sticky element was already in the store, the
code for adding it would return early. This meant
dimensions and positions for it were not being
recalculated.
2019-01-30 11:35:31 +00:00
Chris Hill-Scott
2df98f6d79 Mark agreement signed by Trafford 2019-01-30 11:09:12 +00:00
pyup-bot
8a254add0d Update flake8 from 3.6.0 to 3.7.1 2019-01-30 08:21:26 +00:00
pyup-bot
130dcb7363 Update pytest-xdist from 1.26.0 to 1.26.1 2019-01-29 20:55:19 +00:00
Chris Hill-Scott
b459d14f0c Merge pull request #2693 from alphagov/gov.wales
Add Welsh Government domain
2019-01-29 16:42:46 +00:00
Chris Hill-Scott
d867ee73a7 Grey-out ‘Not set’ for email reply-to address
The `default_reply_to_email_address` variable was not set anywhere so
the conditional was having no effect.
2019-01-29 16:40:44 +00:00
Chris Hill-Scott
fb8555f171 Add Welsh Government domain 2019-01-29 16:31:37 +00:00
Chris Hill-Scott
e77a6ae09f Merge pull request #2689 from alphagov/southlanarkshire.gov.uk
Mark agreement signed by South Lanarkshire Council
2019-01-29 16:19:42 +00:00
Chris Hill-Scott
016d426928 Merge pull request #2691 from alphagov/pkc.gov.uk
Mark agreement signed by Perth & Kinross council
2019-01-29 16:19:33 +00:00
Chris Hill-Scott
3b15b04fc2 Let users switch channels on and off by themselves
We let people do this for letters already. We should let them do it for
emails and texts too, rather than have to email us.
2019-01-29 16:05:32 +00:00
Chris Hill-Scott
b251dbc3d1 Mark agreement signed by Perth & Kinross council 2019-01-29 13:42:25 +00:00
Chris Hill-Scott
e211fb7f60 Remove duplicative calls to init_app
Easier to read without the repetitive boilerplate.
2019-01-29 12:14:36 +00:00
Chris Hill-Scott
d054e97d45 Mark agreement signed by South Lanarkshire Council 2019-01-29 12:12:49 +00:00
Chris Hill-Scott
1d3a4e5043 Inherit don’t duplicate API client constructor
This removes some code which is duplicative and obscure (ie it’s not
very clear why we do `"a" * 73` even though there is a Very Good Reason
for doing so).
2019-01-29 12:11:27 +00:00
Katie Smith
eae0a5a632 Merge pull request #2688 from alphagov/dunbarton
Mark agreement signed by West Dunbartonshire
2019-01-29 12:03:11 +00:00
Katie Smith
5675e20319 Merge pull request #2687 from alphagov/sticky-footer-set-email
Use sticky footer when setting email branding
2019-01-29 12:03:05 +00:00
Katie Smith
b8a2c0c825 Merge pull request #2685 from alphagov/govuk-services
Change breadcrumb to reflect new Service Toolkit nomenclature
2019-01-29 12:02:58 +00:00
Katie Smith
ff1b3fc72e Merge pull request #2684 from alphagov/selected-counter-right-position
Fix jumpy right position of selected items counter
2019-01-29 12:02:51 +00:00
Katie Smith
5fded8daf5 Merge pull request #2683 from alphagov/email-branding-fixes
Email branding form validation fixes
2019-01-29 12:02:43 +00:00
Katie Smith
5b77329e63 Validate name field on ServiceUpdateEmailBranding form
This introduces a validator to validate that the name field is not empty
on the ServiceUpdateEmailBranding form, but only if the form details are
being submitted. If a file is being uploaded, the name is allowed to be
empty.
2019-01-29 11:37:27 +00:00
Katie Smith
52acf890dd Stop persisting email branding logos if saving to db fails
We were previously persisting the logo for the email branding and
deleting the temp files that get created before trying to update the
database with the new email branding. This meant that if there was an
error when saving (e.g. the domain used was a duplicate) the final logo
was already in S3 and trying to go 'back' in the browser would give an
error since the temp files needed to display the create branding page
had already been deleted.

This changes the order we do things in, so that we try persisting the
email branding to the database first.
2019-01-29 11:37:27 +00:00
Katie Smith
0bf3a4b16d Refactor to add separate letter branding client
We were getting all letter logos from a method in the email branding
client. Since we will be adding more client methods to deal with
letters, it makes things clearer to separate the email and letter
branding clients.
2019-01-29 11:37:27 +00:00