Commit Graph

2292 Commits

Author SHA1 Message Date
Leo Hemsted
f2b6bfbfc2 Merge pull request #815 from alphagov/weekly-refactor
Weekly stats aggregate page refactor
2016-08-09 09:37:50 +01:00
Leo Hemsted
cd48f2c31a Merge pull request #851 from alphagov/add-spacer
Add spacer image for email template
2016-08-08 11:34:34 +01:00
Leo Hemsted
f46d10b401 Merge pull request #844 from alphagov/deskpro-user-email
Fix deskpro user email
2016-08-08 11:32:13 +01:00
Chris Hill-Scott
aed10f711c Add spacer image for email template
Forgot to include this before.

The template expects it in `./images` but it should probably live in
`./images/email-template`.

This commit puts it in both places; we can clean up later.
2016-08-08 11:12:01 +01:00
Chris Hill-Scott
d0ac61403a Merge pull request #837 from alphagov/add-crests
Add department crests for email sub branding
2016-08-08 10:27:30 +01:00
Chris Hill-Scott
955b99b0e2 Merge pull request #847 from alphagov/make-total-default-on-job
Make ‘total’ the default status on a job
2016-08-05 14:48:06 +01:00
Chris Hill-Scott
8c92737282 Make ‘total’ the default status on a job
The blue bar on the job page works out which is the current status from
the query parameters, not the parameters that the API gets called with.
2016-08-05 13:42:24 +01:00
Chris Hill-Scott
e482404eea Merge pull request #832 from alphagov/make-numbers-less-confusing
Make numbers on a job less confusing
2016-08-05 12:14:29 +01:00
Chris Hill-Scott
040af920e9 Merge pull request #827 from alphagov/move-guidance-underneath
Move guidance underneath
2016-08-05 12:14:17 +01:00
Chris Hill-Scott
2d4bff646c Merge pull request #845 from alphagov/explicit-about-sending-example-to-yourself
Make it clear who you’re sending the example to
2016-08-05 12:14:09 +01:00
Chris Hill-Scott
652534533b Rewrite prev/next test to use BeautifulSoup 2016-08-05 11:33:32 +01:00
Chris Hill-Scott
b85b929b11 Lose the confusing list slicing
Slicing was to avoid duplicate items in the list. A more idomatic way
to avoid duplicate items in a list is to use a `set` instead.

The order of the list doesn’t really matter, but it’s a lot easier to
test for if the order is consistent.
2016-08-05 11:16:34 +01:00
Chris Hill-Scott
01bb2ada0a Don’t let _set_status_filters mutate original list
Mutating stuff is scary and prone to problems. Better for it to
return a new list instead.
2016-08-05 11:02:30 +01:00
Chris Hill-Scott
d0ef913520 Add a message if there are more than 50 rows
Similar to how we do it on the check page, we should indicate if there
are more results than we can show. No-one’s really complained about the
absence of this, but it can’t hurt.
2016-08-05 10:59:49 +01:00
Chris Hill-Scott
9e6111fd00 Make ‘download’ wording consistent
We changed this on the jobs page in
9a5fbca707

Missed doing it on the notifications page.
2016-08-05 10:59:49 +01:00
Chris Hill-Scott
940815b33c Tighten up spacing around download link 2016-08-05 10:59:49 +01:00
Chris Hill-Scott
e621dddd6d Don’t show the download until the job is complete
The CSV report isn’t very useful until it has all the rows from your
original file. So we shouldn’t show you the link until all notifications
have been created.

Until this point, it’s useful to know how much longer you need to wait,
so this commit adds a percentage count of how much of the file has been
processed.
2016-08-05 10:59:49 +01:00
Chris Hill-Scott
45ae43d987 Include ‘created’ in ‘sending’ bucket
The difference between created and sending isn’t something a user should
have to care about. So this commit:
- counts created and sending as the same thing
- displays and notifications which have a status of created as sending
2016-08-05 10:59:49 +01:00
Chris Hill-Scott
51a4ab8060 Change ‘processed’ to ‘total’
Processed is not an easy to understand thing, and the overlap with
sending/delivered/failed is not easy to intuit.

‘Total’ is a much easier concept to grasp (it relates directly to your
file), and it’s less distracting because it doesn’t change.
2016-08-05 10:59:49 +01:00
Chris Hill-Scott
3fcfdc1bce Make sending count down from total rows
It’s weird when the sending number ramps up to ~200 or so and then
just floats around as new rows are being added and older ones are being
marked as delivered/failed.

It’s also not great that you don’t know how many rows are in a file, if
you haven’t uploaded it yourself. But the only reason you want to know
this is to know how much work Notify has remaining to do.

So ‘sending’ should start from the total number of rows in the file
and count down.
2016-08-05 10:59:49 +01:00
Chris Hill-Scott
47e7d418eb Remove redundant if statement
We check for the `None` case in the parent `if` statement.
2016-08-05 10:59:49 +01:00
Chris Hill-Scott
0e2d80018e Fix page title 2016-08-05 09:40:21 +01:00
Chris Hill-Scott
99ec0fd8d7 Make it clear who you’re sending the example to
It’s not one of your colleagues. You’re not inviting someone. We’ve seen
people get confused about this.
2016-08-05 09:32:58 +01:00
Leo Hemsted
d5238bce5b handle if user doesn't provide name/email
also clean up usage of DESKPRO_PERSON_EMAIL and put it in the conf rather than env
2016-08-04 18:01:08 +01:00
Leo Hemsted
ff46aaa6cc send user contact info to deskpro correctly
previously we were erroneously setting our own reply email rather
than using the user's provided one 😵
2016-08-04 17:02:21 +01:00
Chris Hill-Scott
1ea1b1fd45 Merge pull request #841 from alphagov/revert-833-js-memory-speedup
Revert "Stop AJAX updater consuming ever-increasing memory"
2016-08-04 12:17:39 +01:00
Chris Hill-Scott
b9a69def00 Revert "Stop AJAX updater consuming ever-increasing memory" 2016-08-04 12:06:04 +01:00
Chris Hill-Scott
1e39e54bd6 Merge pull request #838 from alphagov/no-banner-if-api-permission
Don’t show banner on dashboard to API users
2016-08-04 10:35:26 +01:00
Chris Hill-Scott
8cef0bd74e Merge pull request #833 from alphagov/js-memory-speedup
Stop AJAX updater consuming ever-increasing memory
2016-08-04 10:35:19 +01:00
catherineheywood
4b0c5367e6 Change API keys to API integration
Change reference to interface - API keys to  API integration
2016-08-04 09:05:00 +01:00
Chris Hill-Scott
d318a4e8a2 Don’t show banner on dashboard to API users
The "you only have permission to view this service" banner sort of
makes sense if you don’t have _any_ permissions, but it doesn’t if you
have permission to create API keys. If you can create API keys you can
do a lot more than just view the service.
2016-08-03 16:46:00 +01:00
Chris Hill-Scott
776299c26f Add department crests for email sub branding
We need to host these images somewhere. Let’s start off doing it in
the admin app, like we do for other email assets.

Eventually we should have a CDN in front of this.

Images lifted from
76ff2e0b6d/app/assets/images/crests
2016-08-03 14:42:13 +01:00
Martyn Inglis
a8bd2796fe Live travis config 2016-08-03 13:51:55 +01:00
Chris Hill-Scott
ec724ce417 Stop AJAX updater consuming ever-increasing memory
The pages with AJAX on were feeling quite sluggish, and it felt like
they were making the whole browser slow down.

Looking at the performance stuff in Chrome, the number of DOM nodes was
going up and up, which is weird because the number of things on the page
wasn’t changing. This was causing the page to consume more and more
memory in order to store all these nodes.

This is kinda beyond my understanding, but I tried a few things and it
looks like the browser was having a hard time garbage collecting the
temporary bits of DOM used to update the page.

By assinging these bits of DOM to variables before using them it seems
that the browser has an easier time cleaning them up.
2016-08-03 10:29:25 +01:00
Martyn Inglis
982d2d3095 Travis for master builds 2016-08-03 09:05:04 +01:00
Martyn Inglis
ff45f015df updated keys 2016-08-02 15:36:49 +01:00
Martyn Inglis
01edb66861 Changed application name 2016-08-02 15:19:08 +01:00
Martyn Inglis
44329e4218 Added staging deploy into travis 2016-08-02 15:09:42 +01:00
Martyn Inglis
4e20b64ca9 Added staging deploy into travis 2016-08-02 15:09:18 +01:00
minglis
f6d62e385e Merge pull request #828 from alphagov/new_staging
New staging
2016-08-02 14:48:11 +01:00
Martyn Inglis
351b9ea410 Removed deploy block from travis for now 2016-08-02 14:39:32 +01:00
Chris Hill-Scott
bc715b3dd8 Add Gwen’s initial guidance about formatting
This is based on some work Gwen did for Civil Service Digital. Let’s
get it in for now so that we have a starting point from which to
improve.

This specifically doesn’t reference ‘optional’ placeholders because I
don’t know how best to explain those yet.
2016-08-02 09:42:30 +01:00
Chris Hill-Scott
ee52e72f90 Move template guidance underneath
Two problems with having it on the side:
- some users didn’t see it at all
- there wasn’t space to have additional guidance about Markdown-style
  formatting
2016-08-02 09:29:11 +01:00
Martyn Inglis
6fa31e5847 Merge branch 'master' into new_staging 2016-08-02 09:03:07 +01:00
Chris Hill-Scott
e2617ce7f6 Merge pull request #824 from alphagov/fix-newlines-html-email
Fix newlines in HTML emails
2016-08-01 14:54:56 +01:00
Chris Hill-Scott
30261cf385 Fix newlines in HTML emails
This problem was masked because the email message component was also
replacing newlines with `<br>`s.

Implements:
- [ ] https://github.com/alphagov/notifications-utils/pull/60
2016-08-01 14:29:08 +01:00
Chris Hill-Scott
06d6718035 Update to correct version
Got mixed up on https://github.com/alphagov/notifications-admin/pull/816
2016-08-01 11:15:46 +01:00
Chris Hill-Scott
ae8734f8d5 Merge pull request #816 from alphagov/fix-markdown-oddities
Fix Markdown/HTML email oddities
2016-08-01 10:59:29 +01:00
Chris Hill-Scott
7d99308d4e Fix Markdown/HTML email oddities
Depends on:
- [ ] https://github.com/alphagov/notifications-utils/pull/59
2016-08-01 10:38:34 +01:00
Chris Hill-Scott
c1ee402784 Merge pull request #821 from alphagov/fix-page-title-api-info
Make page <title> on API info match page heading
2016-08-01 10:31:36 +01:00