Commit Graph

3542 Commits

Author SHA1 Message Date
Chris Hill-Scott
ab150d876d Stop letting people enter empty SMS senders
This shouldn’t be deployed until we’ve migrated the database to default
to GOVUK.
2017-05-19 22:42:17 +01:00
Chris Hill-Scott
eb7b8631b6 Merge pull request #1281 from alphagov/50-51
50-51 for Care to Learn (DfE)
2017-05-18 15:36:53 +01:00
Pete Herlihy
af052d08ce 50-51 for Care to Learn (DfE) 2017-05-18 14:17:56 +01:00
minglis
5d7606f64b Merge pull request #1278 from alphagov/removing-placeholders-non-breaking
Make removing placeholders a non-breaking change
2017-05-18 10:54:23 +01:00
minglis
b16e5a2f13 Merge pull request #1276 from alphagov/remove-unused-elements-css
Remove unused Elements SASS
2017-05-18 10:54:01 +01:00
minglis
d8fa3497c6 Merge pull request #1280 from alphagov/bump-service-count
Bumped service count
2017-05-18 10:53:25 +01:00
Martyn Inglis
543c9742d3 Bumped service count 2017-05-18 10:41:03 +01:00
minglis
8b3b1b06eb Merge pull request #1274 from alphagov/48-49
48-49 (and 28-29) for Public Health England
2017-05-18 10:39:57 +01:00
Chris Hill-Scott
42ebc44b83 Make removing placeholders a non-breaking change
The CSV upload route has always quietly ignored excess personalisation.
We changed the API to do the same here:
https://github.com/alphagov/notifications-api/pull/853

This means that removing a placeholder from a template is never a
breaking change, because the data that you were providing to populate it
is now just ignored.

So we don’t need to show the interstitial page in this case.
2017-05-17 13:10:23 +01:00
Chris Hill-Scott
c32dbae8e9 Remove icons
We don’t use them anywhere, and removing this include should save a bit
of file size in the compiled CSS.
2017-05-17 08:56:11 +01:00
Chris Hill-Scott
fe5343e2c6 Remove duplicate include
This file is included again two lines below.
2017-05-17 08:55:50 +01:00
Chris Hill-Scott
78093f82d9 Merge pull request #1275 from alphagov/fix-page-count-bug
Fix argument order bug with page count
2017-05-16 11:44:17 +01:00
Chris Hill-Scott
d9f5884e3d Fix argument order bug with page count 2017-05-16 11:43:19 +01:00
Chris Hill-Scott
9820f0db49 Merge remote-tracking branch 'origin/print-test' 2017-05-16 11:23:09 +01:00
Chris Hill-Scott
c43b8efbab Merge remote-tracking branch 'origin/rearrange-send-page' 2017-05-16 11:22:57 +01:00
Chris Hill-Scott
09a5065a78 Merge remote-tracking branch 'origin/main-heading' 2017-05-16 11:22:48 +01:00
Chris Hill-Scott
11394bce8e Merge remote-tracking branch 'origin/all-pages-everywhere' 2017-05-16 11:22:33 +01:00
Chris Hill-Scott
24817de387 Merge remote-tracking branch 'origin/spreadsheet-error-tweaks' 2017-05-16 11:22:19 +01:00
Chris Hill-Scott
41e952a0f5 Merge remote-tracking branch 'origin/hide-table-send-test' 2017-05-16 11:22:02 +01:00
Chris Hill-Scott
0a770297cb Merge remote-tracking branch 'origin/prototype-deploy' 2017-05-16 11:21:30 +01:00
Chris Hill-Scott
acae449ab9 Show all pages of a letter everywhere
Right now showing all the pages in full is the only way we have of
showing a letter that makes sense to our users. Maybe in the future we
show some kind of truncated version, but the end of the first page is
not a good place to truncate the letter.

This commit just extracts the code for showing multiple pages from the
template view, refactors it for reuse, and includes it in the send
views.
2017-05-16 11:09:34 +01:00
Pete Herlihy
300faf664e 48-49 (and 28-29) for Public Health England 2017-05-15 13:14:30 +01:00
Chris Hill-Scott
7074d82d5f Make download into a normal button
It’s the primary action on this page. We use big, bold links for lists
of links, eg services, templates.
2017-05-11 12:57:25 +01:00
Chris Hill-Scott
59350e0c00 Rename ‘generate preview’
‘Print a test letter’ seems to be closer to what people’s expectations
of what this feature does are.

The word ‘generate’ sounded too much like something the system was
doing, rather than something you, the user, were doing.
2017-05-11 12:55:22 +01:00
Chris Hill-Scott
1df601c14d Move the template preview to the bottom
Having to scroll past the template preview is fine for a short text
message, but annoying and confusing for a long letter. We even have
people completely missing what the page is for, because they don’t go
all the way to the bottom.

This change makes more sense now that we have a page for previewing a
template (not one long page with all the templates). You’re already
pretty confident that you’re using the right template on this page. It’s
just there as a double-check, and to help people understand where the
columns in the example file are coming from.
2017-05-11 12:23:28 +01:00
Chris Hill-Scott
5d0904ca36 Make the file type info take less space
It doesn’t need to be a bullet point for each format. We tested this in
research with DWP staff yesterday and it didn’t cause any problems. I
also think it’s nicer for the UI to tell you what you need to do, rather
than tell you what it can “accept”.
2017-05-11 12:21:49 +01:00
Chris Hill-Scott
3efae3a57f Call letter subjects ‘main heading’
This is a term that one of our research participants used to describe
the big bold text that starts each letter. I think it’s quite a nice
plain english term for it.

Also changes the formatting guidance to use the word heading instead of
title, for consistency.
2017-05-11 12:10:37 +01:00
Chris Hill-Scott
d37f7b6bc5 Don’t repeat _your file_ at start of paragraph
Looks weird, like we’re telling you two contradictory things. Doesn’t
scan well.
2017-05-11 11:33:25 +01:00
Chris Hill-Scott
f836f206e6 Say ‘missing’ rather than ‘doesn’t have’
Missing gives more of a suggestion that this is something to be fixed,
rather than just a statement of fact.
2017-05-11 11:23:58 +01:00
Chris Hill-Scott
30fe6db2e2 Don’t repeat names of columns in the error message
It makes the error message quite noisy.

We’re going to move the table right underneath the error message, so
you’ll be able to see the column names right there.
2017-05-11 11:14:27 +01:00
Chris Hill-Scott
3bccf39c77 Make the ‘no recipient column’ error more concise
Word salad.
2017-05-11 11:11:59 +01:00
Chris Hill-Scott
0697c62616 Hide the recipient table on send yourself a test
Send yourself a test is:
- a good way of explaining how placeholders work
- a useful tool for checking your work before you send a big batch

It’s not a good way of learning about the relationship between columns
in a spreadsheet and placeholders. The ‘example spreadsheet’ thing is
good at making that connection. The table on this page isn’t, because
it doesn’t _feel_ like you’re making a spreadsheet with the send
yourself a test feature (even though that’s what you’re doing in the
background). This will be even more the case when we stop putting the
input boxes horizontally on one page.

By removing the table from this page it makes the page simpler, which
allows people to focus on the important thing – what’s happening to
their message.
2017-05-11 10:55:44 +01:00
Chris Hill-Scott
d440f38646 Merge pull request #1264 from alphagov/quis-patch-1
Only show back button if you’ve come from settings
2017-05-11 09:35:50 +01:00
Rebecca Law
3e012dbe39 Merge pull request #1267 from alphagov/new-price
1.65 > 1.58 on homepage
2017-05-10 15:39:51 +01:00
Pete Herlihy
74e82abece 1.65 > 1.58 on homepage 2017-05-10 14:58:10 +01:00
Imdad Ahad
31d06a7253 Merge pull request #1266 from alphagov/roadmap
Updated the roadmap now that we're in May.
2017-05-10 10:18:38 +01:00
Chris Hill-Scott
2dd770452a Only show back button if you’ve come from settings
You can also reach this page from the individual template view.
2017-05-10 08:31:06 +01:00
Pete Herlihy
8c35b16cfc Updated the roadmap now that we're in May. 2017-05-09 14:51:20 +01:00
Chris Hill-Scott
4fc98127ca Add config to deploy a prototype version of admin
Sometimes we want to make changes to the admin app for doing user
research that we don’t want all users to see (because we’re not sure if
they’re the right changes to be making).

Previously this meant doing the research using a team member’s computer,
with the app running locally. This was bad for three reasons:

- requires the time of someone who has the code running locally
- requires the participant to use an unfamiliar computer
- means the participant doesn’t have access to their own Notify account
  (or an account that we’ve set up for doing user research with)

The dream* would be to have two versions of the frontend app running
side by side in production. This commit makes the dream real – the two
versions of admin are:

- the normal admin app, accessible on
  `www.notifications.service.gov.uk`
- a prototype version meant to be pushed to from a developer’s local
  machine**, on a `cloudapps.digital` subdomain

Both of these apps share the same backing services, eg config, API
instance, queues, etc, etc. Which means that the prototype version can
be logged into with the same username and password, and the user will
see their service and all their templates when they do so.

Ideally this wouldn’t mean creating a separate base manifest. However
it’s a feature of Cloud Foundry that you can override the application
name. Which means a separate base manifest and a bit of duplication. 😞

* actually the real dream would be to have a version of admin deployed
for each branch of the admin app, but this might get a bit resource
intensive.

** by running `CF_SPACE=preview make preview cf-deploy-prototype`, where
`preview` is the name of the space you want to deploy to
2017-05-08 16:54:44 +01:00
Chris Hill-Scott
3829002d65 Merge pull request #1261 from alphagov/wrap-email-meta
Make meta email preview meta info wrap nicely
2017-05-05 14:10:42 +01:00
Chris Hill-Scott
bf15c12380 Merge pull request #1259 from alphagov/letters-are-a-thing
Tell users that letters are coming
2017-05-05 14:10:34 +01:00
Chris Hill-Scott
698580ef0a Merge pull request #1256 from alphagov/unclickable-letters
Make letter previews unclickable
2017-05-05 14:10:25 +01:00
minglis
7bf61507b0 Merge pull request #1263 from alphagov/static-500
make sure static subdir 404s correctly
2017-05-05 09:58:05 +01:00
Leo Hemsted
d6de5508ca make sure static subdir 404s correctly
before each request, we put the current service on the flask session,
except for with the static folder, cos it's not needed.... except, if
we 404, then we return the 404 template, which checks if you're logged
in or not to display different nav bar items. This was crashing when
current_service wasn't set, so we now set it.

also cleaned up some imports and stuff in test files
2017-05-04 11:28:45 +01:00
kentsanggds
15f90093ac Merge pull request #1262 from alphagov/update-pricing-rate
Updated pricing page
2017-05-04 11:01:48 +01:00
Ken Tsang
050c90fb64 Updated pricing page 2017-05-04 10:36:21 +01:00
Chris Hill-Scott
9be17bd728 Make meta email preview meta info wrap nicely
Because the email addresses can get pretty long, and have no spaces in
them, they sometimes break out of their containing box. This looks messy
and causes horizontal scrolling.
2017-05-03 15:12:25 +01:00
kentsanggds
50e4a8a50c Merge pull request #1260 from alphagov/update-rates-in-mocks
Update rates to avoid confusion
2017-05-03 13:46:21 +01:00
Ken Tsang
79e1df33cf Update rates to avoid confusion 2017-05-03 13:19:15 +01:00
Chris Hill-Scott
91ccd6a7bd Make letter preview show up on job page
It wasn’t being called with the URL, so the contents of the letter were
just showing up as plain text on the page.
2017-05-03 12:20:46 +01:00