Commit Graph

2686 Commits

Author SHA1 Message Date
Chris Hill-Scott
e37c5f50ec Merge pull request #1395 from alphagov/pricing-update
Update pricing page with letters and international
2017-07-31 11:38:04 +01:00
Chris Hill-Scott
97e0af86e4 Add title to platform admin homepage 2017-07-31 11:33:39 +01:00
Chris Hill-Scott
1e1dd49312 Fix big numbers on new platform admin page
Turns out the counts were all showing as zero because the generator had
already been consumed by the time we were trying to do the stats. Making
it a list comprehension means it can’t get exhausted.
2017-07-31 11:29:04 +01:00
Chris Hill-Scott
ec6e028a9a Merge pull request #1390 from alphagov/remove-deprecation-warnings
Rename imports to get rid of deprecation warnings
2017-07-31 09:37:26 +01:00
Chris Hill-Scott
41ee0ba9c8 Merge pull request #1382 from alphagov/break-up-platform-admin
Break up platform admin
2017-07-31 09:37:20 +01:00
Chris Hill-Scott
432db3180b Merge pull request #1379 from alphagov/consistent-banners
Make banners more consistent
2017-07-31 09:37:13 +01:00
kentsanggds
08ee08760a Merge pull request #1392 from alphagov/ken-update-org-logos-use-s3
Update org logos to use logo CDN
2017-07-28 15:27:10 +01:00
Chris Hill-Scott
f3d7eea43e Hide international pricing by default
It’s really big.
2017-07-28 15:16:40 +01:00
Chris Hill-Scott
10f81d5d16 Make pricing table searchable
uses the same pattern as searching templates by name.
2017-07-28 15:16:17 +01:00
Chris Hill-Scott
10b87e433b Add international pricing table 2017-07-28 15:16:07 +01:00
Chris Hill-Scott
a1880bddda Add letter pricing table 2017-07-28 15:15:36 +01:00
Chris Hill-Scott
6d9434d968 Re-order page ready for new stuff 2017-07-28 15:15:02 +01:00
Pete Herlihy
506439431b Added some service level stuff 2017-07-28 11:17:04 +01:00
Chris Hill-Scott
5c9572805e Fix error messages on one off sending
This was causing a 500 in production.

This commit:
- reverts the code the working state it was before 68a1426e58
- figures out a way to make the tests pass without breaking the actual
  app
- confirms that mocking things is hard
2017-07-27 16:34:15 +01:00
Ken Tsang
9c99381650 Remove logo bucket from config 2017-07-27 16:33:56 +01:00
Ken Tsang
35f66cae23 Update emails to use logos cdn 2017-07-27 16:10:59 +01:00
Chris Hill-Scott
5c49c08db7 Rename imports to get rid of deprecation warnings
These imports have moved. One day importing them by the old name will
stop working. For now they just leave a warning in our logs. But better
not to have those warnings in our logs.
2017-07-27 15:17:17 +01:00
Chris Hill-Scott
17a7f5f2c6 Remove last used message if key’s never been used
I don’t think it adds anything to tell you that a key’s never been used.
The value of the ‘key was used 3 minutes ago’ message is in stopping you
accidentally revoking something you shouldn’t have.
2017-07-27 11:52:55 +01:00
Chris Hill-Scott
e2bd2e0439 Ensure only one <h1> per page, even with errors
A page should have only one `<h1>` element. So if there’s an error
message, which contains a `<h1>`, it should replace the page’s normal
`<h1>` element, rather than sit above it.
2017-07-27 11:52:54 +01:00
Chris Hill-Scott
befe93ec0b Make sure confirmation/danger banners have a H1
This makes errors on all pages have a `<h1>` element, which is important
for accessibility. It means a bit of rewriting the messages, but I think
they’re better for it.
2017-07-27 11:52:54 +01:00
Chris Hill-Scott
40e79c6827 Use confirmation banner for revoking API keys
Currently revoking an API key takes you to a separate page. It should
work the same way as other destructive actions, ie staying on the same
page but with a banner asking you to confirm the action.
2017-07-27 11:52:54 +01:00
Chris Hill-Scott
d51ffe6b39 Use yellow warning banner for permissions message
The green bordered banner feels too much like ‘success’ or
‘confirmation’. Doesn’t feel like it’s something which just gives you
the status of a thing, or here’s a thing you should be aware of.
2017-07-27 11:52:54 +01:00
Chris Hill-Scott
c15491974d Use black text with a border for default banner
We use panels with a blue banner to indicate something that’s clickable.
So we should move away from this style for things that are just
notifications. We can’t use teal like other bits of GOV.UK because it
doesn’t pass colour contrast.

Pay are using a box with a green border, similar to the error validation
box (which has a red border). So let’s do the same for now.
2017-07-27 11:52:38 +01:00
Chris Hill-Scott
05b1292e9d Make text black in error/danger banners
For consistency with what GOV.UK Elements does, the text in our banners
should be black, not red. See examples here:
http://govuk-elements.herokuapp.com/errors/#summarise-errors

This also makes us consistent with what Pay are doing.
2017-07-27 11:52:38 +01:00
Chris Hill-Scott
415e1a401a Don’t set combined API on Notify python client
Because we’re setting the API key and service ID after calling the
`__init__` method of the client it wasn’t doing the thing where it
splits the combined key into the two individual UUIDs. So we still need
to set them directly, individually on the client.
2017-07-26 12:08:10 +01:00
Chris Hill-Scott
ae1a0b4804 Merge pull request #1387 from alphagov/fix-breaking-change-python-client
Fix things that broke when I merged Pyup’s changes
2017-07-26 11:42:01 +01:00
Chris Hill-Scott
9b8397db1c Merge pull request #1383 from alphagov/fix-one-off-errors
Fix error messages in one-off flow
2017-07-26 11:41:55 +01:00
Chris Hill-Scott
a41a61fe45 Merge pull request #1380 from alphagov/continue-not-next
Use ‘Continue’ not ‘Next’ for button text
2017-07-26 11:41:45 +01:00
Chris Hill-Scott
ce114f1342 Use import from its new location
Making this change gets rid of a deprecation warning from our logs.
2017-07-26 11:20:33 +01:00
Chris Hill-Scott
66196420d7 Remove deprecated decorator
Should use the normal Flask error handler. Making this change gets rid
of a deprecation warning from our logs.
2017-07-26 11:19:42 +01:00
Chris Hill-Scott
5596da3ff9 Address deprecation warning around wtf Form
It’s been renamed to avoid a conflict. Not a conflict we have to worry
about. So we can just change our import and get rid of the deprecation
warning.
2017-07-26 11:18:44 +01:00
Chris Hill-Scott
68a1426e58 More Python client weirdness
There’s some weird interaction between the message attribute of the
exception and mocking.

Luckily there is an internal attribute – `_message` which doesn’t go
through all the magic.
2017-07-26 11:13:37 +01:00
Chris Hill-Scott
5ddbe80ea9 Fix calls to API client which now takes fewer args
The Notify API client changed in version 4 to take two arguments, not
three (service ID was removed in favour of the combined API key).

This gets a bit gnarly because the API key has to be at least a certain
length so it can be substringed internally.
2017-07-26 11:10:37 +01:00
Chris Hill-Scott
3d076efeea Merge pull request #1357 from alphagov/pyup-initial-update
Initial Update
2017-07-26 09:43:27 +01:00
Chris Hill-Scott
cc1f16147b Remove extra platform admin links from top nav
These have moved to the platform admin’s internal navigation now.
2017-07-26 07:56:20 +01:00
Chris Hill-Scott
05707a1700 Remove list of services from platform admin index
We have two new pages for live and trial services that:
- are faster loading
- are now linked to

So the list of services doesn’t need to be on the platform admin index
page any more.
2017-07-26 07:56:20 +01:00
Chris Hill-Scott
cfc572d4f7 Add some internal navigation for platform admin
There are way too many links in the top nav now (when you’re using the
site as a platform admin).

And how often are you going to look at the letter jobs page really?

This commit adds some internal navigation for the platform admin area of
the platform, copying the style that works for navigating a single
service.
2017-07-26 07:56:20 +01:00
Chris Hill-Scott
26b333512c Add separate pages to view live/trial services
We have a lot of services now. Mostly we want to look at what live
services are doing. So loading up the trial mode services every time
slows things – generating, rendering and using the page – right down.

This commit adds two new pages, one to view only live services, and one
to view trial mode services.
2017-07-26 07:56:19 +01:00
Chris Hill-Scott
a58d881647 Make one-off error refer to correct message type
This was hard coded to say ‘You can’t send to this phone number’ even
when you were trying to send an email.
2017-07-26 07:50:01 +01:00
Chris Hill-Scott
2291c4faf4 Make sure errors on one-off flow have red border
When I split up the error messages on the check CSV page into multiple
templates, I also reduced the repetition of wrapping `<div>`s and macro
calls by moving them up outside the conditional blocks (see
8e947f315d).

Unfortunately I didn’t make the same adjustments for the one-off flow,
which meant that errors on these pages lost their styling. This commit
re-adds the styling for these error messages.
2017-07-26 07:46:20 +01:00
Chris Hill-Scott
6dd4ae7410 Move platform admin template into folder
This is so that we can add a few other platform admin templates
alongside it, and keep everything nicely organised.
2017-07-25 14:44:35 +01:00
Chris Hill-Scott
b4c05ed697 Use ‘Continue’ not ‘Next’ for button text
The service manual recommends to:

> Make sure your ‘Continue’ button is:
>
> - labelled ‘Continue’, not ‘Next’
> - aligned to the left so users don’t miss it

– https://www.gov.uk/service-manual/design/question-pages
2017-07-24 16:52:17 +01:00
Chris Hill-Scott
32ae0a9b36 Merge pull request #1364 from alphagov/letter-job-page-real
Customise the job page to make sense for letters
2017-07-21 13:10:09 +01:00
Chris Hill-Scott
35e39eb45b Merge pull request #1374 from alphagov/split-the-check
Split the ‘check’ template into three separate templates, add error tracking
2017-07-20 14:02:12 +01:00
Chris Hill-Scott
82233340b6 Track errors when uploading spreadsheets
Uses the new javascript event tracking stuff so that we can see what
errors people are getting when they upload spreadsheets.
2017-07-20 12:06:15 +01:00
Chris Hill-Scott
eb264f34b7 Add a little JS module to track events
Google analytics lets you send:
- pageviews
- events

Page views are used by default. But sometimes you wanna count something
which isn’t the user navigating to a new page, or you wanna track
something which isn’t just what page they were looking it. This is where
events are useful.

This commit adds a small JS module that lets us fire off an event when
the presence of an element with the right data attributes are present on
the page.
2017-07-20 12:06:15 +01:00
Chris Hill-Scott
56945565ba Don’t indent column headings if no row errors
The reason to indent the first column heading is so that the number 1
lines up with the numbers of subsequent rows.

This only happens when the subsequent rows are indented because of the
red bars. This is only when there are row errors, not when there are
more general errors.
2017-07-20 12:01:59 +01:00
Chris Hill-Scott
8e947f315d Refactor check error templates to repeat less
There was a lot of repetetive wrapping code being repeated for every
conditional block in these files. Let’s wrap it around the whole
conditional bit once instead.
2017-07-20 12:00:56 +01:00
Chris Hill-Scott
94bc8191ae Remove irrelevant stuff from error check pages
If you have errors in your file then there’s stuff you’re not going to
see on the page. So this doesn’t need to be in the Jinja templates that
are only used when there are errors.

Basically the conditional stuff is moving up to the level above these
templates.
2017-07-20 11:56:37 +01:00
Chris Hill-Scott
5a9f817e52 Remove anything error-related from the OK view
If you’ve uploaded a file and everything is OK, the page that you see
doesn’t need to look at any errors (because there won’t be any).
2017-07-20 11:55:46 +01:00