Commit Graph

2869 Commits

Author SHA1 Message Date
Pea Tyczynska
77d281f44f Introduce new org types 2019-07-16 17:00:26 +01:00
Katie Smith
53214937a8 Stop allowing the service org type to be changed
The service organisation type will either be the same as the org type of
the service's organisation or will be set by a user when creating a new
service. This removes the ability to change it from the platform admin
settings table.
2019-07-16 11:36:19 +01:00
Chris Hill-Scott
e4abc74b80 Add a tiny bit more spacing under the folder heading when the user has no template search or channel filters 2019-07-12 16:03:52 +01:00
Chris Hill-Scott
886992af17 Merge pull request #3043 from alphagov/add-first-letter-contact-experience
Make adding a ‘letter contact block’ for the first time make sense
2019-07-12 15:14:18 +01:00
Chris Hill-Scott
8307e31cb4 Merge pull request #3051 from alphagov/revise-thanks-wording
Make ‘thanks’ page consistent with support page
2019-07-12 12:04:41 +01:00
karlchillmaid
a68db38dd5 Update 'your message' 2019-07-12 11:43:54 +01:00
Chris Hill-Scott
e1c4e51995 Make ‘thanks’ page consistent with support page
On the support page we now promise that we’ll:
- look at tickets within half an hour
- reply within one working day

The thanks page was always promising a reply within half an hour, during
business hours or an emergency. This commit changes the ‘thanks’ page to
be consistent with the support page.
2019-07-12 11:43:32 +01:00
karlchillmaid
c8a3564329 Merge pull request #3050 from alphagov/contact-call-to-action-update
Make 'contact us' links consistent
2019-07-12 11:30:23 +01:00
Chris Hill-Scott
c286ea5fc4 Merge pull request #3042 from alphagov/how-to-pay-update
Updated How to pay content
2019-07-12 10:49:09 +01:00
karlchillmaid
a425fc75d3 Update 'contact us' content 2019-07-12 10:11:32 +01:00
karlchillmaid
e096ff18fc Update 'contact us' content 2019-07-12 10:09:58 +01:00
karlchillmaid
f1c8768f63 Update 'contact us' content 2019-07-12 10:07:54 +01:00
karlchillmaid
18142e8a92 Update 'contact us' content 2019-07-12 10:06:57 +01:00
karlchillmaid
e90f9a2609 Update 'contact us' 2019-07-12 10:02:11 +01:00
karlchillmaid
318df17712 Update 'contact us' 2019-07-11 15:52:06 +01:00
karlchillmaid
4400a24af1 Update 'Contact us' 2019-07-11 15:50:04 +01:00
karlchillmaid
ba04daa64f Update 'contact us' 2019-07-11 15:45:47 +01:00
karlchillmaid
84c6958930 Add contact us 2019-07-11 15:35:52 +01:00
karlchillmaid
17c76eaed1 Update 'reply-to email address' 2019-07-11 14:21:37 +01:00
karlchillmaid
ba670cdcfc Add link to pricing 2019-07-10 15:16:22 +01:00
karlchillmaid
93acdd6de0 Update purchase order content 2019-07-10 15:01:13 +01:00
karlchillmaid
d60675071e Update 'reply-to email address' 2019-07-09 16:43:54 +01:00
karlchillmaid
82a9f841f4 Update 'reply-to email address' 2019-07-09 16:38:47 +01:00
karlchillmaid
1d471d8797 Update 'reply-to email address' 2019-07-09 16:37:22 +01:00
karlchillmaid
678dfcd156 Update content
Update references to 'reply-to email' and remove negative contractions
2019-07-09 16:35:02 +01:00
karlchillmaid
c1e8f82b0a Change 'email reply-to' to 'reply-to email' 2019-07-09 16:32:10 +01:00
karlchillmaid
8f982bf042 Add abbreviations 2019-07-08 16:14:43 +01:00
karlchillmaid
4321476491 Update app/templates/views/pricing/how-to-pay.html
Co-Authored-By: Chris Hill-Scott <me@quis.cc>
2019-07-08 16:08:42 +01:00
karlchillmaid
edbb1ee1da Update app/templates/views/pricing/how-to-pay.html
Co-Authored-By: Chris Hill-Scott <me@quis.cc>
2019-07-08 16:08:34 +01:00
karlchillmaid
a6c455fe24 Update app/templates/views/pricing/how-to-pay.html
Co-Authored-By: Chris Hill-Scott <me@quis.cc>
2019-07-08 16:08:26 +01:00
Chris Hill-Scott
6d5f542a88 Count of orgs and live services for platform admin
This makes it consistent that an option which contains more options has
a hint about how many options it contains.

Also adds a formatter to get us ready for 1,000 services 🎉
2019-07-08 12:31:31 +01:00
Chris Hill-Scott
b6932912ce Refactor back link into view layer 2019-07-08 11:31:55 +01:00
Chris Hill-Scott
90f56353ab Always offer option to add new sender
Not sure why we had this logic. We shouldn’t make you jump over to the
settings page if none of the available options are right for this
letter.
2019-07-08 10:48:40 +01:00
Chris Hill-Scott
fe7c3259c2 Go straight to add if no contact blocks yet
Same as previous commit, but for going forward, not back.
2019-07-08 10:48:40 +01:00
Chris Hill-Scott
8e080d6079 Go back to template if coming from template
Most users don’t have multiple contact blocks. So by default it should
feel like you’re just editing the one contact block, rather than
managing a collection of them. So this page skips the ‘choose’ page when
the user doesn’t yet have any contact blocks.
2019-07-08 10:46:43 +01:00
karlchillmaid
05e38ecb78 Updated How to pay content 2019-07-05 12:01:21 +01:00
Chris Hill-Scott
c709d7668e Merge pull request #3024 from alphagov/style-org-breadcrumb
Adjust type and spacing to accommodate organisation breadcrumb
2019-07-04 16:38:47 +01:00
Pea Tyczynska
0118787a56 Can't cancel letter job if job not processed yet
Also add more tests for showing or not the cancel those letters link

Also check if all notifications already in database

Upgrade delete button text logic to handle more cases

Also corrections following review
2019-07-04 14:44:22 +01:00
Pea Tyczynska
4a679a6583 Letter job can't be cancelled if already printed
Non-cancellable letter statuses mean that it's too late to cancel a job
2019-07-04 14:44:21 +01:00
Pea Tyczynska
ab953896ab User can cancel a letter job - happy path 2019-07-04 14:43:37 +01:00
Chris Hill-Scott
e731dd70d1 Use chevrons not slashes to separate folders
It looks weird to have two different visual treatments for showing a
navigable hierarchy.

I reckon losing the slash won’t make things less folder like – Windows
for example uses chevrons as foler separators.
2019-07-03 15:17:36 +01:00
Chris Hill-Scott
40fdf711e1 Use full width for folder heading if no manage link
If you don’t have permission to manage a folder we don’t show the link.
But we should also claw back the space that the link would have taken.
2019-07-03 15:17:35 +01:00
Chris Hill-Scott
b4dde3842e Make spacing below template folder heading even
It was a bit inconsistent depending on whether there was/wasn’t a search
box or channel tabs on the page.

I found this just too complicated to do in pure CSS, so added a new
spacing class which gets toggled on and off.
2019-07-03 15:17:35 +01:00
Chris Hill-Scott
d382385b69 Make things line up
This commit aligns and spaces elements on the page to show which are
related to others.

This needs some adjustment now because we potentially have more things
on the page now – we need to make space for them.
2019-07-03 15:17:34 +01:00
Chris Hill-Scott
96bd0a55b2 Move the breadcrumb inside the link
Putting the background image on the preceding breadcrumb item will allow
us to replace it with a pseudo element in a subsequent commit.
2019-07-03 15:17:34 +01:00
Chris Hill-Scott
27f1eeca0b Restrict max width of org and service name
Service names can be quite long. Organisation names can be quite long.
Together they can be very long. This isn’t great because:
- sometimes they overflow the width of the container, which looks broken
- even if they’re not that long they can make the UI look quite
  cluttered

This commit restricts them to widths that should stop the above from
happening. In the case of the organisation name the width has
specifically been chosen to line up with the ¼ and ¾ column grid
used by the navigation.
2019-07-03 15:11:42 +01:00
Chris Hill-Scott
1c02e611e4 Use same layout as other organisation pages
So it feels consistent from moving from one page to another, rather
than jumping in and out of the platform admin view.
2019-07-03 13:34:11 +01:00
Chris Hill-Scott
0916b2ba6b Require more information when creating organisations
Currently we set not-very-useful defaults for organisation type and
crown status when creating an organisation. This commit adds two field
to the form (in addition to the existing name field) to explicitly ask
for:
- organisation type
- crown status

We need these for all organisations before we can make any of their
services live.

This commit also records any new organisation as not having accepted the
data sharing and financial agreement, because if we don’t know about the
organisation already then they definitely won’t have signed it.
2019-07-03 13:34:11 +01:00
Chris Hill-Scott
1f02a2d3ab Determine agreement by service not user’s org
A user might not have a guessable organisation type, even if the service
they’re working on does have an organisation set. This can happen for
users with @nhs.net email addresses, for example.
2019-07-02 17:22:36 +01:00
Chris Hill-Scott
5368ddabbc Fix hard coded organisation name
😳
2019-07-02 16:46:23 +01:00