Commit Graph

2067 Commits

Author SHA1 Message Date
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
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
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
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
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
Nicholas Staples
a6d1c5b693 Download CSV option now available.
App is updated to use the rebased db.
2016-04-12 15:38:02 +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
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
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