Commit Graph

950 Commits

Author SHA1 Message Date
Chris Hill-Scott
0e22c9b2e0 Fix hidden trial mode link
This link wasn’t styled, therefore it had, by default, the same colour
as its background (blue).

This commit explicitly sets it to be white, so it is visible against its
background.
2016-04-05 13:44:53 +01:00
Chris Hill-Scott
53883fc162 Merge pull request #384 from alphagov/fix-heading-send-page
Fix incorrect heading on send page
2016-04-05 12:14:26 +01:00
Nicholas Staples
359d1c29cb Bug fixed, links now work. All tests passing. 2016-04-05 11:29:24 +01:00
Chris Hill-Scott
7153be1fc6 Fix incorrect heading on send page
Accidentally reverted here: f84797e6d5 (diff-f7abe60b3b6c55859d983b3e19008838L14)

Matches the link on the choose template page.
2016-04-05 11:20:52 +01:00
Chris Hill-Scott
69e868f454 Merge pull request #380 from alphagov/svg-images-tour
Use SVG images for tour
2016-04-05 10:28:26 +01:00
Chris Hill-Scott
2652e6abee Merge pull request #377 from alphagov/sort-out-help-pages
Split Help page into Trial Mode and Pricing pages
2016-04-05 10:20:57 +01:00
Chris Hill-Scott
b912fa3f66 Merge pull request #376 from alphagov/dont-accepted-csv-with-restricted-recipients
Show error if restricted service uploads real CSV
2016-04-05 10:16:20 +01:00
Chris Hill-Scott
c95123914a Fix re-uploading of CSV files
The problem
---

1. Upload a CSV with problems
2. See the validation errors on the page
3. Try to re-upload the file
4. Get this error:

> Method Not Allowed
> The method is not allowed for the requested URL.

https://www.pivotaltracker.com/story/show/116882241

The cause
---
The POST route for the check page (where you see errors in your files)
was removed here:
f3fd5f6b15 (diff-1dd8b3bf53dfd9382c7721051f3d930dR280)

The fix
---
This commit adds:
- a simple route which re-calls the initial ‘I have uploaded a file’ route
- a test to make sure that both of these routes are POSTed to
2016-04-05 09:02:52 +01:00
Chris Hill-Scott
7a0a81c07c Show error if restricted service uploads real CSV
Implements: https://github.com/alphagov/notifications-utils/pull/16

Also changes a bunch of the mocked phone numbers to be real-looking so
that the tests are checking for the right kind of error.
2016-04-04 17:17:52 +01:00
Chris Hill-Scott
0a3567ec48 Add page <title>s to tour pages 2016-04-04 17:08:30 +01:00
Nicholas Staples
c31c55666b Added current_service to flask context and template context.
Fix all tests and conflicts.

Removed comment line.
2016-04-04 17:01:20 +01:00
Chris Hill-Scott
47b86e70df Use SVG images for tour
SVG images will look sharper and scale more cleanly. However they are
not supported on older browsers[1]

> The <picture> element allows for fallback images when the browser
> doesn't support a specified image format.

`<picture>` is supported in the latest versions of Chrome, Firefox, IE
(Edge), Safari and Android, so all these browsers will get the SVG
version.

Older browsers will fall back to the PNG version.

[1] http://caniuse.com/#feat=svg
[2] https://css-tricks.com/a-complete-guide-to-svg-fallbacks/#fallback-svg-as-img-picture
[3] http://caniuse.com/#feat=SVG
2016-04-04 16:55:06 +01:00
Nicholas Staples
a41dda8884 Working functionality for filtering notifications and all tests passing. 2016-04-04 16:34:06 +01:00
Henry Hadlow
e51f7066e4 Merge branch 'sort-out-help-pages' of github.com:alphagov/notifications-admin into sort-out-help-pages
* 'sort-out-help-pages' of github.com:alphagov/notifications-admin:
  Split Help page into Trial Mode and Pricing pages
2016-04-04 16:30:55 +01:00
Henry Hadlow
19c01101c3 Remove commented content -- still in git history 2016-04-04 16:28:21 +01:00
Henry Hadlow
ac576c6529 Split Help page into Trial Mode and Pricing pages
- Add routes
- Add footer links
- Make heading size consistent on Cookies page
2016-04-04 16:03:52 +01:00
Henry Hadlow
c23e22a0df Fix tests -- update link on Request to go live page 2016-04-04 15:29:54 +01:00
Henry Hadlow
246023616a Split Help page into Trial Mode and Pricing pages
- Add routes
- Add footer links
- Make heading size consistent on Cookies page
2016-04-04 15:23:24 +01:00
Chris Hill-Scott
7307d77923 Merge pull request #370 from alphagov/add-tour
Make first time use clearer
2016-04-04 13:40:37 +01:00
Chris Hill-Scott
8e69e78bed Merge pull request #373 from alphagov/sign-in-in-header
Put sign in in the header
2016-04-04 12:22:54 +01:00
Chris Hill-Scott
94e8b2a685 Use template name as file name for example CSV
`11.csv` or `9a1d8a7f-c202-43b9-9239-68939d34fec6.csv` is not very friendly.

`Two week reminder.csv` is much nicer.
2016-04-04 11:09:55 +01:00
Chris Hill-Scott
f84797e6d5 Show an example of a CSV on the ‘send’ page
This should help:
- understanding of what the CSV should contain
- understanding what ‘download example’ will do
2016-04-04 11:09:18 +01:00
Chris Hill-Scott
5fd5544a8c Use context managers for StringIO
It’s possible that leaving a StringIO stream open could cause a memory
leak. Using a context manager closes it automatically when it’s finished
with.
2016-04-04 11:05:17 +01:00
Chris Hill-Scott
33d9a461db Put two rows in example CSV file
We reckon that this will help people understand that the first row is
headers and the subsequent rows are the users’ data.
2016-04-04 11:05:17 +01:00
Chris Hill-Scott
953be15d84 Make form error messages consistent
We were using a bunch of different styles for form error messages,
including:
- having the name of the field in the error, or not
- can not/cannot/can’t (GDS content styleguide recommends using
  contractions)
2016-04-04 10:44:53 +01:00
Chris Hill-Scott
c985e9a51c Put sign in in the header 2016-04-04 10:00:40 +01:00
Chris Hill-Scott
7625e184e2 Replace ‘send a batch’ with ‘send from a CSV file’
This is better. Not done enough testing to know if it’s the best, but
let’s try it.
2016-04-04 09:38:14 +01:00
Chris Hill-Scott
95b75d8220 Add a hint to ‘Template name’ text input
We’ve seen lots of users unsure what the ‘template name’ field is for,
especially on first use. Is it the subject line of the text message?
Will it be who the message comes from? Answer: neither.

So this commit adds a hint to make that clearer.
2016-04-04 09:35:59 +01:00
Chris Hill-Scott
42cb4b0d99 Remove the verbs from the navigation
Because ‘Send text messages’ isn’t very helpful if you’re looking to
edit a template.

It also helps front-load the navigation, ie ‘Team’ is the first word,
rather than the more generic ‘Manage’.
2016-04-04 09:33:29 +01:00
Chris Hill-Scott
b9cd669439 Remove some banners which aren’t used/wanted 2016-04-04 09:25:41 +01:00
Chris Hill-Scott
6030cccb5d Remove the ‘next step’ banner from choose template
This page should be obvious enough that this banner isn’t needed. Will
have to keep an eye on this.
2016-04-04 09:25:41 +01:00
Chris Hill-Scott
5087157d2b Make add service page much simpler
We reckon that most of the text on this page wasn’t helping.
2016-04-04 09:25:41 +01:00
Chris Hill-Scott
eaa72074db Enhance the ‘how to do placeholders’ hint
This commit makes the ‘how to do placeholders’ box part of the tour,
with the same blue background.

It also adds some Javascript enhancement so that:
- it responds to the contents of the message template
- has a ‘show me’ link which inserts ‘Dear ((name))’ into the template
  contents textbox

We’ve found that this has helped people understnad what placeholders
are, and how to do them.
2016-04-04 09:25:41 +01:00
Chris Hill-Scott
5d873bdc45 Show a tour when users first create a service
This commit adds a 3 screen tour, similar to those used on GOV.UK Verify
and Passports.

We guerilla tested this on Friday, and it really helped users to build a
mental model of how Notify works, so that when they’re playing around
with it they have a greater sense of what they’re aiming to do. This
makes concepts like templates and placeholders click more quickly.

https://www.pivotaltracker.com/story/show/116710119
2016-04-04 09:25:34 +01:00
Chris Hill-Scott
5f9605d605 Merge pull request #367 from alphagov/get-started-with-templates
Make ‘get started’ work for emails and texts
2016-04-01 09:42:38 +01:00
Chris Hill-Scott
4aebd282ed Merge pull request #368 from alphagov/no-underscores-in-sass-filenames
Don’t name SASS files with underscores
2016-04-01 09:42:28 +01:00
Chris Hill-Scott
5fdbacc724 Merge pull request #363 from alphagov/fix-nav-logic
Fix logic around team on navigation
2016-04-01 09:42:19 +01:00
Chris Hill-Scott
121a6c83e6 Don’t name SASS files with underscores
Underscores at the start of filenames are a convention that’s supposed
to tell a preprocessor to ignore a file. Since we’re explicitly
specifying which files need to be preprocessed, this isn’t necessary.

Also, it makes SASS lint throw a warning.
2016-04-01 08:06:52 +01:00
Chris Hill-Scott
3d9aa931d4 Remove service_dashboard.html
This template wasn’t being used. It was replaced by
`dashboard/dashboard.html` in b38ae08ad6
2016-04-01 07:58:23 +01:00
Chris Hill-Scott
d1665e7109 Make ‘get started’ work for emails and texts
Previously the ‘get started’ block on the dashboard pushed users into
starting with a text message. This led to users writing email content
into a tet message template because it didn’t match their expectations.

Also, the ‘send yourself a test’ link from the dashboard:
- wasn’t much used, because users responded to the similar call to
  action on the choose template page instead
- was confusing if you had created an email template because it
  presupposed that you’d created a text message template

So this commit changes the ‘get started’ block to be a choice between
creating an email template or a text message template. We reckon that
the language of ‘set up’ will help establish that templates are not
equivalent to individual messages. This language is now repeated on the
‘choose template’ page when you don’t have templates as well.
2016-04-01 07:58:23 +01:00
Rebecca Law
6394408228 Merge branch 'master' into email_from_uniqueness 2016-03-31 15:20:45 +01:00
Rebecca Law
9a2cb60f5e Update the service name validation in the ServiceNameForm and AddServiceForm to check the email_safe version
of the name against a list of all service email_from fields.
Update find_all_service_names to find_all_service_email_from, which returns the email_from of all services.
2016-03-31 15:17:05 +01:00
Rebecca Law
1871243cc8 Check the uniqueness of the service name ignoring case.
When the service name changes the email_from changes to.
Renamed find_all_service_names to find_all_service_names_lower.
2016-03-31 10:26:03 +01:00
Chris Hill-Scott
71bc1e616a Fix logic around team on navigation
In the navigation you should see either:
- manage team
- view team members

This depends on which permissions you have. You shouldn’t see both at
once. There was a bug which meant you could see both. This commit fixes
that bug.

https://www.pivotaltracker.com/story/show/116608291
2016-03-31 09:49:09 +01:00
Adam Shimali
fc01735d70 Removed some un needed flash messages raised as bugs.
In the process found a couple of edge cases of incorrect
use of invitation links by other users which are now
handled.
2016-03-31 09:44:01 +01:00
Rebecca Law
ab50ed6368 Merge branch 'master' into email_from_uniqueness 2016-03-31 08:37:11 +01:00
Rebecca Law
8391af9d40 Merge pull request #362 from alphagov/fix-bad-permission
Fix bug with creating the invited user permission list.
2016-03-30 17:56:01 +01:00
Rebecca Law
0c58d73914 Sort permissions. 2016-03-30 17:50:32 +01:00
Rebecca Law
c4b65d6af9 Fix bug with creating the invited user permission list. 2016-03-30 17:39:19 +01:00
Rebecca Law
677237ba47 Update email_from when the service name is changed.
Update unit tests
Service name is uniqueness is not based on case.
2016-03-30 17:12:00 +01:00