Commit Graph

2787 Commits

Author SHA1 Message Date
Katie Smith
a6f5abbf7e Only show archive user link for active users 2019-06-06 11:50:28 +01:00
Katie Smith
00bb7a0ea0 Add page to archive user
Users can only be archived by Platform Admin from the user page
(/users/<user_id>). This removes them from all services and orgs and
updates their details.
2019-06-06 09:56:16 +01:00
Chris Hill-Scott
0c2aa0824b Merge pull request #2995 from alphagov/new-email-reply-to
Update email_reply_to.html
2019-06-05 16:53:58 +01:00
Chris Hill-Scott
d44dad2817 Merge pull request #3004 from alphagov/empty-usage
Only show the en dash if month is totally empty
2019-06-05 16:53:50 +01:00
Chris Hill-Scott
944a7d302c Fix logic for showing and hiding checkbox
The ‘make this default’ checkbox should be shown, except when:
- the user is adding their first email reply to address (because the
  first one has to be the default)
- they’re editing the existing default (because they can’t change it
  to be not default)
2019-06-05 16:41:06 +01:00
Chris Hill-Scott
6b494a2b86 Only show the en dash if month is totally empty
This code wasn’t taking into account that you might have sent letters
in the month.

The dash is only there to space out months which don’t have any usage
in them.
2019-06-04 16:26:00 +01:00
Chris Hill-Scott
41c50f2397 Say trial _mode_ services 2019-06-04 16:21:37 +01:00
Chris Hill-Scott
813ed8c856 Make settings link platform admin only 2019-06-04 16:20:44 +01:00
Chris Hill-Scott
d9df3171a0 Make verb consistently ‘Change’ 2019-06-04 15:41:12 +01:00
Chris Hill-Scott
aebbd13498 Update app/templates/views/service-settings/email-reply-to/add.html 2019-06-04 14:17:46 +01:00
Chris Hill-Scott
040b00e39c Make content of validate and error pages consistent
Makes all three pages have:
- the same hint text
- balanced spacing
- a checkbox for controlling whether the address is the default
2019-06-04 14:17:45 +01:00
Pete Herlihy
ceb75f5a32 Tidy up trailing spaces. 2019-06-04 13:56:03 +01:00
Pete Herlihy
dd02df6cc1 Removed extra warning about personal email accounts
This is now on the add page, rather than the hub.
2019-06-04 13:56:03 +01:00
Pete Herlihy
3c4ff774b9 Added hint about reply to email address to add emphasis 2019-06-04 13:56:03 +01:00
fidejoseph
3b014f3e60 Update email_reply_to.html
Adding an extra line to see if this can reduce the number of personal reply-to emails being submitted
2019-06-04 13:56:03 +01:00
Chris Hill-Scott
00bf77621f Don’t use plus to refer to VAT
Got some advice from the content community:

> I don't think we have a style on this - it doesn't really come up on
> GOV.UK mainstream.
>
> In your example, I'd go with something like 'less than £250 before
> VAT' or 'less than £250 (not including VAT)' to make it as clear as
> possible. Would that work?

I’ve gone with ’less than £250 (before VAT)’. I noticed that elsewhere
we’ve said ‘Each message costs 1.58 pence (plus VAT)’ so that feels
fairly consistent.
2019-06-04 13:50:01 +01:00
Chris Hill-Scott
05dd4bf9a7 Make column widths consistent with other pages
Pages within a service use a 2/8, 5/8, 1/8 grid.

The content pages use a 1/4, 3/4 grid, for consistency with the product
page template.

But I feel like the internal consistency is more important, and it feels
weird for the main content column to jump about.
2019-06-04 13:49:47 +01:00
Chris Hill-Scott
399eff7215 Make a reusable ‘content’ template
This is for static content pages and makes sure they always have the
right column widths and sub navigation.
2019-06-04 13:49:39 +01:00
Chris Hill-Scott
77469e0710 Add left-hand navigation to pricing pages
So that you don’t have to use the footer navigation to switch between
these related pages. Matches the template we use for organising
features-related content.
2019-06-04 13:49:31 +01:00
Chris Hill-Scott
8f6089c62f Remove ‘How to pay’ section from pricing page
It’s on its own page now.
2019-06-04 13:49:24 +01:00
Chris Hill-Scott
22299ea97d Add ‘How to pay’ page
Content from https://docs.google.com/document/d/1uIFW8c7Vk0-FQ-d8H1FmNZLHKn_tOXWg5oUL8bbcZzw/edit?ts=5ced1ae4#
2019-06-04 13:49:16 +01:00
Chris Hill-Scott
20c4719d07 Move pricing template into own folder
So we can keep thing organised when adding more pricing-related content.
2019-06-04 13:04:24 +01:00
Chris Hill-Scott
bbbda5f968 Merge pull request #2994 from alphagov/let-trial-mode-services-be-archived
Let users archive their own trial mode services
2019-06-04 13:03:41 +01:00
Chris Hill-Scott
99f917896a Update blog link in light of ‘Government as a Platform’ being retired
> we will be closing this blog and putting all future Government as a Platform (GaaP) news on the GDS blog.

– https://governmentasaplatform.blog.gov.uk/2019/04/18/this-blog-is-now-closed/
2019-06-04 11:35:14 +01:00
Chris Hill-Scott
9f3cc8baf1 Only show ‘back to service’ for active services
When a user deletes their service we take them to the ‘Choose service’
page. Like other non-service-specific pages this has a link to the last
service you were looking at. But in this specific case the last service
you were looking at is the one you’ve just deleted. Which means the link
is confusing because:
- you thought the thing was ‘gone’
- we’ve secretly renamed it to ‘_archived Example service name’

So this commit hides the link in this specific case.
2019-06-04 09:50:02 +01:00
Chris Hill-Scott
954f43ae48 Let users archive their own trial mode services
At the moment we have a blanket rule that users can’t archive their own
services, to prevent someone accidentally deleting a real live service,
because that would be Very Bad.

But the tickets we get from users asking us to delete services are for
services they set up when they were just trying out Notify. There’s not
much harm in letting users delete these services, the consequences of
doing so are much lower than those of deleting a live service. And it
should mean fewer support tickets for us to deal with.
2019-06-04 09:45:51 +01:00
Chris Hill-Scott
ee5212941c Add back links to organisation settings pages
They’re nice.
2019-06-03 14:12:12 +01:00
Chris Hill-Scott
6fc1635266 Rename some of the settings
This reflects the language we use for these things when talking about
them amongst ourselves.
2019-06-03 14:12:12 +01:00
Chris Hill-Scott
80e6c1654b Make organisation settings one table
There’s no longer a difference between regular settings and platform
admin settings – it’s all platform admin.
2019-06-03 14:12:12 +01:00
Pea (Malgorzata Tyczynska)
c55c2a2f56 Merge pull request #2993 from alphagov/fix_test_send_placeholders
Fix error where sending test message flow skipped first placeholder
2019-05-30 15:57:13 +01:00
Leo Hemsted
3a1282d03f Merge pull request #2987 from alphagov/org-trial-services
move trial mode services from org dashboard to separate page
2019-05-30 11:19:17 +01:00
Pea Tyczynska
8286e86a9e Harmonise behaviour of Change reply-to email address
So it acts the same on inital edit and after verification failed.
And also so it does not allow to untick default address in the
latter situation.
2019-05-29 17:02:57 +01:00
Pea (Malgorzata Tyczynska)
a0c21baca9 Apply suggestions from code review
Co-Authored-By: Chris Hill-Scott <me@quis.cc>
2019-05-28 17:20:30 +01:00
Leo Hemsted
9795f2b838 move trial mode services from org dashboard to separate page
the new page is platform admin only, and also has search built in
also, split test_organisation_invites into two files
2019-05-28 16:17:29 +01:00
Pea Tyczynska
4fd9e91993 Do not verify email when updated email address did not change 2019-05-24 11:22:20 +01:00
Pea (Malgorzata Tyczynska)
44ddd287b5 Code refactor, details below:
Apply suggestions from code review

Reduce max verification waiting time to 90 seconds

Also minor changes following peer review

Co-Authored-By: Chris Hill-Scott <me@quis.cc>

Use constants for notification status collections on verify reply-to

email address

Use a cleaner way of adding request arguments to url_for()
2019-05-23 15:34:25 +01:00
Pea Tyczynska
200fff6c66 Different back links and form actions on verify page depending if add or change 2019-05-23 15:34:25 +01:00
Pea Tyczynska
6cf9959058 Stop AJAX when success or failure and show form on failure
AJAX requests stop on success or failure, as the waiting page
does not have to referesh any longer.

Also on failure a form that allows user to try again
is shown.
2019-05-23 15:34:25 +01:00
Pea Tyczynska
06ab7a5b1f Add continue button to success page and edit back link destination 2019-05-23 15:34:24 +01:00
Pea Tyczynska
3251fc4e00 Change content for email reply-to verification journey
Earlier commits used placeholder content while awaiting official
content.
2019-05-23 15:34:24 +01:00
Pea Tyczynska
441c1f441b Verify email address when editing reply-to address
Also fix the tests
2019-05-23 15:34:24 +01:00
Pea Tyczynska
8f3b560a4e Use ajax to auto-refresh reply-to email verifiaction page 2019-05-23 15:34:24 +01:00
Pea Tyczynska
9d2b60b56b Show try again link when email verification fails 2019-05-23 15:34:24 +01:00
Pea Tyczynska
ed599f0c03 Save new reply-to email if test notification delivered
Also check if it should be a default reply-to email address
2019-05-23 15:34:24 +01:00
Pea Tyczynska
45ac0d7812 Waiting page shows correct messages 2019-05-23 15:34:23 +01:00
Chris Hill-Scott
238c56faec Merge pull request #2984 from alphagov/fix-double-heading-letter-branding
Fix duplicated H1 on ‘New letter branding’ page
2019-05-23 10:36:08 +01:00
Chris Hill-Scott
9d1a7904a8 Fix duplicated H1 on ‘New letter branding’ page
For accessibility reasons a page should have one (and only one) H1. This
commit fixes an instance where the H1 was duplicated as a result of the
work done to componentize our page headings.

It also adds an extra check to `client_request` so that we don’t
introduce pages with multiple or no H1s in the future.
2019-05-21 16:09:00 +01:00
Chris Hill-Scott
0609229466 Merge pull request #2982 from alphagov/terse-org-set-text
Make ‘you must set organisation’ text shorter
2019-05-21 15:24:27 +01:00
Chris Hill-Scott
ee33f91621 Use new ‘add’ buttons on branding management pages
‘Add’ buttons are generally:
- at the bottom of the page
- sticky
- grey
2019-05-21 14:19:29 +01:00
Chris Hill-Scott
9d40986d53 Make ‘you must set organisation’ text shorter
So it fits in the column.
2019-05-20 16:15:47 +01:00