Commit Graph

1534 Commits

Author SHA1 Message Date
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
NIcholas Staples
ddec619913 Merge pull request #469 from alphagov/fix_doc_link
Doc file is loaded using current directory of the flask view.
2016-04-19 13:40:23 +01:00
Nicholas Staples
e8dc03f121 Doc file is loaded using current directory of the flask view. 2016-04-19 13:33:28 +01:00
Chris Hill-Scott
c2b96be247 Merge pull request #464 from alphagov/correct-innacurate-csv-error
Fix innacurate error message on CSV check
2016-04-18 16:52:52 +01:00
Rebecca Law
6c6dc51ea3 Revert changes to aws deployment location for master builds on preview environment 2016-04-18 14:13:38 +01:00
Chris Hill-Scott
a0e3a648f3 Fix innacurate error message on CSV check
We only know if a row contains missing cell(s), not how many cells are
missing data.

This commit changes the error message to be more accurate.
2016-04-18 11:47:53 +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
a63c50b0d5 Merge pull request #459 from alphagov/wrap-long-words-sms-template
Wrap long words in SMS template previews
2016-04-18 10:30:26 +01:00
Chris Hill-Scott
a08764db71 Merge pull request #458 from alphagov/reverse-filters-activity
Reverse the order of the filters on activity page
2016-04-18 10:30:18 +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
Rebecca Law
b242106f11 Merge pull request #460 from alphagov/aws-fixup
Update deployment files for aws
2016-04-15 16:42:32 +01:00
Rebecca Law
0b777b76a6 Update deployment files for aws 2016-04-15 16:31:31 +01:00
Chris Hill-Scott
5dfbd267ce Wrap long words in SMS template previews
If you put, for example, a URL in an SMS template it can be very long.
This can cause it to overflow its container. This commit forces it to
wrap instead.

Related: https://github.com/alphagov/notifications-admin/pull/439
2016-04-15 15:11:44 +01:00
Rebecca Law
f606422c1a Fix code deploy names 2016-04-15 14:59:02 +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
e89063e285 Move the image so the app can serve it 2016-04-15 12:15:30 +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
3c87af44ee Merge pull request #454 from alphagov/simplify-jwt
Simplify JWT
2016-04-15 12:08:41 +01:00
Rebecca Law
848db38573 Added missing import 2016-04-15 11:53:39 +01:00
NIcholas Staples
b85c6c3b1a Merge pull request #455 from alphagov/add_created_by_to_api_calls
Add created_by to all appropriate requests.
2016-04-15 11:14:05 +01:00
Nicholas Staples
2085792742 Add created_by to all appropriate requests. 2016-04-15 11:08:19 +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
catherineheywood
99d5a3afc7 Doc changes
Add links to PHP and Java libraries
Define sent_at
Indicate how to access template IDs
2016-04-14 16:40:30 +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
51673e26f4 Merge pull request #450 from alphagov/make_service_live
Make service live and revert working, all tests passing.
2016-04-14 15:43:09 +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
12053a4532 Merge pull request #449 from alphagov/detect-placeholders-in-email-subject
Detect placeholders in email subject
2016-04-14 15:25:54 +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
435537aac8 Make textboxes auto expand later
At two lines the subject textbox was expanding even when it was empty.
This commit makes the distance at which textboxes start expanding less
sensitive.
2016-04-14 14:54:00 +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
83c6baf977 Don’t override textbox heights with CSS
We should let textboxes set their own height using the rows attribute.
2016-04-14 14:51:14 +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
NIcholas Staples
c465c0404b Merge pull request #448 from alphagov/fix_template_subject_update_bug
Fixed bug for subject not updating when changed on the edit template …
2016-04-14 14:14:47 +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
Nicholas Staples
a6a42d6f26 Fixed bug for subject not updating when changed on the edit template page. 2016-04-14 14:08:35 +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
catherineheywood
9197ed0b1a Doc changes
Make it clearer what placeholders are. 
Make it clearer you need to add a template even if using API.
Remove 'empty' sections.
Other minor changes.
2016-04-14 10:57:37 +01:00
catherineheywood
cfe27d1f75 Doc changes 2016-04-14 09:51:46 +01:00