minglis
1651c72b3d
Merge pull request #912 from alphagov/fix-dashboard-page
...
Fix dashboard page
2016-08-30 11:00:29 +01:00
Chris Hill-Scott
8ff70f0814
Merge pull request #904 from alphagov/make-settings-page-a-table
...
Make settings page a table and do a better job of explaining the reply to address/text message sender
2016-08-26 15:49:49 +01:00
Martyn Inglis
8c159da3ea
Fix for admin app to show job data on dashboard page
...
- uses the new stats block in the API to build the stats expected by the dashboard page
- all work done in client
2016-08-26 15:21:10 +01:00
Chris Hill-Scott
e6fd8faa02
Optionally prefix text message on job page
...
Missed this as part of #905
2016-08-26 15:20:06 +01:00
Chris Hill-Scott
01ac70f6a0
Merge pull request #905 from alphagov/sms-sender-no-prefix
...
Don’t prefix text messages is sender name is set
2016-08-26 15:10:34 +01:00
Chris Hill-Scott
c745422578
Don’t prefix text messages is sender name is set
...
Implements:
- [x] alphagov/notifications-utils#66
2016-08-26 14:45:26 +01:00
Leo Hemsted
4fbd23d5e9
Merge pull request #907 from alphagov/plat-admin
...
Platform admin stats rework
2016-08-26 13:51:36 +01:00
minglis
9a60cf49a4
Merge pull request #899 from alphagov/handle-new-jobs-api
...
Handle new jobs api
2016-08-25 09:56:30 +01:00
Martyn Inglis
c61199d17d
Rewrote some slighlt over complicated logic
2016-08-25 09:15:55 +01:00
Leo Hemsted
6ad7b019ea
added tests for reworked platform admin page
2016-08-24 17:39:20 +01:00
Leo Hemsted
b983f020ff
remove old statistics_api_client
...
now unused - replaced mock fn with detailed_services too
2016-08-24 16:26:08 +01:00
Chris Hill-Scott
82b5cc6fc6
Remove 3/4 width column on settings pages
...
The mesaure on these pages was too short, making them awkward to read.
Also varies the size of text boxes to make them appropriate to the
expected size of content that they will contain.
2016-08-24 15:31:49 +01:00
Chris Hill-Scott
09d4ff44bb
Make back button text consistent
2016-08-24 15:26:04 +01:00
Chris Hill-Scott
58b2a8a825
Make email branding settings a table
...
So that it matches the other settings on this page
2016-08-24 15:26:04 +01:00
Chris Hill-Scott
e234ed9741
Make live and research mode switches into buttons
...
They change state, so they should be buttons (even if they’re still
links).
2016-08-24 15:26:04 +01:00
Chris Hill-Scott
c5c693ef0b
Add some explaining to the SMS sender page
2016-08-24 15:26:03 +01:00
Chris Hill-Scott
709882065f
Add some explaining to the email reply to page
2016-08-24 15:26:03 +01:00
Chris Hill-Scott
8eb2dadaa6
Add spacing, balance type size
2016-08-24 15:20:07 +01:00
Chris Hill-Scott
3b3245adbd
Explain trial mode on the settings page
...
The previous text on this page around trial mode was a bit of a
mouthful. Also it only really made sense if you already knew what trial
mode was.
This commit tries to make it really explicit:
- that you’re in trial mode
- what it means to be in trial mode (copied from the trial mode page)
- where you go to not be in trial mode
2016-08-24 15:16:13 +01:00
Chris Hill-Scott
05a493f1e8
Remove ‘suspend API keys’
...
This was an early reckon feature. There were a few of problems with
it:
- it worked on the service, not just on the API keys as described
- it was back to front, ‘suspending’ a service set `active` to `True`,
reactivating it set `active` to `False`
- no part of the API actually respected the `active` flag on a service
The same intent can be acheived by either:
- revoking an API key
- having a platform admin put your service back into trial mode
So this commit removes the link and the code behind it.
2016-08-24 15:12:00 +01:00
Chris Hill-Scott
036f2a8880
Allow text_fields to have an optional status
...
Status is used for making the text greyed-out or red, etc.
2016-08-24 15:09:36 +01:00
Chris Hill-Scott
fc93d9ff52
Add an ‘edit’ field type
...
Like the link field, but right aligns so that it sits nicely in the
last column of a table.
2016-08-24 15:09:05 +01:00
Chris Hill-Scott
f84e8e2519
Remove flash messages when changing settings
...
Since we’re playing back the values in the table there’s no need to
give confirmation of the new value in a flash message.
2016-08-24 15:08:27 +01:00
Chris Hill-Scott
3719cdd115
Make settings page a table not a browse list
...
There’s no way of seeing what the current settings are for a service
without individually going to the pages where you can change them.
This commit replaces the list of settings with a table. The table plays
back the current value for each setting.
This is a pattern that has worked well on various services[1] as well
as on our own user profile page.
1. https://designpatterns.hackpad.com/Check-your-answers-page-2DSpTH9J0wU
2016-08-24 15:04:56 +01:00
Chris Hill-Scott
1691c1a821
Make page <title> match navigation and <h1>
2016-08-24 15:04:16 +01:00
Leo Hemsted
7864f9455d
rewrite platform-admin page to use new non-stats endpoints
...
had to change because format from api is slightly different
2016-08-24 15:04:03 +01:00
Chris Hill-Scott
0252a1792a
Split platform admin settings into new section
...
Makes it clearer what a normal user can change and what a platform
admin can change.
2016-08-24 15:02:52 +01:00
Martyn Inglis
d56c14e147
Actually use the right exception class.
...
Two HTTPError classes exist. Need to use the one in notifications_python_client.
2016-08-24 12:12:19 +01:00
Martyn Inglis
d149a9691a
Added tests for the 2 use cases:
...
used templates
unused templates
2016-08-24 12:09:38 +01:00
Martyn Inglis
0b95a30e2f
Raise the exception if not a 404
2016-08-24 11:26:34 +01:00
Martyn Inglis
6e3759eb1f
Merge branch 'master' into new-api-for-deleting-templates
...
Conflicts:
app/main/views/templates.py
2016-08-24 11:05:19 +01:00
Martyn Inglis
5b2ae43d5d
Wrote some tests around the stats conversions.
...
Properly named the finished parameter.
Handled the root JSON key
2016-08-24 10:35:04 +01:00
Martyn Inglis
b5de1dae5e
Merge branch 'master' into handle-new-jobs-api
2016-08-23 16:59:28 +01:00
Martyn Inglis
4a551329c5
Parse the JOB API response converting new style response to old style object
...
- allows migration of API
2016-08-23 16:58:50 +01:00
Chris Hill-Scott
cd091af9e7
Merge pull request #894 from alphagov/fix-research-mode-toggle
...
Fix admin app putting service into research mode
2016-08-23 14:27:02 +01:00
Chris Hill-Scott
0f6a090470
Fix admin app putting service into research mode
...
We changed the `update_service` method to only update indivdual
attributes of a service, and only allow it to update specified
attributes: 0cfe10639a
We neglected to specify `research_mode` as one of the allowed
attributes.
This broke the app’s ability to put a service in or out of research
mode.
This commit:
- makes sure the tests cover this eventuality
- fixes the bug by specifying `research_mode` as one of the allowed
attributes
2016-08-23 10:16:27 +01:00
Martyn Inglis
c44a6cb65d
Merge branch 'master' into new-api-for-deleting-templates
2016-08-23 09:31:05 +01:00
Martyn Inglis
49b4387b25
Merge branch 'master' into handle-new-template-stats-endpoint
2016-08-23 09:30:38 +01:00
Martyn Inglis
4dec7a7939
Changed order of templates activity page from alphabetical to desc count.
2016-08-23 09:14:21 +01:00
Andras Ferencz-Szabo
25009f3ac9
Merge pull request #870 from alphagov/jenkins_deploy
...
Create Docker build image, build project with Docker
2016-08-22 17:57:28 +01:00
bandesz
26ff449b77
Create Docker build image, build project with Docker
2016-08-22 17:25:05 +01:00
Martyn Inglis
54e4311d1b
Merged in the defensive code by mistake
2016-08-22 16:56:43 +01:00
Martyn Inglis
9fbd410474
Merge branch 'master' into use_new_template_stats_endpoint
...
Conflicts:
app/notify_client/template_statistics_api_client.py
2016-08-22 16:47:42 +01:00
Martyn Inglis
c43fde0ac0
For the brief moment when we have incompatible API versions out,
...
We won't call template stats by template id as the format has changed. So just ask the question "do you want to delete" without the context.
2016-08-22 16:35:14 +01:00
minglis
8a04770c8e
Merge pull request #878 from alphagov/handle_api_response
...
Handle the API migration
2016-08-22 16:30:37 +01:00
Martyn Inglis
9d25f326b0
Using new endpoint for template statistics
...
- gets notifications by template id, returning the most recent to illustrate the last use of that template.
2016-08-22 16:25:35 +01:00
Chris Hill-Scott
d893a67fc2
Another content change from Gwen
...
_Missed this one because it was in a different email_
We don't use 'we'.
It's better to say 'An email has been sent to...'
2016-08-22 15:47:25 +01:00
Chris Hill-Scott
1e254415d2
Text message not Sms
2016-08-22 13:30:03 +01:00
Martyn Inglis
63fa77fde7
Admin app now in line with new API response for template statistics
...
- dropped the day level aggregate. Now grouped by template only,
2016-08-22 13:14:35 +01:00
Martyn Inglis
4cab7ffb3c
Merge branch 'master' into use_new_template_stats_endpoint
2016-08-22 12:55:11 +01:00