Commit Graph

608 Commits

Author SHA1 Message Date
Adam Shimali
786ce0e071 This is intended to be a temporary solution to allow product
owner to see history records until proper design is done for
viewing histiry.
2016-04-21 18:25:18 +01:00
Chris Hill-Scott
71cb100e08 Show subject line with placeholders replaced
On the check page, we show what the message will look like with the data
from the first row of the CSV, if the CSV contains all the required
data.

We should do the same for the subject line.
2016-04-21 09:28:31 +01:00
Chris Hill-Scott
5a39acb3c3 Merge pull request #477 from alphagov/all-time-greatest-templates
Show template usage for all time on it’s own page
2016-04-21 09:08:49 +01:00
Pete Herlihy
2160eb35d8 Fixed the list nesting on pricing page 2016-04-20 15:42:11 +01:00
Pete Herlihy
1a8dac7bd4 Updated the pricing page to clarify multi-part messages 2016-04-20 15:39:07 +01:00
Chris Hill-Scott
0080bce562 Say ‘sent’ rather than ‘processed’
Hopefully users understand that sent != delivered
2016-04-20 15:32:02 +01:00
Chris Hill-Scott
09491e880e Show template usage for all time on it’s own page
> We show the last weeks template usage on the dashboard, which is
> great, but if you're looking for longer term trends, you're out of
> luck...

> So, let's let you see more on a more detailed page (linked from the
> dashboard). Initially this should just show you all templates that you
> have used ever and the count for each. Order same as dashboard, most
> popular first.

https://www.pivotaltracker.com/story/show/117614585
2016-04-20 15:31:42 +01:00
Pete Herlihy
5375ac48bf Updated contact us links on terms of use page to point at new feedback page 2016-04-20 11:59:20 +01:00
Pete Herlihy
e8716d643d Updated contact us links on request to go live page to point at new feedback page 2016-04-20 11:58:03 +01:00
NIcholas Staples
4f71c40735 Merge pull request #466 from alphagov/desktop_feedback
Feedback page added. All tests working.
2016-04-20 11:17:55 +01:00
Chris Hill-Scott
8d6eb0985b Merge pull request #471 from alphagov/craig-david
Show the last 7 days of statistics on the dashboard
2016-04-20 11:13:51 +01:00
Nicholas Staples
da536bbd2e Feedback page working with all tests passing.
Updated to include team id.

Give Feedback -> Give feedback
2016-04-20 10:17:09 +01:00
Chris Hill-Scott
5bf0d8fe70 Show all statistics fetched on the dashboard
We want to align all our stats to be for the last 7 days.

This means summing up the stats response from the API to make the Big
Number. Previously the big number was counting sent notifications as
successful. This commit changes it to only look at delivered
notifications.

Right now, the API doesn’t have a way of filtering to only show the last
7 days. So for the moment the dashboard will show statistics for all
time.

The upshot of this is that we can link from the dashboard to the
activity page when there are failures.
2016-04-19 15:57:53 +01:00
Chris Hill-Scott
9b75f7ef8a Merge pull request #467 from alphagov/tour-footer-link
Put a link to the tour in the footer
2016-04-19 15:55:47 +01:00
Chris Hill-Scott
8d3fa79180 Reorder navigation to put emails before SMS
Elsewhere (eg the dashboard, the activity page) we have email first.
Emails are also anticipated to be slightly more popular in terms of the
number of services sending them.

Therefore it makes sense to have emails first in the main navigation.
2016-04-19 15:31:19 +01:00
Chris Hill-Scott
27ad1532e4 Make the flow of using templates better
For users who:
- want to send messages from a template
- want to edit templates

For developers:
- who need to get the ID of a template

This commit mainly cleans up the choose template page so there are less
options, and the options that are there are less wordy.

This means:
- moving ‘send yourself a test’ onto the send messages page, and making
  it button
- stripping a lot of stuff out of the ‘send from API’ page, so it’s more
  obvious what the template ID is
2016-04-19 15:31:19 +01:00
Chris Hill-Scott
2a080835aa Put a link to the tour in the footer
So you can:
- see it again
- see it if you don’t have an account yet
2016-04-19 11:07:48 +01:00
Chris Hill-Scott
37f341e757 Make tour work for non-logged-in users
There’s no content in the tour that’s specific to a service. And since
we can now take a pretty good guess at what service you last used, or
which service we should send you to if you only have one service,
there’s no need to make the URLs for the tour service-specific.

This also means that you don’t need to be logged in to see the tour
pages, and we have no good reason to only restrict these pages to users
with accounts.

https://www.pivotaltracker.com/story/show/116960703
2016-04-19 10:38:16 +01:00
Chris Hill-Scott
fb111b2968 Merge pull request #463 from alphagov/placeholder-hint-sms
Make placeholder hint work for SMS messages
2016-04-18 10:30:37 +01:00
Chris Hill-Scott
cfeb7514c3 Make placeholder hint work for SMS messages
The changes introduced in 54e42a2021
didn’t get applied to the add/edit SMS template page. This commit fixes
that.
2016-04-15 17:16:18 +01:00
Chris Hill-Scott
7ddaf56aa9 Reverse the order of the filters on activity page
So that they match the order of the page title, eg ‘Failed text
messages’
2016-04-15 14:05:00 +01:00
Chris Hill-Scott
9c0d7c17cf Merge pull request #456 from alphagov/docs-in-app
Put the new documentation in the app
2016-04-15 12:27:51 +01:00
Chris Hill-Scott
0a60ae24bf Merge pull request #451 from alphagov/show-subject-choose-template
Show email subject on choose template page
2016-04-15 12:27:35 +01:00
Chris Hill-Scott
f7c15dfbaf Add some basic typography, tweak the Markdown
This commit adds some basic type sizes, weights and spacing for HTML
elements scoped inside a `.documentation` container.

It also tweaks some of the Markdown so that it renders the same as it
does on Github.
2016-04-15 12:15:30 +01:00
Chris Hill-Scott
57ad64fae6 Get the docs rendering in the app
This commit replaces the old _API Documentation_ page with the Markdown
version that Catherine has been working on.

I’ve checked that there’s nothing obviously wrong or placeholder-y still
in there, so I think we’re good to go.
2016-04-15 12:14:51 +01:00
Rebecca Law
1fe5ae0371 This pull request removes the need for the req and pay in the claims JWT.
Use the new version of the notifications-python-client. This version no longer adds the req and pay to the claims of the jwt.

The change is backward compatible so an older client that sends a JWT with the extra claims will pass authentication.
Once all the clients have been updated to not include the extra claims some updates to exclude them from the method signatures will happen as well.

The documentation has been updated to reflect this change.

https://www.pivotaltracker.com/story/show/116971293
2016-04-15 11:04:35 +01:00
Chris Hill-Scott
c71249a7ea Show email subject on choose template page
Removed this before as part of truncating email previews in
3a5b76ce2a (diff-b5f54dc364655c298fd119e3bc148cc6R45)

But actually trying to use the app it’s a weird inconsistency to not
have the subject show everywhere.

So this commit reinstates it.
2016-04-14 15:43:19 +01:00
Nicholas Staples
6d9de1a500 Make service live and revert working, all tests passing. 2016-04-14 15:38:34 +01:00
Chris Hill-Scott
a6279f4114 Move placeholder hint to align with subject
If the hint aligns with the message body then it looks like you can only
add placeholders to the body. This commit aligns it with the  subject
instead, and since it overlaps both it looks like you can add
placeholders to both (hopefully).
2016-04-14 14:56:59 +01:00
Chris Hill-Scott
54e42a2021 Make the hint work for both subject and body
This commit makes the placeholder hint not be dependent on their only
being one textbox with placeholders on a page.

To do this it needs to be its own module, because the two textboxes are
each self-contained instances of the same module.

The way I’ve gone about this is to make the placeholder hint accept a
list of textboxes it should look in when deciding what message to
display to the user.

Most of the code is extracted from the existing placeholder highlighting
module.
2016-04-14 14:54:53 +01:00
Chris Hill-Scott
9cba3ea70f Add placeholder highlighting to subject
Email subjects can now have placeholders in, we should visually indicate
this in the same way as we do for the email body.
2016-04-14 14:53:19 +01:00
Chris Hill-Scott
1bf4d00e19 Make subject a textarea
In order for subject lines to have their fields highlighted they have to
be textboxes. This is because the highlighting script only works with
textboxes that don’t scroll, either horizontally, vertically, or be
keying through them.
2016-04-14 14:51:58 +01:00
Chris Hill-Scott
39a6fd115a Remove option for ‘disabled’ textbox
I think this was used for the invite page at one point, but isn’t now.

Generally at GDS we don’t do disabled form controls, they don’t tell you
_why_ they’re disabled.
2016-04-14 14:50:17 +01:00
Chris Hill-Scott
150aef2868 Allow rows to be passed to textbox
HTML textboxes have a rows attribute, which controls their height,
unless their height is overridden by CSS.
2016-04-14 14:49:28 +01:00
Chris Hill-Scott
b1d0547bb2 Merge pull request #447 from alphagov/remove-human-timestamps
Remove human-friendly timestamps from activity page
2016-04-14 14:10:52 +01:00
Chris Hill-Scott
cadc700712 Remove human-friendly timestamps from activity page
This fix introduced by e6490e1 did not fix anything.

So lets remove the ‘3 days ago’ thing completely and just say the date
and time instead.
2016-04-14 13:47:53 +01:00
Chris Hill-Scott
b157da24cb Merge pull request #445 from alphagov/different-human-timestamp-module
Use a different module for doing nice timestamps
2016-04-14 13:00:20 +01:00
Chris Hill-Scott
e71ee62577 Merge pull request #444 from alphagov/apropostrophe
Use proper apostrophe on 500 page
2016-04-14 13:00:14 +01:00
NIcholas Staples
8c830c82ed Merge pull request #446 from alphagov/fix_link_bug
Updated notifications_utils version and associated code. Added email …
2016-04-14 12:06:55 +01:00
Nicholas Staples
3865c722fc Updated notifications_utils version and associated code. Added email subject formatting for placeholders. 2016-04-14 12:00:55 +01:00
Chris Hill-Scott
e6490e18d1 Use a different module for doing nice timestamps
There is a bug in Babel[1] which means that it throws an exception if
it can’t find the locale it wants to use.

This is not a problem when developing locally, because OS X comes with
lots of locales. The AWS machines, however, only have one locale, which
is not the one that Babel is looking for. Hence the ‘Activity’ page
doesn’t work.

This commit changes to using Humanize[2] instead, which is much less
vast and hopefully less hungry in its requirements.

That’s a morning we won’t get back…

1. https://github.com/python-babel/babel/issues/137
2. https://pypi.python.org/pypi/humanize
2016-04-14 11:39:43 +01:00
Chris Hill-Scott
b1e56d8ba1 Use proper apostrophe on 500 page 2016-04-13 17:19:11 +01:00
Chris Hill-Scott
85f2bf92ac Merge pull request #443 from alphagov/fix-activity-for-new-api
Make activity page use new nomenclature for status
2016-04-13 17:16:25 +01:00
Chris Hill-Scott
9b4933f16b Make activity page use new nomenclature for status
Statuses used to be:
- failed
- complaint
- bounce
- sent
- delivered

Now they are:
- sent
- sending
- delivered

This change broke the notifications page on the admin app.

It also made me realise that we should be ignoring ‘sending’ messages in
the history page—it should only show messages we’ve tried to deliver.

The code for this is a bit of a bodge, but it will get things working
again for now.
2016-04-13 17:10:05 +01:00
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