Commit Graph

7170 Commits

Author SHA1 Message Date
Chris Hill-Scott
3132056266 Merge pull request #1397 from alphagov/fix-big-number-platform-admin
Fix big numbers on new platform admin page
2017-07-31 11:37:58 +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
pyup-bot
c495c7abab Update pyexcel-io from 0.4.2 to 0.4.3 2017-07-29 08:15:02 +01:00
Chris Hill-Scott
cd69003531 Merge pull request #1394 from alphagov/pyup-update-pytest-xdist-1.18.1-to-1.18.2
Update pytest-xdist to 1.18.2
2017-07-28 16:18: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
Ken Tsang
796fe0472f Renamed test 2017-07-28 15:19:20 +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
pyup-bot
c593cb4a8d Update pytest-xdist from 1.18.1 to 1.18.2 2017-07-28 12:33:04 +01:00
Pete Herlihy
3cbb7d1bcd Merge pull request #1393 from alphagov/features---local
Added some service level stuff
2017-07-28 11:35:54 +01:00
Pete Herlihy
506439431b Added some service level stuff 2017-07-28 11:17:04 +01:00
Chris Hill-Scott
a2107a7d6b Merge pull request #1391 from alphagov/fix-trial-mode-error
Fix error messages on one off sending
2017-07-27 16:37:38 +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
123247a178 Refactor test 2017-07-27 16:30:26 +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
Leo Hemsted
a60b3b4bc2 Merge pull request #1381 from alphagov/remove-credstash
remove credstash
2017-07-27 13:11:40 +01:00
Leo Hemsted
5d70b0edb0 remove credstash 2017-07-27 12:43:08 +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
88ff4a3264 Merge pull request #1388 from alphagov/bypass-api-client-init
Don’t set combined API on Notify python client
2017-07-26 12:13:46 +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
5fdbbda022 For some reason we’re generating XHTML <br>s now
¯\_(ツ)_/¯
2017-07-26 11:15:55 +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
9f9c2d5e87 Fix test which looks at text of radio buttons
Looks like `radio_button.text` no longer works. Probably a BeautifulSoup
change. More robust to look at the text of the label and the value of
the input anyway.
2017-07-26 11:12:32 +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
bd484cbe03 Merge pull request #1386 from alphagov/pyup-update-pytest-mock-1.6.0-to-1.6.2
Update pytest-mock to 1.6.2
2017-07-26 09:49:57 +01:00
Chris Hill-Scott
63f75a4cdc Merge pull request #1385 from alphagov/pyup-update-pyexcel-xlsx-0.4.0-to-0.4.1
Update pyexcel-xlsx to 0.4.1
2017-07-26 09:49:52 +01:00
Chris Hill-Scott
f88a8debfd Merge pull request #1384 from alphagov/pyup-update-pyexcel-0.5.0-to-0.5.2
Update pyexcel to 0.5.2
2017-07-26 09:49:44 +01:00
pyup-bot
34fbf4759a Update pytest-mock from 1.6.0 to 1.6.2 2017-07-26 09:43:43 +01:00
pyup-bot
5eac2bdbd0 Update pyexcel-xlsx from 0.4.0 to 0.4.1 2017-07-26 09:43:40 +01:00