Commit Graph

922 Commits

Author SHA1 Message Date
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
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
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
Pete Herlihy
8b05f2c080 Tidied up the footer to put the about links in the right place 2016-03-30 15:47:00 +01:00
Nicholas Staples
0b2eeb19c5 Fix sent today bug and removed unused file.
Code quality fix.
2016-03-30 12:12:31 +01:00
Rebecca Law
f3507af006 Merge pull request #358 from alphagov/fix-permissions
Add view_activity permissions
2016-03-30 11:36:49 +01:00
Rebecca Law
e67bb5f716 Fix main_nav for platform admin
Renamed or_ to any_
2016-03-30 11:30:18 +01:00
Chris Hill-Scott
d8d8584f70 Merge pull request #355 from alphagov/align-heading-on-pages-with-grid
Visually align headings inside grid rows
2016-03-30 11:10:05 +01:00
Rebecca Law
953f2a2245 Add comment to describe view_activity 2016-03-30 10:57:03 +01:00
Rebecca Law
542d0f939e Add comment when adding the view_activity permission as a default.
Refactor client.login method so that we can start to migrate to one way to login for unit tests.
2016-03-30 10:53:15 +01:00
Rebecca Law
c99df69025 Merge branch 'master' into fix-permissions
Conflicts:
	app/main/views/jobs.py
	tests/app/main/views/test_manage_users.py
2016-03-30 10:36:55 +01:00
Nicholas Staples
ff9d3d72ad Fixed merge conflicts with master.
Code quality fixes.
2016-03-30 10:26:01 +01:00
Nicholas Staples
48daac7b94 Merging conflict with two_factor.py
Fixed merge mistake with two_factor.py.
2016-03-30 10:11:06 +01:00
Rebecca Law
1cfaeec7b2 Merge branch 'master' into fix-permissions 2016-03-30 09:32:24 +01:00
Nicholas Staples
644336b151 Merge with master. 2016-03-29 22:50:40 +01:00
Rebecca Law
a4629a290a Add view_activity to decorator. 2016-03-29 17:46:53 +01:00
Rebecca Law
99bd94799e Remove access_developer_docs permission, it doesn't make sense to need it.
Add view_activity permission when the permissions are being editted.
2016-03-29 17:33:12 +01:00
Adam Shimali
08d4e13185 Updated to use client instead of dao 2016-03-29 16:59:06 +01:00
Adam Shimali
f3fd5f6b15 After sending sms or email to self or batch then then back button
does not take user to check page, but rather the start of sending
either sms or email.
2016-03-29 16:23:01 +01:00
Chris Hill-Scott
d537da330e Visually align headings inside grid rows
When the first heading on the page is inside a grid row, it doesn’t
vertically align properly with the navigation. This is because it
isn’t targeted by the selector that does this for pages without
an initial grid row.

This commit:
- adds an extra selector to target these headings
- makes the ‘add new thing’ buttons maintain their alignment with
  the page heading
2016-03-29 16:15:15 +01:00
Rebecca Law
01959b8576 Update invited user to have the view_activity permission.
Update dashboard.html for view_activity
2016-03-29 15:20:43 +01:00
Rebecca Law
b79901fe28 With the addition of has_permissions on the dashboard, jobs, and manage_users pages a platform admin user or a users with no permissions on the service could no longer see the page.
A new permission has been added, view_activity, to resolve this issue.
Another pull request in notifications-admin will be required to update all users with a default permission of view_activity.
2016-03-29 13:23:36 +01:00
Adam Shimali
db24a633c1 Better flash message for users with active accounts who click on
verification link again.
2016-03-29 13:21:51 +01:00
Adam Shimali
352f169fb1 If user is pending it means they have not verified email yet
Added better checking on re use of consumed verification link.
2016-03-29 13:12:06 +01:00
Chris Hill-Scott
eb279c88d4 Only show ‘Choose service’ if multiple services
When the user clicks ‘GOV.UK Notify’ in the header, they should, by
default, be redirected to the dashboard for their service. They should
only see the ‘Choose service’ page if they have multiple services.

This also allows some logic to be factored out of the template, so one
route now handles all this redirection.

In the future we might want to keep the last-used service in the
session, and always redirect to that. But for now, this should fix most
of the confusion for first-time users.
2016-03-29 10:44:50 +01:00
Adam Shimali
8a55e61dac Merge pull request #349 from alphagov/doc-change-for-notifications-api
Fix docs to line up with api
2016-03-24 16:24:24 +00:00
Adam Shimali
92e0fc8269 Fix docs to line up with api 2016-03-24 14:40:20 +00:00
Chris Hill-Scott
8cc9acb09b Add skip link to jump to pricing section of help 2016-03-24 14:11:11 +00:00
Henry Hadlow
e2fb4844c8 Fix request to go live page
- Remove duplicate page heading
- Add `list list-bullet` classes to `ul` to get bulleted list
2016-03-24 10:36:56 +00:00
Adam Shimali
3e167c69f2 Clean up config a bit. Get values for config from environment.
Removed some old redundant config.
2016-03-23 15:07:04 +00:00
NIcholas Staples
faaedb318d Merge pull request #338 from alphagov/service_user_permission
Functionality added to existing endpoint without a user_has_permissio…
2016-03-23 14:48:10 +00:00