Commit Graph

1014 Commits

Author SHA1 Message Date
Chris Hill-Scott
4da92f170a Properly parse comma-separated query string params 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
2a03cd3952 Merge pull request #431 from alphagov/sort-template-stats
Sort template stats by usage
2016-04-13 16:15:33 +01:00
Chris Hill-Scott
6e83bec7b0 Merge pull request #439 from alphagov/wrap-long-words-in-emails
Wrap long words in email template previews
2016-04-13 16:13:54 +01:00
Chris Hill-Scott
0a31949c73 Merge pull request #437 from alphagov/tidy-scss
Don’t lint SCSS files that have come from outside
2016-04-13 16:13:33 +01:00
Chris Hill-Scott
6909146fee Wrap long words in email template previews
If you put, for example, a URL in an email template it can be very long.
This can cause it to overflow its container. This commit forces it to
wrap instead.
2016-04-13 14:59:19 +01:00
Chris Hill-Scott
b549b98108 Don’t lint SCSS files that have come from outside
We should (and do) keep exact copies of SCSS files that have come from
elsewhere so that we can easily upgrade them. But sometimes they don’t
always pass our linting rules, or throw a lot of warnings, which is
noisy.

This commit:
- moves such files into their own subdirectory
- tells SCSS Lint to ignore files in this directory
2016-04-13 14:30:49 +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
Rebecca Law
bcdde451af Merge pull request #425 from alphagov/remove-unused-items
Removed unused files and directory.
2016-04-12 13:39:21 +01:00
Chris Hill-Scott
4568c0e5ab Sort template stats by usage
Template stats should show the most-used template first.

This commit:
- re-writes the `aggregate_usage` function to use `itertools.groupby`,
  which can do aggregation, and can return data in a structure that’s
  easy to sort on
- uses generators so that we’re not keeping lots of rows of template
  stats in memory

https://www.pivotaltracker.com/story/show/117348893
2016-04-12 12:03:52 +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
a2263f959e Merge pull request #422 from alphagov/commas-in-placeholders
Don’t allow commas in placeholders
2016-04-12 10:06:08 +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
Rebecca Law
9620d91330 Removed unused files and directory. 2016-04-11 09:35:50 +01:00
Chris Hill-Scott
82ecaa3628 Add cancel button to file upload pattern
We’ve seen users try to click the upload again when their file doesn’t
upload in time. This is because we’re giving them no feedback that
something is happening.

I reckon that changing the button to a cancel button is the easiest way
to show that something is happening, and also means that (unlike
disabling the send button) the user can’t get stuck if the connection
drops completely.
2016-04-08 16:46:25 +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
2912ea1806 Increase number of rows shown
We probably shouldn’t hide the contents of the CSV when people are just
testing the app, or if they’re starting off with small jobs.

A limit of 15 rows displayed was awkwardly on the cusp between just
testing and sending a small batch.

This commit increases the limit to 50; I reckon that over 50 recipients
no-one will be wanting to check them all individually.
2016-04-08 10:55:24 +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
25079464b0 More helpful error when signed in an accept invite 2016-04-08 10:55:20 +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
732109889e Make border width of field layers match textbox
We put a border on text boxes that have errors. This means that they
take up more space than the layers above them which don’t have borders.

This makes the layers that highlight the fields in a template misalign.

This commit adds a line to make the borders match, which fixes this.
2016-04-08 07:46:15 +01:00
Chris Hill-Scott
dfd8540b54 Don’t allow commas in placeholders
> If a user tries to save a template containing something like
> ((name,date)) we should give a validation error.

This is because it causes havoc with the column headers in CSV files.

https://www.pivotaltracker.com/story/show/117043389
2016-04-08 07:46:14 +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
Nicholas Staples
8f8cdabfff Upload csv location updated, all tests passing. 2016-04-07 12:56:57 +01:00
Adam Shimali
194c56943c Merge pull request #412 from alphagov/aggregate-template-stats
Aggregation of template stats in admin app.
2016-04-07 12:10:11 +01:00
NIcholas Staples
a4392456ac Merge pull request #406 from alphagov/api_500_status_page
Status page now relies on the api passing else a 500 will be returned.
2016-04-07 12:09:20 +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
b5915dc956 Merge pull request #408 from alphagov/host-email-image
Host image used in email template in app
2016-04-07 09:38:48 +01:00
NIcholas Staples
573efb3d32 Merge pull request #407 from alphagov/fix_uppercase_white_list_bug
Fix issue with uppercase in the domain name.
2016-04-07 09:35:31 +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
Chris Hill-Scott
66506d18bb Host image used in email template in app
Right now the crown logo in email templates is hosted on Github. Github
is not a CDN.

For now, hosting it in the app is a better solution. At some point we
should have a CDN for all assets on the app, which would be even better.

https://www.pivotaltracker.com/story/show/116952911
2016-04-07 09:29:05 +01:00
Nicholas Staples
2352b0f80d Fix issue with uppercase in the domain name. 2016-04-06 16:45:35 +01:00
Nicholas Staples
aa5fd65171 Status page now relies on the api passing else a 500 will be returned. 2016-04-06 16:36:26 +01:00