Commit Graph

923 Commits

Author SHA1 Message Date
Adam Shimali
12e1ff2f53 Merge pull request #200 from alphagov/email-flow-fixes
Consolidate page templates for emails + texts
2016-02-26 12:02:14 +00:00
Chris Hill-Scott
04e7aac99c Column headers on the check page should always be blue 2016-02-26 11:57:14 +00:00
Chris Hill-Scott
2f91848a42 Prefix text messages with service name
Brings in: https://github.com/alphagov/notifications-utils/pull/4
2016-02-26 11:57:13 +00:00
Chris Hill-Scott
70ef2f5a6f Fix example CSV for email templates
It should populate the CSV file with the user’s email address, not their phone
number.
2016-02-26 11:57:13 +00:00
Chris Hill-Scott
a51d92c87a Consolidate page templates for emails + texts
Use one page template for each of:
- choosing a message template
- adding recipients
- checking an email message
- looking at a job

This commit consolidates the two templates into one, and adds logic to show
the SMS message pattern or the email message pattern depending on the type of
template.

It also gives email templates a bit more width, because the body and the from
address tend to be quite long.
2016-02-26 11:57:13 +00:00
Adam Shimali
2c4119e2e0 Merge pull request #202 from alphagov/remove-sass-linting
Temporarily remove SASS linting
2016-02-26 11:54:32 +00:00
Chris Hill-Scott
d53dfec3fd Temporarily remove SASS linting
Trying to install gulp-sass-lint fails because some of its dependencies are not
met:
> npm install gulp-sass-lint
> npm ERR! Darwin 15.3.0
> npm ERR! argv "/usr/local/bin/node" "/usr/local/bin/npm" "install" "gulp-sass-lint"
> npm ERR! node v5.7.0
> npm ERR! npm  v3.7.5
>
> npm ERR! No compatible version found: lodash.upperfirst@^3.0.0
> npm ERR! Valid install targets:
> npm ERR! 4.1.2, 4.1.1, 4.1.0, 4.0.2, 4.0.1, 4.0.0
> npm ERR!

This commit removes it until we can work out what the problem is.
2016-02-26 11:46:52 +00:00
Adam Shimali
f9da10bd1e Merge pull request #199 from alphagov/celery-jobs
Celery jobs
2016-02-25 15:31:02 +00:00
Martyn Inglis
10d595c7a9 Merge branch 'master' into celery-jobs 2016-02-25 11:30:28 +00:00
Martyn Inglis
87391f2aa1 Renamed header of CSV to be 'to' - matches API 2016-02-25 11:30:09 +00:00
minglis
b4fd7f4ffd Merge pull request #198 from alphagov/fix-create-sms-template
Fix create SMS template
2016-02-25 10:50:32 +00:00
minglis
bd9d594e16 Merge pull request #197 from alphagov/broken-dashboard-link
Fix broken link on dashboard
2016-02-25 10:48:51 +00:00
Chris Hill-Scott
c733b4318e Fix create SMS template
When creating an SMS template the form validation was looking for a subject.
SMS messages don’t have a subject.
2016-02-25 10:43:48 +00:00
Martyn Inglis
942d255384 Merge branch 'master' into celery-jobs 2016-02-25 10:34:20 +00:00
Chris Hill-Scott
522bf0566a Fix broken link on dashboard
The link in the yellow box for adding a template was missing the parameter
specifying what type of template should be created.
2016-02-25 10:21:40 +00:00
Adam Shimali
602d505dc7 Merge pull request #196 from alphagov/get-users-for-service
Get users for service
2016-02-24 17:41:45 +00:00
Adam Shimali
53f704b8ed Merge pull request #195 from alphagov/remember_me_sign_on
Remember me functionality added and tested.
2016-02-24 17:36:40 +00:00
Rebecca Law
658a53422b Verify mock is called in the test 2016-02-24 17:32:15 +00:00
Nicholas Staples
c959678c49 Remember me functionality added and tested.
Merge extra.

Fixed comment.
2016-02-24 17:32:15 +00:00
Rebecca Law
2905d11fe4 Get users for service to show on the manage team page.
Calls api endpoint /service/<service_id>/users to retrieve all users associated with the service
2016-02-24 17:32:15 +00:00
Adam Shimali
bcf21f5ab2 Merge pull request #193 from alphagov/email-templates-part-2
Allow creation and editing of email templates
2016-02-24 17:27:51 +00:00
Adam Shimali
97cebe4511 Skip any boto related teset 2016-02-24 17:21:44 +00:00
Adam Shimali
2989f62252 Remove more mocks 2016-02-24 16:52:55 +00:00
Adam Shimali
588248deb0 Remove some mocks 2016-02-24 16:52:02 +00:00
Rebecca Law
ff5a20b817 Add mock_get_service to unit test 2016-02-24 16:40:39 +00:00
Rebecca Law
1d5bbd0d85 Set python version to 3.5 from 3.4 2016-02-24 16:27:17 +00:00
Rebecca Law
d24cea904b Bump the version of notifications-python-client 2016-02-24 16:24:50 +00:00
Adam Shimali
ed18a24594 Fix requirements for new utils 2016-02-24 16:10:42 +00:00
Martyn Inglis
c51d44fe43 Merge branch 'master' into celery-jobs
Conflicts:
	app/main/views/sms.py
2016-02-24 15:46:38 +00:00
Martyn Inglis
6e1267826f Removed print statement 2016-02-24 15:45:46 +00:00
Chris Hill-Scott
bc1899e8c0 Make email pattern work in new context
The email pattern looked a bit shonky when displayed in a narrower column. This
commit fixes it by making the email’s metadata (eg subject, from) into a table,
which it sort of is. This means that it is more flexible about the size of
container in which it sits.
2016-02-24 09:23:38 +00:00
Chris Hill-Scott
1e46922876 Make send the send flow generic
This commit parameterises all methods in the send view so that they can send
either emails or SMS messages.

It works out what kind of message it is sending from the `template_type`
property of the template object.

This means that the `Template` util class needs to know about these properties,
which means that this commit depends on:
https://github.com/alphagov/notifications-utils/pull/2

This commit does _not_ add tests for sending emails. The existing tests for
sending SMS still pass, but actually sending emails is outside the scope of
this story.
2016-02-24 09:23:38 +00:00
Chris Hill-Scott
aaa6317371 Rename SMS to send
Because this view is no longer just for sending SMS messages, it and its
associated tests should be renamed, so `send_sms.py` becomes `send.py`, etc.
2016-02-24 09:23:38 +00:00
Chris Hill-Scott
c6de605311 Add basic flow for adding email _or_ sms templates
Templates now have:
- a type (email or sms)
- a subject (if they are email templates)

We don’t want two completely separate view files for email and SMS, because they
would have an enormous amount of repetition.

So this commit adds
- different templates for SMS and email templates
- different form objects for SMS and email templates

…and wires them up.
2016-02-24 09:23:38 +00:00
Martyn Inglis
8247f3d568 Added subject to client calls for templates 2016-02-24 09:23:38 +00:00
NIcholas Staples
96e7239064 Merge pull request #192 from alphagov/get-user-by-email
Admin uses correct endpoint for getting user by email address.
2016-02-23 13:19:55 +00:00
Adam Shimali
d6f88f79e2 Admin uses correct endpoint for getting user by email address. 2016-02-23 12:47:48 +00:00
Chris Hill-Scott
3a11cb9044 Merge pull request #191 from alphagov/last-minute-fixes
Last minute fixes
2016-02-23 11:54:04 +00:00
Chris Hill-Scott
31b60730d3 Put banner on the choose sms template page 2016-02-23 11:49:47 +00:00
Chris Hill-Scott
9db0fff428 Bring back the tip banners 2016-02-23 11:32:33 +00:00
Chris Hill-Scott
db5aa0e092 Add banner back on send sms page 2016-02-23 11:24:40 +00:00
Chris Hill-Scott
2202994fdc Fix GOV.UK template images 2016-02-23 10:56:48 +00:00
NIcholas Staples
38545d728a Merge pull request #190 from alphagov/upload-form-csrf-fix
Fix missing CSRF token on send SMS page
2016-02-23 09:22:00 +00:00
Chris Hill-Scott
0d12714401 Automatically focus the first form field error
Because we’re not showing a summary of error messages screen reader users might
take a while to discover that there’s an error on the page. Since the only
real action on a page with errors is to correct them this commit adds some
Javascript to send focus straight to the first error message on a page.
2016-02-23 07:29:51 +00:00
Chris Hill-Scott
16fbfe49a3 Fix missing CSRF token on send SMS page
As part of https://github.com/alphagov/notifications-admin/pull/187 the file
upload pattern was changed to auto-submit once a file had been picked. The
form that was submitted was, however, missing a CSRF token, as well as a submit
button for non-JS users.

This commit makes the file upload pattern self-contained, so that it will always
include a form with a CSRF token in a hidden input and a submit button, which is
then hidden when Javascript loads.
2016-02-23 07:29:50 +00:00
minglis
7280e90c26 Merge pull request #189 from alphagov/job-metadata
Add count of rows in csv file as a notification count.
2016-02-22 15:37:57 +00:00
Adam Shimali
6c56f9be31 Add count of rows in csv file as a notification count. 2016-02-22 14:53:37 +00:00
minglis
e03b970039 Merge pull request #187 from alphagov/invite-users
Add pages to invite, edit, and delete users
2016-02-22 14:13:39 +00:00
Chris Hill-Scott
97a3bf9225 Remove the ‘manage templates’ page
The ‘manage templates’ page was almost identical to the ‘send text messages’
page.

This commit consolidates them into one and makes them all hang together.

Part of this means tweaks to the javascript so that files upload as soon as
you’ve chosen them.
2016-02-22 13:39:02 +00:00
Chris Hill-Scott
bf3f6d7d3e Fix users page for research
For the lab sessions, users should just see themselves as the only user, not
all the fake users (it might confuse them).
2016-02-22 13:39:02 +00:00