Commit Graph

808 Commits

Author SHA1 Message Date
NIcholas Staples
ef1ec2c9a1 Merge pull request #307 from alphagov/fix_for_syntax
Syntax fix
2016-03-18 15:42:44 +00:00
Nicholas Staples
24dbdc8202 Syntax fix 2016-03-18 15:37:58 +00:00
minglis
85b63fca81 Merge pull request #295 from alphagov/resize-textbox
Make textboxes expand to fit contents
2016-03-18 15:24:55 +00:00
minglis
0c43232c0c Merge pull request #287 from alphagov/notification_history_page
Notification history page
2016-03-18 14:32:55 +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
Nicholas Staples
3d08eb624b Merge with new master. 2016-03-18 10:16:14 +00:00
Chris Hill-Scott
8f0dd98d13 Remove method that maintain’s scroll parity
Since we don’t anticipate placeholder textboxes ever scrolling in the future,
this can be removed.
2016-03-18 09:24:25 +00:00
Chris Hill-Scott
0f3b0b38bc Make textboxes expand to fit contents
This applies to any textbox which has placeholders.

There are two reasons to do this:

1. Scrolling in textboxes is fiddly, especially on touch devices
2. Keeping the placeholders aligned with the textbox is fiddly too

These can both be avoided by always having the textbox be larger than its
contents so it never needs to scroll.

By default—and unlike other block-level elements—textboxes dont expand to fit
their contents. The layer with the placeholders in _does_ however, because it’s
a normal block-level element.

Since the layer with the placeholders always has an exact copy of what in the
textbox, we can set the textbox’s height to match the height of the layer with
the placeholders, and do this every time the content changes.
2016-03-18 09:19:21 +00:00
Martyn Inglis
cb570a814b Merge branch 'master' of github.com:alphagov/notifications-admin 2016-03-18 08:57:30 +00:00
Martyn Inglis
61e810fd52 Make dev run script align with prod run scripts
- we don't pass ENV into create_app anymore
2016-03-18 08:56:55 +00:00
Chris Hill-Scott
5e50be931e Merge pull request #285 from alphagov/cookie-page
Add information about cookies, add a help page
2016-03-17 17:06:01 +00:00
minglis
f6ee5dc8c6 Merge pull request #292 from alphagov/update-config-for-staging-live
Start aligning Admin app with config styles used elsewhere
2016-03-17 15:42:57 +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
Rebecca Law
643d047705 Fix division by zero 2016-03-17 14:40:08 +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
Martyn Inglis
2473b09beb Start aligning Admin app with config styles used elsewhere
- no config overrides - now all set in environment
- use different files for staging and live too allow for differently named env variables
- updates to run_app and run_tests scripts to set correct environment (test/development) so correct config picked up
- use environment file on deployed environments to pick correct config
2016-03-17 13:45:59 +00:00
Chris Hill-Scott
d04bde5486 Add API client for notification statistic
Adds a client for the endpoints added in
67c4bd2263
2016-03-17 13:15:41 +00:00
Nicholas Staples
0411238dd9 Add in anchor link, and update link in notification history. 2016-03-17 10:59:47 +00:00
Nicholas Staples
b0ca855ba8 Notification history page added and pagination, tests all working. 2016-03-16 16:57:10 +00:00
Rebecca Law
271e194e1c Should show the sent password reset link page when the user is not found. 2016-03-16 14:19:41 +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
Adam Shimali
4adbcebc6f Do not send email in case of invite.
The user does not have to validate the email token, but it
was still being sent.
2016-03-15 16:58:26 +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
Adam Shimali
7dca13407c Additional check needed to see if user was already a user for the
service that they were invited to.
2016-03-15 15:32:30 +00:00
minglis
803cb60402 Merge pull request #267 from alphagov/set-up-api-integration-link
Add page explaining how to send template using API
2016-03-15 12:03:02 +00:00
Rebecca Law
5ae582f9be Remove reference to deleted endpoint 2016-03-15 12:02:03 +00:00
Martyn Inglis
98833497dd Merge branch 'master' of github.com:alphagov/notifications-admin 2016-03-15 09:36:52 +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
Martyn Inglis
71abecf34c Merge branch 'master' of github.com:alphagov/notifications-admin 2016-03-14 17:06:19 +00:00
Adam Shimali
8561391cd2 The verify view was not passing along the next param to the two factor
view.

Now if it is passed and it is a url on the same domain that request
originates from then it is used.
2016-03-14 16:58:39 +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
Martyn Inglis
6c5f9f4cb2 Fix ordering of jobs 2016-03-14 16:50:02 +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
NIcholas Staples
f41e762d98 Merge pull request #270 from alphagov/fix-error-styling-invite-page
Fix error message spacing on yes/no pattern
2016-03-14 09:43:19 +00:00
NIcholas Staples
cf195b3a16 Merge pull request #271 from alphagov/remove-dao-layer
Start to remove the dao layer
2016-03-14 09:42:22 +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