Commit Graph

2937 Commits

Author SHA1 Message Date
Chris Hill-Scott
32d7c79226 Merge pull request #1063 from alphagov/letter-preview-with-placeholders
Add remaining endpoints for PDFs and PNGs
2017-01-04 15:52:46 +00:00
Chris Hill-Scott
729568d010 Improve image quality of PNGs
The PNGs we were generating looked a bit fuzzy, and the text rendering
was a bit off.

This is because we weren’t rendering them at a high enough resolution.
I’m guessing the default was 72dpi. This commit increases the resolution
to 96dpi, which (locally) seems to be enough to give a good-looking
preview.
2017-01-04 15:46:00 +00:00
Chris Hill-Scott
2854dbe3dd Refactor PNG generating endpoint for code reuse
The way we generate PNGs is the same for all the different endpoints,
so the code to do this should be shared.
2017-01-04 15:45:59 +00:00
Chris Hill-Scott
559433c5d2 Add remaining endpoints for PDFs and PNGs
Right now we can show what a letter template looks like as a PDF or PNG.

This commit completes the work so this is also possible when:

- showing a template with the placeholders replaced
- showing any version of a template

Also removes dependency on `Exception().message`, which was deprecated
in Python 2.6. See
97f82d565f
for full details.
2017-01-04 15:45:59 +00:00
Chris Hill-Scott
a159f351a8 Split endpoints that use templates
We’ll need to reuse the logic for viewing images and PDFs of templates,
so let’s have it in a shared method which the HTML endpoint then calls.
2017-01-04 15:45:58 +00:00
Rebecca Law
ea73936f0b Merge pull request #1067 from alphagov/add-date-range-filter-to-platform-admin
Add date range filter to platform admin
2017-01-04 14:21:16 +00:00
Rebecca Law
8b89b7f911 Remove print statements. 2017-01-04 13:02:01 +00:00
Rebecca Law
21582cadb3 Get the BooleanField working in the form. 2017-01-03 16:14:25 +00:00
Leo Hemsted
511c9fd37e Merge pull request #1068 from alphagov/hmcts
add hmcts.net to email whitelist
2017-01-03 13:07:06 +00:00
Leo Hemsted
f1feaaaccc add hmcts.net to email whitelist
(HM Courts & Tribunals Service)
2017-01-03 12:34:57 +00:00
Rebecca Law
2e69d3c680 Add date filter for platform admin page. 2017-01-03 10:45:06 +00:00
Rebecca Law
5572d0f25f This commit renders the platform admin page with the given start and end date query params.
Need to add a form to the page to take these params.
2016-12-28 15:23:19 +00:00
Rebecca Law
df41da4860 [WIP] Attempt at adding a form to the platform admin page is not working well for me here. But I want to commit it so I can look at it again. 2016-12-28 14:44:53 +00:00
Rebecca Law
cc40f81ded Merge pull request #1065 from alphagov/fix-invitation-bug
Fix edge case bug in the invitation flow
2016-12-22 15:37:05 +00:00
Rebecca Law
d0a5ef0247 Refactored the tests to use the client fixture, saves a couple lines of code per test. 2016-12-22 15:24:23 +00:00
Rebecca Law
7b54e0c463 After investigating a 500 in the admin app, I found an edge case in the invitation registration flow that can cause an error.
The flow is as follows:
If the invited user clicks on the /invitation/<token> link in the email (now on /register-from-invite),
then goes to another browser and registers for Notify.
Coming back to the other browser, submit the form for /register-from-invite.

This PR fixes that bug and adds a couple tests for register_from_invite
2016-12-22 11:43:11 +00:00
Chris Hill-Scott
01b9aad0fb Merge pull request #1064 from alphagov/ship-it
Update count of services
2016-12-21 09:55:59 +00:00
Chris Hill-Scott
8c86c269f0 Update count of services 2016-12-21 09:55:35 +00:00
Chris Hill-Scott
0a6351ed83 Merge pull request #1062 from alphagov/fork-weasyprint
Update patched Weasyprint fork to alphagov hosted
2016-12-21 09:38:48 +00:00
Chris Hill-Scott
f64cc1cdfb Merge pull request #1061 from alphagov/remove-nl2br
Remove nl2br Jinja filter
2016-12-21 09:38:42 +00:00
Chris Hill-Scott
9df5f4d172 Merge pull request #1059 from alphagov/outline-hmg-logo
Outline text in HM Government logo
2016-12-21 09:38:33 +00:00
Chris Hill-Scott
8bf8319396 Merge pull request #1058 from alphagov/fitness
Update number of services/departments
2016-12-21 09:38:28 +00:00
Chris Hill-Scott
b99279afad Add link to Bleach bugtracker
Explains why we’re using forked version of Weasyprint
2016-12-20 13:43:53 +00:00
Chris Hill-Scott
f5f3d8acae Update patched Weasyprint fork to alphagov hosted
Better than it being on my personal Github account.
2016-12-20 13:17:01 +00:00
Chris Hill-Scott
810b613bc2 Remove nl2br Jinja filter
This was used when the code for previewing SMS templates lived in the
admin. ⌘F seems to suggest it’s not used anywhere else.
2016-12-20 11:10:38 +00:00
bandesz
57493aff51 Fix apt proxy and curl proxy in Docker 2016-12-20 11:04:29 +00:00
Chris Hill-Scott
69d986ddfa Outline text in HM Government logo
Non-outlined text requires the correct font to be installed to display
properly.

Outlined text is the shapes of the letters converted to vector, so it
doesn’t need any font installed to display.

Since we don’t have the right fonts installed on the boxes yet, this
will make things look better.
2016-12-19 14:47:48 +00:00
Chris Hill-Scott
dfcf2c85c9 Update number of services/departments 2016-12-19 14:12:44 +00:00
Chris Hill-Scott
5411fc4c7f Merge pull request #1057 from alphagov/pricing-on-product
Show pricing and number of services on product page
2016-12-19 12:49:30 +00:00
Chris Hill-Scott
ed1b7aad07 Add number of services to product page
One of the user needs that we identified is not wanting to be the first
to use it. It feels like a much less risky choice if there are already
other people in government using it.

The easiest way to communicate this is with counts of how many services.
The count of departments is good because it shows breadth, where the
count of services shows depth.

Hard coded for now because we have no automatic way of splitting our
test services from real live services.
2016-12-19 12:40:57 +00:00
Chris Hill-Scott
acdbba694e Use ‘pence’ in full
This matches what we now do on the product page.

From the GOV.UK style guide:
> Write out pence in full: calls will cost 4 pence per minute from a landline.

– https://www.gov.uk/guidance/style-guide/a-to-z-of-gov-uk-style#money
2016-12-19 12:40:37 +00:00
Chris Hill-Scott
a4e5c4a3bc Add pricing to the product page
‘How much does it cost’ is one of the user needs that we identifed for
the product page.

Cost is not the primary reason someone would use Notify (they’re more
likely to cite ease, or that it’s ‘official’). However if you _don’t_
mention cost then it looks like we’re hiding something or that there’s
a catch. So putting it on the page allays fears that people might have,
rather than pushing them towards using it.

Visually I’ve dropped the size of the `<h2>`s on this page so that
there’s enough difference between them and the big numbers. The idea of
the big numbers being big is to catch people’s attention as they scroll
down the page, by breaking up the rythmn.
2016-12-19 12:22:11 +00:00
minglis
0b0bd54a3e Merge pull request #1056 from alphagov/box-shadow-colour
Fix button shadow colour on product page
2016-12-16 15:19:06 +00:00
minglis
86b4ba6985 Merge pull request #1055 from alphagov/quis-patch-1
Fix misaligned sidebar on the tour
2016-12-16 15:15:54 +00:00
minglis
00564917a6 Merge pull request #1054 from alphagov/ie-product-css-fixes
Fix images on product page in older version of IE
2016-12-16 15:15:42 +00:00
Chris Hill-Scott
d4ab469a33 Fix button shadow colour on product page
The button was inheriting a green box shadow from the default GOV.UK
button style, which is typically used on a white background. On the blue
background, a darker blue shadow looks better I think.

The 15% darkening is the same as used by the default green button:
a3fe44e00e/stylesheets/design-patterns/_buttons.scss (L36)
2016-12-16 15:11:50 +00:00
minglis
c98a9e89f0 Merge pull request #1053 from alphagov/remove-session-protection
Switched off session protection
2016-12-16 14:31:34 +00:00
Chris Hill-Scott
cb1a26c37d Fix misaligned sidebar on the tour
Got broken when we moved the service name out of the nav.
2016-12-14 16:40:50 +00:00
Chris Hill-Scott
ecf7f5a1b5 Merge pull request #1037 from alphagov/pdf-preview
Render letter templates as PNGs and PDFs
2016-12-14 17:16:48 +01:00
Chris Hill-Scott
3713bad569 Include content count bug fix
Includes:
- [x] https://github.com/alphagov/notifications-utils/pull/102
2016-12-14 15:51:03 +00:00
Chris Hill-Scott
922a27e74b Use more sensible version number for html5lib
html5lib version numbers look like 0.999, 0.9999, etc.

This was making people unhappy, so they’ve added version numbers like
1.0b1, 1.0b2, etc which map to the numbers with lots of nines.

The equivalent version for 0.9999999 (7 nines) is 1.0b8 😐
2016-12-14 15:02:54 +00:00
Chris Hill-Scott
1c679ae621 Make breaking change not use rendered template
The breaking change page was taking the rendered template and saving
that if the user confirmed the change. This meant that templates could
be saved with `<span class="placeholder">…</span>` in their subject line
for example.

This commit fixes it so that it uses whatever data the user submitted,
not the rendered version of this.
2016-12-14 14:32:07 +00:00
Chris Hill-Scott
dc63de0f4e Incorporate breaking utils changes
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/94
2016-12-14 14:32:07 +00:00
Martyn Inglis
994032a76f Switched off session protection
Many departments are reporting being logged out during usage of the app
This may be because they present differing IP addresses to Notify on different requests due to outbound proxies and so on
Swicthing session protection to None means and IP change won't log a user out.
2016-12-14 14:07:08 +00:00
imdadahad
b02b4fbd71 Merge pull request #1052 from alphagov/add-link-to-net-client
Add link to .NET client under API docs
2016-12-14 13:17:07 +00:00
Imdad Ahad
3ccfc34d0f Update documentation page with .NET client link 2016-12-13 13:32:20 +00:00
Chris Hill-Scott
ae356fc741 Use PDF link renderer to preview letters
Depends on and implements:
- [x] https://github.com/alphagov/notifications-utils/pull/84
- [ ] https://github.com/alphagov/notifications-utils/pull/86
2016-12-13 10:34:19 +00:00
Chris Hill-Scott
43296469d6 Add endpoint for generating an image of a letter
The PDF preview is all good, but it’s hard, finickeity and feels dirty
to embed a PDF in a web page. It’s a more natural thing to embed an
image in a web page.

So this commit adds another endpoint to return an image of a letter
template. It generates this image from the PDF preview, so the stack
looks like:

1. `template.png` (generated in admin)
2. `template.pdf` (generated in admin)
3. HTML preview (generated by a `Renderer` in utils)
4. `Template` instance
5. serialised template from API
6. Template stored in database

The library used to convert the PDF to an image is Wand[1], which binds
to ImageMagick underneath. So in order to get this working locally on a
Mac you will probably need to do:
`brew install imagemagick ghostscript cairo pango`.

To get it working on Ubuntu/EC2 is an exercise left to the reader…

1. http://docs.wand-py.org/en/0.4.4/
2016-12-13 10:34:18 +00:00
Chris Hill-Scott
d0f90eac7e Add an endpoint for generating a PDF of a letter
Previewing a letter is different to previewing an email or text message
because:

- a letter has a layout
- the layout is fixed, ie it doesn’t depend on the user’s device
- the ‘send yourself a test’ feature won’t be as useful because it has
  a lead time, so the feedback loop will be much longer

For these reasons a HTML-only preview of the letter won’t be enough (we
don’t think). A PDF is more appropriate because:

- it can replicate the layout of the letter exactly
- it is a print format, so the user could even print themselves a copy
  locally to get a feel for how it will look

This commit makes use of Flask WeasyPrint [1] to take a HTML
representation of the letter, convert it to a PDF and serve it back to
the user.

The actual work to generate the HTML and specify the layout is done in
utils, same as we do for rendering other messages.

1. https://pythonhosted.org/Flask-WeasyPrint/
2016-12-13 10:34:18 +00:00
Chris Hill-Scott
4f72cc20ef Use patched version of WeasyPrint
Reasons here: 99718c2caf
2016-12-13 10:34:18 +00:00