Commit Graph

445 Commits

Author SHA1 Message Date
Rebecca Law
8ab4a5b150 Merge branch 'master' into platform-admin
Conflicts:
	tests/app/main/views/test_dashboard.py
2016-03-21 13:23:46 +00:00
Chris Hill-Scott
304b411bd5 Merge pull request #309 from alphagov/move-documentation-page
Move documentation into footer, not behind login
2016-03-21 13:14:04 +00:00
Adam Shimali
c2c98248a1 If new sms requested, then check and send redirected to two factor
in all cases but should have redirected to verify for pending users.
2016-03-21 12:32:07 +00:00
Rebecca Law
a1ef676fab Merge branch 'master' into platform-admin
Conflicts:
	app/main/views/send.py
2016-03-21 12:18:44 +00:00
Chris Hill-Scott
2c3c802d5c Move documentation into footer, not behind login
https://www.pivotaltracker.com/story/show/115775183
2016-03-21 10:39:57 +00:00
Chris Hill-Scott
c40b9872a5 Merge pull request #308 from alphagov/pricing-page
Add pricing to the help page
2016-03-21 09:58:27 +00:00
Chris Hill-Scott
2d74c89ef2 Merge pull request #306 from alphagov/add-ga
Add Google Analytics
2016-03-21 09:58:12 +00:00
NIcholas Staples
d3758b53e3 Merge pull request #305 from alphagov/api_service_permissions
Api service permissions
2016-03-21 09:54:43 +00:00
NIcholas Staples
dbe8b5b6ec Merge pull request #304 from alphagov/add_valid_email_regexes
Add valid email regexes
2016-03-21 09:54:33 +00:00
Chris Hill-Scott
e6c55158a8 Add pricing to the help page\n https://www.pivotaltracker.com/story/show/115257059 2016-03-20 10:53:23 +00:00
Rebecca Law
402f55be23 Merge branch 'master' into platform-admin
Conflicts:
	app/__init__.py
	app/main/views/add_service.py
	app/main/views/jobs.py
	app/templates/main_nav.html
	tests/app/main/views/test_dashboard.py
	tests/conftest.py
2016-03-18 16:32:10 +00:00
Rebecca Law
13d9acf7dd Completion of the platform admin user story. 2016-03-18 16:20:37 +00:00
Chris Hill-Scott
0cda624657 Add Google Analytics
https://www.pivotaltracker.com/story/show/115861923

Makes some changes to the content security policy, to allow
the Google Analytics JS and trakcing image to be loaded,
copied from @alexmuller’s excellent work on GOV.UK:

https://gdstechnology.blog.gov.uk/2015/02/12/experimenting-with-content-security-policy-on-gov-uk/
https://github.com/alphagov/frontend/pull/733
2016-03-18 15:06:37 +00:00
Nicholas Staples
c9334bb9be Merge remote-tracking branch 'origin/master' into api_service_permissions 2016-03-18 14:43:10 +00:00
Nicholas Staples
c5efd87e31 Updated nav and choose template permissions. 2016-03-18 14:43:03 +00:00
minglis
0c43232c0c Merge pull request #287 from alphagov/notification_history_page
Notification history page
2016-03-18 14:32:55 +00:00
Nicholas Staples
4f63b68b4a merge with master 2016-03-18 12:07:50 +00:00
Nicholas Staples
8a203c0155 Valid email domains added and tests passing. 2016-03-18 12:05:50 +00:00
Adam Shimali
7ee173de51 Merge pull request #293 from alphagov/single-verify-code
Changed registration flow to first send email verification link that
2016-03-18 11:03:27 +00:00
Rebecca Law
d003dc4aa9 [WIP]: fixing unit tests 2016-03-18 10:49:22 +00:00
Nicholas Staples
3d08eb624b Merge with new master. 2016-03-18 10:16:14 +00:00
Adam Shimali
2792bece54 Changed registration flow to first send email verification link that
when visited sends sms code for second step of account verification.

At that second step user enters just sms code sent to users mobile
number.

Also moved dao calls that simply proxied calls to client to calling
client directly.

There is still a place where a user will be a sent a code for
verification to their email namely if they update email address.
2016-03-17 15:19:51 +00:00
Chris Hill-Scott
3945889e4e Add a link to help page from the trial mode banner 2016-03-17 14:58:17 +00:00
Chris Hill-Scott
774ac17ee9 Add a help page that explains trial mode
> We start in trial mode and there are a bunch of things that we need to know, so
> let's explain this with a page, accessed from the footer. Not requiring log in.
> Should explain:
> 50 messages per day
> Can only send to yourself or team members
> How to go live
> We can then link to this from the dashboard (and any other place) where we
> tell you that you're in trial mode.

https://www.pivotaltracker.com/story/show/115775751
2016-03-17 14:52:34 +00:00
Chris Hill-Scott
d1becbe1e3 Add cookie banner text, page, and footer links
> Let’s start the footer links with the cookie page.
> Banner to say: "GOV.UK Notify uses cookies to make the site simpler. Find out
> more about cookies"
> Standard style one... see
> https://www.registertovote.service.gov.uk/register-to-vote/cookies or
> https://www.digitalmarketplace.service.gov.uk/cookies
>
> Let's link to the feedback form too...
> https://docs.google.com/forms/d/1AL8U-xJX_HAFEiQiJszGQw0PcEaEUnYATSntEghNDGo/viewform
> Call it Support and feedback

https://www.pivotaltracker.com/story/show/115483375
2016-03-17 14:52:34 +00:00
Chris Hill-Scott
b38ae08ad6 Put some statistics on the dashboard
This commit adds two new sections to the dashboard

1. A banner telling you about trial mode, including a count of how many messages
   you have left today, which is a restriction of trial mode

2. Panels with counts of how many emails and text messages have been sent in a
   day, plus the failure rates for each

It does **not**:
- link through to any further information about what trial mode is (coming
  later)
- link through to pages for the failure rates (coming later)
- change the ‘recent jobs’ section to ‘recent notifications’
2016-03-17 14:06:12 +00:00
Nicholas Staples
0411238dd9 Add in anchor link, and update link in notification history. 2016-03-17 10:59:47 +00:00
Rebecca Law
b28fbc16d7 A platform admin user is able to see a list of all services.
Each service on the list is linked to the dashboard page of the service.
The platform admin user can see/edit templates, see/invite users, see/edit service settings.
The platform admin user can not send messages, see/edit api keys and developer docs.
2016-03-17 10:46:47 +00:00
Nicholas Staples
b0ca855ba8 Notification history page added and pagination, tests all working. 2016-03-16 16:57:10 +00:00
Chris Hill-Scott
2292ea4d15 Merge pull request #278 from alphagov/revert-201-stub-send-letters
Revert "Stub out the send letters page"
2016-03-16 11:11:31 +00:00
NIcholas Staples
4782d8ca1f Merge pull request #273 from alphagov/add_service_manager_message
added message if not templates and doesn't have ability to add templa…
2016-03-15 15:59:59 +00:00
Rebecca Law
5ae582f9be Remove reference to deleted endpoint 2016-03-15 12:02:03 +00:00
Nicholas Staples
a23b55c258 Changed div container to p tag. 2016-03-15 09:06:22 +00:00
Chris Hill-Scott
9827c83879 Revert "Stub out the send letters page"
Reverts alphagov/notifications-admin#201
2016-03-15 08:33:51 +00:00
Chris Hill-Scott
8e7b0edc4d Add page explaining how to send template using API
Would like to test something like this and see how well it works.

Intention of having this page is so:
- template IDs are discoverable (https://www.pivotaltracker.com/story/show/115404593)
- it’s obvious there’s an ‘automated’ way to send messages, as well as the CSV
  way (we’ve seen people oblivious to this in research)
2016-03-15 07:11:01 +00:00
Chris Hill-Scott
91b4545adc Don’t mix errors with valid rows
Brings in: https://github.com/alphagov/notifications-utils/pull/11

Changes the number of rows shown to be at most 15 (either 15 rows with errors
or 15 valid rows.
2016-03-14 16:53:21 +00:00
Chris Hill-Scott
41b278359c Start row numbers from 2
Because row 1 will be the column headers when you look at a CSV file in Excel.
2016-03-14 14:17:16 +00:00
Adam Shimali
67484d3f35 Merge pull request #269 from alphagov/invite-registration-sms-only
Change new invite registration flow to only need
2016-03-14 10:55:31 +00:00
Nicholas Staples
44e126f09c added message if not templates and doesn't have ability to add templates. 2016-03-14 10:49:11 +00:00
Chris Hill-Scott
a4d00cf67e Merge pull request #266 from alphagov/better-placeholder-guidance
Fix bugs and gripes with adding and editing templates
2016-03-14 10:45:00 +00:00
Chris Hill-Scott
144de21745 Make nav and page headings reflect permissions
> If you have the Edit templates permission but not the Send messages permission, the navigation should read
>
> - Text message templates
> - Email templates
> - Letter templates
>
> The page headings should also read
>
> - Text message templates
> - Email templates
> - Letter templates

respectively

https://www.pivotaltracker.com/story/show/115488955
2016-03-14 10:39:53 +00:00
Chris Hill-Scott
eea8ae5be4 Move ‘new thing’ buttons alongside heading
On the send messages and manage team pages we have big green buttons for
adding/inviting a new template or team member.

On the add template page it was at the bottom, and often got missed.

On the manage team page it was at the top, but maybe too prominent because it’s
big and green.

This commit tries putting it in the top right of the page instead (except when
the template page is empty, in which case it’s unchanged).
2016-03-14 10:39:53 +00:00
Chris Hill-Scott
370fd68a2c Fix innaccurate headings on add/edit template page
The same `.html` file is shared between adding a template and editing a
template.

The page heading needs to be contextual to the URL, either ‘add’ or ‘edit’.
Somewhere along the way this got lost; this commit reinstates it.
2016-03-14 10:39:52 +00:00
Chris Hill-Scott
b4e6f734c8 Reword the help text about adding placeholders
In research we’ve seen users struggle with this. Often they’d type
((Joe Bloggs)) or ((XX/XX/XXXX)) instead of a sensible name.

Lets see if explaining it differently helps.
2016-03-14 10:39:52 +00:00
Chris Hill-Scott
562fc4e73c Remove ‘cancel’ links from edit template page
Since cancel just takes you back to the list of templates, which is accessible
from the left nav, it’s only adding clutter to the page.
2016-03-14 10:39:52 +00:00
Adam Shimali
164bdad4f2 Change new invite registration flow to only need
sms for verification.

This may change again soon with story to split 2 factor
pages, but for now is correct.
2016-03-14 09:43:34 +00:00
Chris Hill-Scott
e1e86e4df5 Fix error message spacing on yes/no pattern
Error messages were added to the yes/no fields on the invite user page in:
4c323a9a99

This commit fixes the margins and padding on these fields so they look
consistent with how we do validation errors elsewhere.
t
2016-03-14 09:13:28 +00:00
Chris Hill-Scott
d9fd1d5117 Fix broken links in yellow box on dashboard
Links were missing the double mustaches.
2016-03-11 08:43:45 +00:00
Adam Shimali
4c323a9a99 Added error message on template for failing to choose permissions.
For error message over ride from WTF forms radio field created
custom field.
2016-03-09 17:42:47 +00:00
Adam Shimali
9523e224bc Removed links for deleting users. Also removed view function
that allowed deletion of users.
2016-03-09 15:30:40 +00:00