Commit Graph

564 Commits

Author SHA1 Message Date
Nicholas Staples
33cc90488c Fix template delete links.
Fix bug with 'current_service' not available for non service urls.

Code review adjustment.

Static code check.
2016-04-13 16:57:16 +01:00
Chris Hill-Scott
a25bbaea06 Move download CSV link to top
You might miss it at the bottom if you’ve got lots of rows.
Better to have it in a consistent place.
2016-04-13 16:17:09 +01:00
Chris Hill-Scott
e282ca2109 Allow filter links to be used in combination
Means you can see, for example emails that have failed.

Means adding:
- logic to generate links which can have a type parameter, a status
  parameter, or both
- a ‘pill’ UI component for seeing which filters you currently have
  applied
- some logic to change the page title based on which filters you have
  applied
2016-04-13 16:17:09 +01:00
Chris Hill-Scott
1a6bb37171 Tidy up the ‘Activity’ table
This table had a lot of columns, which meant that some of them became
very narrow, wrapping the text awkwardly.

This commit groups some of the data into a chunk, which occupies the
first column.
2016-04-13 16:17:09 +01:00
Chris Hill-Scott
906a22a67b Merge pull request #436 from alphagov/only-collapse-long-emails
Only collapse email templates if they’re long
2016-04-13 16:16:56 +01:00
Chris Hill-Scott
c81b8c39f6 Add view for a single template
> At the moment, we have an all email templates page, and an edit an
> individual page.
>
> This gets messy when we refer to templates like the dashboard and the
> activity views. We solve this currently by using anchor links to the
> list page, but this is clunky.
>
> So lets add it, then update the links on the dash and activity to the
> new view page.
>
> Should be a link from the view a single template page, to the template
> hub page.

https://www.pivotaltracker.com/story/show/117349227
2016-04-13 13:41:53 +01:00
Rebecca Law
9acd344475 Merge pull request #427 from alphagov/update_for_db_rebase
Update for db rebase
2016-04-13 12:05:11 +01:00
Chris Hill-Scott
bdf746131f Only collapse email templates if they’re long
It’s a bit silly to have email templates expandable if you’re only going
to reveal a couple more lines.

This commit adds a data attribute which specifies how high (in pixels)
the email template can be before it gets truncated. It then changes the
script to only truncate emails which are naturally taller than this
height.

Currently the cut off is at 200px, which is approximately 8 lines of
text: `200px / (font-size: 19px * line-height: 1.31) = 8.03`
2016-04-13 09:50:18 +01:00
Chris Hill-Scott
cffd941742 Fix email expand/collapse not working
The click event was scoped to the wrong element.
2016-04-12 16:21:41 +01:00
Nicholas Staples
a6d1c5b693 Download CSV option now available.
App is updated to use the rebased db.
2016-04-12 15:38:02 +01:00
Nicholas Staples
6ea72182d2 Download CSV option now available. 2016-04-12 14:19:51 +01:00
Chris Hill-Scott
975041cbed Merge pull request #428 from alphagov/better-choose-template
Make choose template page clearer
2016-04-12 10:06:40 +01:00
Chris Hill-Scott
42a6e801e4 Merge pull request #426 from alphagov/reword-recent-templates
Reword ‘recent templates’ section of dashboard
2016-04-12 10:06:27 +01:00
Chris Hill-Scott
34f57c1908 Merge pull request #421 from alphagov/banners-no-permissions
Change banners on home page if no permissions
2016-04-12 10:06:20 +01:00
Chris Hill-Scott
3a5b76ce2a Truncate previews of email messages to ~3 lines
Emails can get very long.

When you’re trying to do other things on the page this results in a lot
of scrolling.

This commit truncates email messages to about 3 lines, and adds a JS
toggle which reveal the full contents of the email.
2016-04-11 17:24:22 +01:00
Chris Hill-Scott
33e1b2679f Move ‘edit template’ to its own link
It’s probably clearer to have it labelled explicitly, rather than have
people infer that they should click the title of a template to edit it.
2016-04-11 17:20:25 +01:00
Chris Hill-Scott
6bfb7914e2 Respect linebreaks in templates
If a user puts a linebreak in an SMS template then the recipient will
see these linebreaks on their phone. So when we show a preview of an SMS
template, it should have linebreaks in it.
2016-04-11 17:20:25 +01:00
Chris Hill-Scott
30e1e67c17 Make heading sizes more consistent
On:
- the API keys page
- the ‘send’ page

There are some inconsistently small heading sizes. This commit makes them
consistent with the heading sizes on other pages.
2016-04-11 17:20:24 +01:00
Chris Hill-Scott
e526852f53 Remove keylines from nav
We have lots of keylines in our pages, eg tables, email message previews

This makes the pages look quite cluttered, especially because the
keylines don’t always align.

I think it looks much cleaner without the keylines in the nav, and we
have few enough nav items that we don’t need to chunk them up.
2016-04-11 17:20:24 +01:00
Chris Hill-Scott
91565afa6b Change display of placeholder columns
On the send page, it should hightlight the placeholders so they match
what you need to put in the CSV file.

On the check page, they should not be highlighted, to match what’s in
the (rendered) template.
2016-04-11 17:20:24 +01:00
Chris Hill-Scott
7e54703e2f Reword ‘recent templates’ section of dashboard 2016-04-11 10:08:03 +01:00
Chris Hill-Scott
be49fb73b0 Change wording of form hints on register page
We’ve seen in research that people can be reticent to give their real
phone number. Telling them that it will be used for something should
help (ie we’re not just collecting it for marketing).

This also rewords the other form hints on this page to be less computery
because we haven’t looked at them in aaaages.
2016-04-08 10:55:30 +01:00
Chris Hill-Scott
dd9548da67 Change wording when there are hidden rows
This caused some anxiety about why the rows were being hidden. Were
there problems with them?

This commit reframes the wording to talk about the rows that are shown
instead.
2016-04-08 10:55:24 +01:00
Chris Hill-Scott
32cd312451 Revert "Use tablular numbers for ‘big number’ pattern" 2016-04-08 10:55:21 +01:00
Chris Hill-Scott
e560969e34 Add service-specific links to trial mode page
> Trial mode page – if signed in, make your team into a link to the Team
> members page for the last-used service.

> Trial mode – if signed in, make remove these restrictions into a link to
> the Request to go live page for the last-used service.
2016-04-08 10:55:16 +01:00
Chris Hill-Scott
2b9e016d14 ‘History’/‘Notifications activity’ → ‘Activity’ 2016-04-08 10:55:08 +01:00
Chris Hill-Scott
382a233241 Shorten empty message on choose template
You may have permission to add templates but not to send messages. The
previous error message was misleading.
2016-04-07 15:34:46 +01:00
Chris Hill-Scott
65761e5c17 Change banners on home page if no permissions
(except view activity, natch)

> No permissions – Remove trial mode banner

> No permissions – Add blue banner saying 'You only have permission to
view this service'
2016-04-07 15:31:43 +01:00
Adam Shimali
d7c59fa8d7 Aggregation of template stats in admin app.
Individual templates stats items fetched from admin.
2016-04-07 10:55:21 +01:00
Chris Hill-Scott
4585cc179d Merge pull request #401 from alphagov/hello-you
Indicate which user is you on manage team
2016-04-07 09:29:32 +01:00
Adam Shimali
2dbf522932 Add date field back into template stats 2016-04-06 15:06:02 +01:00
Chris Hill-Scott
aa3274440b Fix exception on email job page
For email jobs, the template needed to look up the service to work out
the email_from and from_name.

`service` used to be a variable passed through to the view. Now every
veiw gets `current_service` instead.

This is a quick fix to make things work.
2016-04-06 14:04:02 +01:00
Chris Hill-Scott
8a68b4aa80 Indicate which user is you on manage team 2016-04-06 13:46:55 +01:00
Chris Hill-Scott
39e94ac8ec Add row numbers to tables
When a table is showing the contents of a CSV file, it should look
something like a spreadsheet.

The minimally skeuomorphic way to do this is by adding row numbers.

This commit doesn’t
- make the row numbers monospace (it’s barely noticeable and doesn’t
  reflect what actual spreadsheets do)
- make the first column heading ‘Row’ (again, doesn’t reflect how actual
  spreadsheets work, and takes up more valuable space)
2016-04-06 11:31:37 +01:00
Adam Shimali
8351d98289 Merge pull request #387 from alphagov/template-stats-on-dashboard
Template statistics now surfaced on dashboard.
2016-04-05 14:19:45 +01:00
Adam Shimali
dc7964efd7 Fix service id bug in template. Use current_service instead 2016-04-05 14:12:18 +01:00
Adam Shimali
eade0ef971 Added test for template stats client.
Removed date column from recently used templates table.
2016-04-05 13:50:42 +01:00
Chris Hill-Scott
98ce65b825 Fix broken links on tour pages 2016-04-05 13:24:57 +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
Adam Shimali
159fe60c1a Template statistics now surfaced on dashboard.
Job list removed.

Template statistics retrieved at same time as
notification stats.
2016-04-05 11:47:24 +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
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