Commit Graph

14648 Commits

Author SHA1 Message Date
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
Chris Hill-Scott
c9f76e427d Fix tests 2019-07-10 10:18:30 +01:00
karlchillmaid
c4c8a34c46 Update 'reply-to email address' 2019-07-09 16:47:11 +01:00
karlchillmaid
d60675071e Update 'reply-to email address' 2019-07-09 16:43:54 +01:00
karlchillmaid
5195b7bcca Updated 'reply-to email address' 2019-07-09 16:42:38 +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
Chris Hill-Scott
04144b55be Merge pull request #3044 from alphagov/count-orgs-and-services-on-choose
Add count of organisations and live services for platform admin user
2019-07-09 14:53:17 +01:00
Chris Hill-Scott
ab624e05d3 Merge pull request #3046 from alphagov/stop-model-hiding-attribute-errors
Stop `JSONModel` hiding attribute errors
2019-07-09 14:53:05 +01:00
Chris Hill-Scott
cca19df73c Stop JSONModel hiding attribute errors
`__getattr__` is called whenever an attribute error is raised.

This means that if something deep inside a property on a model raised
an attribute error, that error would be caught by `__getattr__`, which
would then raise an exception that looked like the property itself
didn’t exist. Very confusing.

The solution seems to be to override `__getattribute__` instead, which
handles _all_ attributes, not just those that aren’t explicitly defined.
We then only intervene if the desired attribute is one of the
`ALLOWED_PROPERTIES`, otherwise falling through to the built in methods
of the underlying `object`.
2019-07-09 14:06:49 +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
c11a43cbc4 Update live services count when service is counted
If we change our mind and decide whether a service should/should not be
counted in the list of live services then we should also drop the cache
which stores the count of how many live services there are.
2019-07-08 14:46:34 +01:00
Chris Hill-Scott
959dd6ac38 Make one method for comma-formatting numbers
We were doing this a few different ways in different places.
2019-07-08 14:46:34 +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
76dd222726 Remove unused variable
Presume this is from when we used to render the letter preview in a
different way. Removing this saves us an API call every time we’re
loading this page.
2019-07-08 11:25:06 +01:00
Chris Hill-Scott
7fef51aa6a Apply sender to template when adding
If you’ve come from a template to add a new letter sender then it’s
because you want those words on that template. This commit adds the
extra API call to make that happen.
2019-07-08 11:20:28 +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 (Malgorzata Tyczynska)
dff20485b3 Merge pull request #3026 from alphagov/cancel-lettre-jobbe
Cancel letter job
2019-07-04 14:58:16 +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
b5db1ce61e Pull in latest utils 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
e751f57dc4 Merge pull request #3033 from alphagov/pyup-update-freezegun-0.3.11-to-0.3.12
Update freezegun to 0.3.12
2019-07-04 10:34:46 +01:00
Chris Hill-Scott
7901d08781 Style soft folder separators
If you can see a folder but not its parents we concatenate the
breadcrumb into one link.

This styles folder separators inside these links a bit differently to
make them do a bit less visual separation than the ones outside the
links.
2019-07-03 15:17:36 +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
acd992183c Use design system icon for breadcrumb
This is nicer because it’s drawn with CSS (so is resolution independent)
and is a bit darker to match the border colour (visually if not
actually).
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
003e926f27 Stop service name overflowing
This is just to stop it looking broken. 50% column width chosen to
maintain the rhythm of the grid.
2019-07-03 15:17:35 +01:00
Chris Hill-Scott
555b811fa7 Push headings down a bit
Now that there’s a bit more stuff in the service name area at the top
of the page it looks a bit cramped. Moving the heading down gives it a
bit more space to breath, and associates the heading a bit more closely
with the content after it.
2019-07-03 15:17:35 +01:00
Chris Hill-Scott
6338795e52 Make ‘switch service’ the same as ‘Change’ links
It looks inconsistent when the switch service link is 16px, right next
to a change link and organisation breadcrumb which is 19px.
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