Commit Graph
7034 Commits
Author SHA1 Message Date
Pea Tyczynska 06bf6254e3 Fix bug that shows edit postage button on template to everyone 2019-02-04 15:54:07 +00:00
Tom Byers 04ca620f46 Merge pull request #2726 from alphagov/fix-incorrect-use-of-inarray
$.inArray returns the same value as Array.indexOf
2019-02-04 15:23:40 +00:00
Chris Hill-Scottandtombye ca6529dcdb Update app/assets/javascripts/templateFolderForm.js
Use native `Array.indexOf` instead.

Co-Authored-By: tombye <tombaromba@gmail.com>
2019-02-04 15:17:27 +00:00
Pea (Malgorzata Tyczynska) 189eabbe2a Merge pull request #2695 from alphagov/postage_on_template_not_on_service
Edit postage per template and not through service settings
2019-02-04 15:04:25 +00:00
Tom Byers 0e55521d8f $.inArray returns the same value as Array.indexOf 2019-02-04 14:56:18 +00:00
Pea Tyczynska 6b9f0675d1 Change styling of 'back to template' link on edit template postage page 2019-02-04 14:55:16 +00:00
Pea Tyczynska 29a860cf96 Move a full stop so it's outside the link 2019-02-04 14:55:16 +00:00
Pea Tyczynska fe6b73b8dc Remove service postage setting and choose_postage switch 2019-02-04 14:55:16 +00:00
Pea Tyczynska 20ae200de9 Remove choosing postage from edit template content flow 2019-02-04 14:45:33 +00:00
Pea Tyczynska e85678fa69 Add link to edit postage to view_template page 2019-02-04 14:45:33 +00:00
Pea Tyczynska db5378bac2 Edit template postage from a separate view 2019-02-04 14:45:33 +00:00
Tom Byers 2055a83516 Merge pull request #2723 from alphagov/fix-polyfill-issue
Replace native Array.includes with jQuery version
2019-02-04 11:32:39 +00:00
Tom Byers 7ef32a6bd9 Replace native Array.includes with jQuery version
This was failing with a 'Object doesn't have
method' error on IE11. Assume Babel wasn't
polyfilling Array.includes so reverting to jQuery
version for now.
2019-02-04 11:23:41 +00:00
Chris Hill-Scott 3140eb22ab Merge pull request #2721 from alphagov/lancs-wrecs
Mark agreement signed by Lancashire and Wrexham
2019-02-04 10:51:02 +00:00
Chris Hill-Scott 361ff2b525 Merge pull request #2715 from alphagov/remove-folder-toggle
Remove button to toggle folders on/off
2019-02-04 10:50:27 +00:00
Chris Hill-Scott 33f318afec Remove platform admin toggles for email/SMS
Users can do this themselves now.
2019-02-01 18:33:32 +00:00
Chris Hill-Scott 7905b29d64 Remove button to toggle folders on/off
We don’t need it now that everyone has folders.
2019-02-01 18:33:31 +00:00
Chris Hill-Scott c4ea9a3c88 Mark agreement signed by Lancashire and Wrexham 2019-02-01 16:46:25 +00:00
Chris Hill-Scott f283edeb12 Merge pull request #2720 from alphagov/wefwefewgfwegergerg
Fix button for functional tests
2019-02-01 16:20:51 +00:00
Chris Hill-Scott c6445eda9f Fix button for functional tests 2019-02-01 16:19:20 +00:00
Chris Hill-Scott 6b02775927 Merge pull request #2718 from alphagov/sticky-footer-new-buttons
Add sticky footer on letter contact details, fix issues
2019-02-01 16:11:28 +00:00
Chris Hill-Scott f55e2c06ef make invite button on org team consistent 2019-02-01 15:58:52 +00:00
Chris Hill-Scott 1c042567e6 Fix width of textbox on letter contact details page 2019-02-01 15:46:42 +00:00
Chris Hill-Scott a11d24e816 Use sticky footer on letter contact details to match email reply to 2019-02-01 15:46:23 +00:00
Chris Hill-Scott 5597e63d44 Recalculate stickyness after API keys have rendered 2019-02-01 15:45:38 +00:00
Chris Hill-Scott 7632e6b9d3 Merge pull request #2717 from alphagov/sticky-footer-new-buttons
Make ‘Add new’ buttons sticky on more pages
2019-02-01 15:27:09 +00:00
Chris Hill-Scott afdc749e36 Make ‘Add new’ buttons sticky on more pages
For consistency with the template management page.
2019-02-01 14:25:35 +00:00
Chris Hill-Scott 539c9f2368 Merge pull request #2716 from alphagov/ignore-case-sort-team-members
Ignore case when sorting team members list
2019-02-01 13:17:33 +00:00
Chris Hill-Scott 0e4a22e821 Ignore case when sorting team members list
Otherwise you get A, B, C, a, b, c 😳
2019-02-01 13:09:02 +00:00
Chris Hill-Scott d7c108a2f5 Merge pull request #2713 from alphagov/full-width-new-folder
Make ‘New folder’ textbox full width
2019-02-01 12:38:19 +00:00
Chris Hill-Scott cc8c2da66e Merge pull request #2714 from alphagov/tweak-spacing-of-folder-heading
Normalise spacing of template breadcrumb heading
2019-02-01 12:38:13 +00:00
Chris Hill-Scott 93df30d2df Normalise spacing of template breadcrumb heading
Removes the magic numbers, makes it visually look like it’s in the same
position as the 36px type size headings.
2019-02-01 12:22:36 +00:00
Chris Hill-Scott 1208cdaeea Make ‘New folder’ textbox full width
Looks neater when it aligns with everything else.
2019-02-01 12:07:47 +00:00
Chris Hill-Scott 02fb5f69dd Merge pull request #2712 from alphagov/fix-copy-template-folder-display
Fix display of folders when copying template
2019-02-01 11:45:22 +00:00
Chris Hill-Scott 5a3e836e62 Fix display of folders when copying template
It was broken because we didn’t copy the markup changes made to the
list of template.
2019-02-01 11:34:49 +00:00
Chris Hill-Scott 9f64a928dc Merge pull request #2701 from alphagov/folder-path
Improve display of folder path when deeply nested
2019-02-01 10:51:08 +00:00
Chris Hill-Scott cbc2f60926 Merge pull request #2709 from alphagov/pyup-update-flake8-3.7.3-to-3.7.4
Update flake8 to 3.7.4
2019-02-01 10:51:02 +00:00
Chris Hill-Scott 5258fc2868 Merge pull request #2711 from alphagov/bump-utils-govuk-blue
Bump utils to 30.7.5
2019-02-01 10:50:55 +00:00
Chris Hill-Scott e0d1f8e8ff Wrap, don’t truncate display of folder name in H1
This commit applies a carefully selected blend of `white-space`,
`display` and `background-position` to ensure that:
- you can always see the full name of the current folder in the heading
  (which is useful because people might have mutiple folders with the
  same name, differentiated by some king of suffix)
- the clickable are of a single folder or template in the list is 100%
  width, for the biggest possible hit area
- the name of a folder or template wraps underneath the folder icon (ie
  the folder icon is treated like a normal character, not like a bullet
  point)
2019-02-01 10:40:30 +00:00
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 6df543cdc2 Bump utils to 30.7.5
Brings in:
- [x] https://github.com/alphagov/notifications-utils/pull/572
2019-02-01 09:37:02 +00:00
Chris Hill-Scott 769befe01d Mark agreement signed by Clackmannanshire Council 2019-02-01 09:19:05 +00:00
pyup-bot 5c26095ad4 Update flake8 from 3.7.3 to 3.7.4 2019-02-01 05:40:21 +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:

https://github.com/alphagov/notifications-admin/commit/707c426b9aa5b7730ac49dff21763b27507d08bd

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