Commit Graph

1928 Commits

Author SHA1 Message Date
Chris Hill-Scott
403e133b80 Remove the phones 2016-12-07 16:14:30 +00:00
Chris Hill-Scott
92ad308fca Replace beta banner with beta badge
This is part of the new header style that Tim, Stephen et al have been
working on.

This means that we lose the feedback link, so I’m trying out having it
in the top right.
2016-12-07 16:14:30 +00:00
Chris Hill-Scott
397ad05db9 Make a full width base template
We need this because the top section of the new product page will be
going full-bleed.
2016-12-07 16:14:30 +00:00
Jenny Duckett
93405dd56b Move day and test key messages to <p> instead of left column
We don't want large numbers in Production to start overlapping other columns
in the tables when they have less space available, and putting these messages
at the top of the page under the h1 means that we don't need an extra column
on the page yet.
2016-12-06 12:46:11 +00:00
Jenny Duckett
df265f188d Move link to providers page to the header
This link looked odd floating above the left column, and although we may want
to have admin navigation on the left we aren't sure what that would include
yet, so move this link to the header alongside the Platform admin link.
2016-12-06 12:42:27 +00:00
Jenny Duckett
3a637c8fa9 Move "Today" heading to left column on platform admin page
When we make the numbers on this page more filterable the date range will be
one of the options to change, so it makes sense to move it to the side now
instead of leaving it above the big numbers.
2016-12-06 12:42:27 +00:00
Jenny Duckett
c88a961e04 Add option to exclude test key stats on platform admin page
This page currently includes all notifications for all services, including
those sent using a test key. Stats on all other pages exclude test key usage,
though, which can lead to confusion for admins comparing numbers between
pages. Adding the option to toggle between including and excluding test key
usage on the platform admin page gives context for this difference, and allows
admins to see live usage of the platform as well as load associated with test
key usage.
2016-12-06 12:42:27 +00:00
Chris Hill-Scott
fc2ea8aeb8 Merge pull request #1044 from alphagov/fix-alignment-usage
Fix alignment of year label on usage
2016-12-06 10:23:13 +01:00
Chris Hill-Scott
b3cb3a761a Merge pull request #1043 from alphagov/column-fix
Fix misaligned columns in CSV files
2016-12-06 10:23:08 +01:00
Chris Hill-Scott
62cb7b5d53 Fix alignment of year label on usage
It got pushed down too far when we added the switch service bar in
https://github.com/alphagov/notifications-admin/pull/1029

This commit fixes it so that the text aligns with the baseline of the
`<h1>`.
2016-12-05 13:02:19 +00:00
Chris Hill-Scott
18d11aa013 Move code for rendering messages/templates → utils
Utils is better structured to handle the logic of what thing to show
for what template type, especially now that what we show for different
template types in different contexts has diverged significantly.

See https://github.com/alphagov/notifications-utils/commit/6b39c1a for
an example of this code moving into utils

Depends on and implements:
https://github.com/alphagov/notifications-utils/pull/84

The main reason for doing this is to get Paul’s fix for the misaligned
CSV columns: https://github.com/alphagov/notifications-utils/pull/87
2016-12-05 12:11:54 +00:00
Martyn Inglis
0bc48897f3 Adds statsd to the application
- statsd client from utils
- adds to logger an get same method based reporting as we do for the API.
2016-12-01 17:21:06 +00:00
Martyn Inglis
08dc8fb13d Use the local APIClient rather than the one from the python-api-client
- ensures that all API calls set the request ID when talking to the API.
2016-11-30 17:01:44 +00:00
Martyn Inglis
202dd7d314 Override the BaseAPI Client
- This allows us to set a custom header for admin calls only (not needed in client calls)
- Adds request-id from Middleware to the API call to ensure the API logs against the same request ID.
2016-11-30 17:00:42 +00:00
Martyn Inglis
1384d2a61c Adds the request-id middleware to the admin app
- adds a request-id to each request and passes that through to the response
- this is picked up by the loggers and used to tie log events to a request
2016-11-30 16:59:47 +00:00
Chris Hill-Scott
d9d24e3c60 Remove the red header meaning signed in to admin
> Make the header bar red
>
> Red for admin is a good reckon.

– 286fc308d9 (part of https://github.com/alphagov/notifications-admin/pull/130)

Starting to think it’s not such a good reckon. Users could take a guess
at what it meant, but they often guessed wrong.

However, changing the colour of the header bar _is_ useful for us
internally to see which environment we’re in. So this commit makes three
changes:

1. On live, the header bar is always standard GOV.UK blue

2. On other environments, the header bar is some other colour (local is
   very different, staging and preview are related colours)

3. If an enviroment has a different header colour, it has it even when
   you’re not logged in.
2016-11-25 17:14:53 +00:00
Rebecca Law
1efa5530d4 Merge pull request #1027 from alphagov/deactivate-services-all-services-list
dont show inactive services on the choose service list
2016-11-23 16:10:44 +00:00
Chris Hill-Scott
9cf1fea395 Merge pull request #1032 from alphagov/feedback-page
Added route to the system status page to the feedback page
2016-11-21 15:02:16 +01:00
Pete Herlihy
5fa7bb78ef Added route to the system status page to the feedback page 2016-11-21 11:25:57 +00:00
Chris Hill-Scott
b6ad19fa31 Fix heading spacing on dashboard with 0 templates 2016-11-18 15:50:56 +00:00
Rebecca Law
a87129e117 Merge pull request #1030 from alphagov/remove-unused-get_all_notificaitons
Removed unused method
2016-11-18 14:55:25 +00:00
Rebecca Law
cebf8e1d65 Removed get_all_notifications method from notification_api_client as it is not longer being used. 2016-11-18 14:39:23 +00:00
Chris Hill-Scott
257fa7f9bb Shift propositional navigation down
This seems to be a custom thing done on Tim and Stephen’s prototype to
re-align the proposition nav. Not sure if it’s better or worse.
2016-11-18 12:00:01 +00:00
Chris Hill-Scott
ee78d0bf59 Move switch service out of black header
Also following the pattern work that Tim and Stephen have done.
2016-11-18 12:00:01 +00:00
Chris Hill-Scott
bfe234b535 Use two-weight GOV.UK Notify logo
Based on the work Tim, Stephen et. al have done on patterns for admin
interfaces across GaaP.

See their prototype here:
https://govuk-product-page-prototypes.herokuapp.com/govuk-notify
2016-11-18 11:59:40 +00:00
Leo Hemsted
805639a2e1 add test for choose services and related redirects to it
it'll just show the add service button if you only have archived services
2016-11-16 13:18:49 +00:00
Leo Hemsted
08881e5bd1 add get_active_services method
* all current invocations of get_services now call get_active_services
  EXCEPT for platform admin page (where we want to see inactive services
* cleaned up parameter names and unpacking (since *params is unhelpful)
* fixed incorrect kwarg name in conftest
2016-11-16 11:08:20 +00:00
Leo Hemsted
b885ce9cf4 clean up some usage of active in tests and remove it from service_api_client.create_service (created services are always active) 2016-11-16 11:08:20 +00:00
Leo Hemsted
045864f052 Merge pull request #1022 from alphagov/deactivate-services-plat-admin
Deactivate services plat admin
2016-11-16 11:07:52 +00:00
Chris Hill-Scott
48496eefde Merge pull request #1024 from alphagov/add-letters-templates-2
Let users upload a CSV file of addresses against a letter template
2016-11-15 17:57:28 +01:00
Leo Hemsted
5edb8cd086 revert platform admin statistics
was erroneously using 'requested' rather than calculating 'sending'
2016-11-15 11:12:19 +00:00
Leo Hemsted
d26f7ac441 Merge branch 'master' of github.com:alphagov/notifications-admin into deactivate-services-plat-admin 2016-11-14 17:15:05 +00:00
imdadahad
6a9973d1b6 Merge pull request #1025 from alphagov/show-email-sms-stats-platform-admin
Show email and sms counts for each service on platform admin
2016-11-14 16:56:00 +00:00
imdadahad
49082ab646 Revert user_profile back original
This change shouldn't be in this PR and got in somehow :(
2016-11-14 16:49:25 +00:00
Imdad Ahad
5ce0cbe1db Refactor stats into a macro and add format number red on failure 2016-11-14 16:42:08 +00:00
Imdad Ahad
eaa246bd26 Use SASS var for border colour and correct closing tbody tag 2016-11-14 16:00:45 +00:00
Chris Hill-Scott
a108165e47 Give more realistic example address data
Posit that examples of where you can put different parts of the address
is more helpful than ‘example, example, example’. Also shows that you
don’t have to fill all of the address columns.

Spot the Easter egg 🎅
2016-11-14 14:53:07 +00:00
Chris Hill-Scott
34e01824fa Add errors for missing address(es) 2016-11-14 14:53:06 +00:00
Chris Hill-Scott
69ad5fe156 Handle multi-column recipients
Implements https://github.com/alphagov/notifications-utils/pull/81

Handles addresses as multiple columns:
- in ‘Send yourself a test’
- in example CSV files
- in validating that a CSV file has recipients (eg at least an ‘address
  line 1’ and ‘postcode’ column)
- when showing the contents of a CSV file

As few UI changes as possible, once we have the thing working end-to-end
we can think about how the UI might need to work differently.
2016-11-14 14:53:06 +00:00
Chris Hill-Scott
5772fd34fe Remove placeholder letters page
👋 emoji
2016-11-14 14:51:28 +00:00
Chris Hill-Scott
70eec8fe73 Don’t let people actually start a letter job
Who knows what would happen if a job with a letter template actually
got into the database. `403`ing the page is a quick and dirty hack to
stop this from happening.
2016-11-14 14:51:27 +00:00
Chris Hill-Scott
0c5a224fef Add letter-specific formatting advice
Letters can’t have callouts.
2016-11-14 14:51:27 +00:00
Chris Hill-Scott
88631a680c Sprinkle letter throughout the app
Let users create/edit/delete letter templates.

Let them upload a CSV file or send a test against a letter template.

Big assumption at the moment is that addresses only have one line, and
therefore one column in the CSV file.
2016-11-14 14:51:26 +00:00
Chris Hill-Scott
4a0c860a04 Make border around letter neater
The drop shadow stolen from GOV.UK was a bit crude; this commit makes
it a bit more refined.

Also makes things line up a bit better.
2016-11-14 14:51:26 +00:00
Imdad Ahad
7e269a454a Show more granular email & sms counts on platform admin page 2016-11-14 14:46:26 +00:00
Imdad Ahad
ec7ec77b69 Return the email and sms stats instead of summing them 2016-11-14 14:45:41 +00:00
Chris Hill-Scott
fb410496dc Add letter component
Similar to the components we have for previewing email and text
messages.

Style stolen from PDF thumbnail at
https://www.gov.uk/government/publications/honey-bees
2016-11-14 14:29:13 +00:00
Chris Hill-Scott
620b0cf9ee Merge pull request #1021 from alphagov/fix-page-title-send-test
Fix page title on send test page
2016-11-14 15:04:52 +01:00
Chris Hill-Scott
e164c4d5b1 Merge pull request #1023 from alphagov/sms-sender-fix
Fix errant service name in text messages
2016-11-14 15:04:25 +01:00
Chris Hill-Scott
b68ebbb107 Fix errant service name in text messages
Was missed as part of:
https://github.com/alphagov/notifications-admin/pull/905
2016-11-14 13:08:27 +00:00