Commit Graph

902 Commits

Author SHA1 Message Date
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
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
Martyn Inglis
4cab7ffb3c Merge branch 'master' into use_new_template_stats_endpoint 2016-08-22 12:55:11 +01:00
Martyn Inglis
5666719a92 Merge branch 'master' into more_wording_changes
Conflicts:
	app/templates/views/verify-mobile.html
2016-08-22 12:54:10 +01:00
Martyn Inglis
380a6526c4 Changed some more instances of "confirmation" code to "security" code 2016-08-22 12:52:05 +01:00
Chris Hill-Scott
78de805b9a Remove and/or from request to go live page
We don't use 'and/or' - you should just stick to 'and'.
2016-08-22 11:46:18 +01:00
Chris Hill-Scott
8cca2ef235 Lose the 'now' in the 'check your email' title 2016-08-22 11:46:10 +01:00
Chris Hill-Scott
aa166856b4 Change 'verification code' to 'security code'
Extensive testing on Verify has shown that this is understood better.
2016-08-22 11:46:07 +01:00
Martyn Inglis
55c4443a05 Admin app uses the new API response formats. 2016-08-18 15:30:57 +01:00
Martyn Inglis
d78c98970d Removed this date. Wasn't integrated. Data was incorrect and didn't respect it. No API calls ensured it was true. 2016-08-18 15:30:32 +01:00
Leo Hemsted
3c0f06a36d set value of radio input to be org id
also don't use nil, this isn't ruby
2016-08-15 10:39:34 +01:00
Chris Hill-Scott
6b5e64479a Add a page to set organisation and branding option
Platform admin only.

Adds radio buttons to choose one of:
- three hard-coded branding options
- organisations from a list provided by the API
2016-08-12 10:31:43 +01:00
Chris Hill-Scott
497a9548e3 Merge pull request #859 from alphagov/point-documentation-at-clients
Link to client documentation, not API documentation
2016-08-11 16:44:14 +01:00
Leo Hemsted
e94a00850a remove unused file 2016-08-10 15:40:41 +01:00
Chris Hill-Scott
3b2406ba02 Rename documentation to API documentation
Everything in this column of the footer is specifically to do with
the API now.
2016-08-10 10:36:08 +01:00
Chris Hill-Scott
bf6c3bfcc2 Move terms of use into help
Terms of use is non-technical, it should sit alongside the other
non-technical things like pricing.
2016-08-10 10:35:37 +01:00
Chris Hill-Scott
7010e35256 Remove example personalisation from template page
This was of dubious value, and the syntax probably isn’t accurate for
all languages.
2016-08-10 10:31:21 +01:00
Chris Hill-Scott
44a0845882 Replace documentation link with links to clients
In research we found that developers orientate themselves around the
API clients rather than the documentation.

We should get them to the client documentation as quickly as possible.

We currently link to the API documentation in three places:
- API integration page
- global footer
- template ‘API info’ page

For the first two this commit:
- removes the link to the documentation
- adds links to each of the 5 clients

For the last one it just removes the link entirely.
2016-08-10 10:31:10 +01:00
Leo Hemsted
3f3463b1ff Merge branch 'master' into remove-stats-from-send 2016-08-09 14:41:00 +01:00
Leo Hemsted
f2b6bfbfc2 Merge pull request #815 from alphagov/weekly-refactor
Weekly stats aggregate page refactor
2016-08-09 09:37:50 +01:00
Chris Hill-Scott
8c92737282 Make ‘total’ the default status on a job
The blue bar on the job page works out which is the current status from
the query parameters, not the parameters that the API gets called with.
2016-08-05 13:42:24 +01:00
Chris Hill-Scott
e482404eea Merge pull request #832 from alphagov/make-numbers-less-confusing
Make numbers on a job less confusing
2016-08-05 12:14:29 +01:00
Chris Hill-Scott
040af920e9 Merge pull request #827 from alphagov/move-guidance-underneath
Move guidance underneath
2016-08-05 12:14:17 +01:00
Chris Hill-Scott
01bb2ada0a Don’t let _set_status_filters mutate original list
Mutating stuff is scary and prone to problems. Better for it to
return a new list instead.
2016-08-05 11:02:30 +01:00
Chris Hill-Scott
d0ef913520 Add a message if there are more than 50 rows
Similar to how we do it on the check page, we should indicate if there
are more results than we can show. No-one’s really complained about the
absence of this, but it can’t hurt.
2016-08-05 10:59:49 +01:00
Chris Hill-Scott
9e6111fd00 Make ‘download’ wording consistent
We changed this on the jobs page in
9a5fbca707

Missed doing it on the notifications page.
2016-08-05 10:59:49 +01:00
Chris Hill-Scott
940815b33c Tighten up spacing around download link 2016-08-05 10:59:49 +01:00
Chris Hill-Scott
e621dddd6d Don’t show the download until the job is complete
The CSV report isn’t very useful until it has all the rows from your
original file. So we shouldn’t show you the link until all notifications
have been created.

Until this point, it’s useful to know how much longer you need to wait,
so this commit adds a percentage count of how much of the file has been
processed.
2016-08-05 10:59:49 +01:00
Chris Hill-Scott
3fcfdc1bce Make sending count down from total rows
It’s weird when the sending number ramps up to ~200 or so and then
just floats around as new rows are being added and older ones are being
marked as delivered/failed.

It’s also not great that you don’t know how many rows are in a file, if
you haven’t uploaded it yourself. But the only reason you want to know
this is to know how much work Notify has remaining to do.

So ‘sending’ should start from the total number of rows in the file
and count down.
2016-08-05 10:59:49 +01:00
Chris Hill-Scott
0e2d80018e Fix page title 2016-08-05 09:40:21 +01:00
Chris Hill-Scott
99ec0fd8d7 Make it clear who you’re sending the example to
It’s not one of your colleagues. You’re not inviting someone. We’ve seen
people get confused about this.
2016-08-05 09:32:58 +01:00
Chris Hill-Scott
d318a4e8a2 Don’t show banner on dashboard to API users
The "you only have permission to view this service" banner sort of
makes sense if you don’t have _any_ permissions, but it doesn’t if you
have permission to create API keys. If you can create API keys you can
do a lot more than just view the service.
2016-08-03 16:46:00 +01:00
Chris Hill-Scott
bc715b3dd8 Add Gwen’s initial guidance about formatting
This is based on some work Gwen did for Civil Service Digital. Let’s
get it in for now so that we have a starting point from which to
improve.

This specifically doesn’t reference ‘optional’ placeholders because I
don’t know how best to explain those yet.
2016-08-02 09:42:30 +01:00
Chris Hill-Scott
ee52e72f90 Move template guidance underneath
Two problems with having it on the side:
- some users didn’t see it at all
- there wasn’t space to have additional guidance about Markdown-style
  formatting
2016-08-02 09:29:11 +01:00
Chris Hill-Scott
30261cf385 Fix newlines in HTML emails
This problem was masked because the email message component was also
replacing newlines with `<br>`s.

Implements:
- [ ] https://github.com/alphagov/notifications-utils/pull/60
2016-08-01 14:29:08 +01:00
Leo Hemsted
bdc6691cb9 Merge branch 'master' into remove-stats-from-send 2016-08-01 13:53:08 +01:00
Chris Hill-Scott
d673cb1e9c Make page title match on API integration 2016-08-01 10:19:59 +01:00
Chris Hill-Scott
e6a0382243 Make page <title> on API info match page heading
Otherwise you might get it mixed up with the API integration page when
you have a bunch of tabs open.
2016-08-01 09:22:08 +01:00
Leo Hemsted
e2875ea66e Merge branch 'master' into remove-stats-from-send 2016-07-29 11:08:42 +01:00
Chris Hill-Scott
3eb0369511 Tell invited users why we need their phone number
Copies the hint text from the normal register page
2016-07-29 09:46:02 +01:00
Leo Hemsted
2ab23fa4ef move weekly summary page over to new notifications/weekly endpoint 2016-07-28 16:23:22 +01:00
Chris Hill-Scott
37923b77a9 Only show red strip if logged in
Mainly because the red/beta orange/blue combo looks gross. And also
because you’re not in admin mode until you’re logged in.
2016-07-28 09:13:40 +01:00
Chris Hill-Scott
f22b61b9f4 Add beta banner to homepage
Because the homepage of the app is discoverable to the public, it makes
“gives the wrong impression” for it not to have a beta banner.
2016-07-28 09:08:15 +01:00
minglis
4db855c5b5 Merge pull request #804 from alphagov/too-many-messages
Too many messages
2016-07-26 11:23:55 +01:00
Leo Hemsted
0accd88869 request stats for today from send page from GET /service/:id endpoint
also amended test cases to ensure they mock out correct call
2016-07-25 14:46:27 +01:00
Leo Hemsted
40ed6dfe8e replace _ underscores with - dashes 2016-07-25 14:29:01 +01:00
Leo Hemsted
e99d3263cb fix issues with too many messages partial not branching correctly
branch for "has service sent anything today" was around the intial
paragraph, rather than around the "you can still send..." bit -
they should always see the first paragraph, especially the bit that
points out if they're in trial mode. They don't need to see how
many messages they have remaining today if it's the same amount as
their daily limit.
2016-07-25 10:41:50 +01:00
Leo Hemsted
17087e3530 move too many messages error to its own partial 2016-07-25 10:41:50 +01:00
Leo Hemsted
afce715a3d fix issues with too many messages partial not branching correctly
branch for "has service sent anything today" was around the intial
paragraph, rather than around the "you can still send..." bit -
they should always see the first paragraph, especially the bit that
points out if they're in trial mode. They don't need to see how
many messages they have remaining today if it's the same amount as
their daily limit.
2016-07-21 15:03:49 +01:00
Leo Hemsted
20eb08a122 move too many messages error to its own partial 2016-07-21 15:03:32 +01:00