Commit Graph

475 Commits

Author SHA1 Message Date
Chris Hill-Scott
46db79c421 Add a new style of banner—‘tip’
This banner is meant for onboarding users and giving them prompts about what
they should do next.
2016-02-02 09:44:24 +00:00
Chris Hill-Scott
683f8d4161 Merge pull request #134 from alphagov/share-phone-validation
Moved mobile validation to utils module for use in csv upload as well.
2016-02-01 17:21:23 +00:00
NIcholas Staples
1f1355547f Merge pull request #133 from alphagov/tidy-up-inconsistent-forms
Tidy up inconsistent forms
2016-02-01 17:03:36 +00:00
Adam Shimali
9e8c0b8d59 Moved mobile validation to utils module for use in csv upload as well.
This could be moved to shared utils code base at some point.
2016-02-01 16:57:40 +00:00
Chris Hill-Scott
3f45dbf09d Replace tabs with two spaces for consistency 2016-02-01 16:57:29 +00:00
Chris Hill-Scott
9cf6dfa6f2 Tidy up inconsistencies in forms
Wherever possible, use the macros.
2016-02-01 16:55:46 +00:00
Chris Hill-Scott
3135f6c510 Use different colours for each environment
https://www.pivotaltracker.com/story/show/112786779

> There's an emerging convention on admin apps, to have a red strip atop the
> page, also to have a different colour for preview environment... so let's
> adopt that and see how it feels. Red for prod and gold for preview.

This commit adds config so that:
- yellow locally
- orange on preview and staging
- red on live

It will not actually work until each AWS environment uses the right config, but
can be tested locally by setting the environment variable manually, eg:
`export HEADER_COLOUR='#F47738'`
2016-02-01 15:35:19 +00:00
Adam Shimali
b5b13254c7 Merge pull request #131 from alphagov/use-template-var
Small bug fixes
2016-02-01 14:23:36 +00:00
Rebecca Law
8252dc4d39 Add autocomplete off option for confirm service setting page 2016-02-01 13:53:55 +00:00
Chris Hill-Scott
2ef1057180 Make spacing and position of banners consistent
Banners should always be the first thing on the page.

Because headers already have padding we don’t want to put padding on the
container.

So banners should also have top padding to distance then from the red bar.

They should also sit in the 3/4 column if the page has side navigation. This
commit adds a new template (`withoutnav_template.html`) which extends
`admin_template.html`. All views then extend one or the other, never the
`admin_template.html` directly. This means that `admin_template.html` doesn’t
have to make decisions about where the flash messages are displayed.
2016-02-01 13:52:46 +00:00
Chris Hill-Scott
286fc308d9 Make the header bar red
Red for admin is a good reckon.
2016-02-01 13:52:46 +00:00
Chris Hill-Scott
f6aed4fa06 Remove ‘BETA’ label
There’s an argument to be made that the beta label should only apply to
the public-facing parts of services/platforms.

Removing it from here means that we don’t need to deal with the hassle of how it
fits into the navigation. If we have to bring it back then we could follow the
banner example here instead:

http://govuk-elements.herokuapp.com/alpha-beta-banners/#beta-banner
2016-02-01 13:52:46 +00:00
Chris Hill-Scott
e97f69e801 Make ‘GOV.UK Notify’ less shouty
‘GOV.UK’ in the template is set in 30px type to line up perfectly with the
crown. When adding more text, it looks too big.

This commit reduces the type size to 27px (which is still a core type size) and
tweaks the spacing so that things still look nice/aligned.
2016-02-01 13:52:45 +00:00
Chris Hill-Scott
90077f1d8b Don’t call the dashboard a dashboard
I reckon that having the name of the service link to the dashboard is clear
enough, and it avoids having to introduce a new word.
2016-02-01 13:52:45 +00:00
Chris Hill-Scott
3617f2e936 Move service and user nav to proposition header
This commit moves user-related navigation into the proposition header (the black
bar) at the top of the site. It adds some custom SASS to override GOV.UK
template and align these navigation items to the right (because it looks
better).

It then removes the service chooser dropdown (and its associated SASS and JS) in
favour of a link alongside the user-related navigation items. ‘Switch service’
is the best language for this that we’ve come up with so far.

This means that the only way of adding a new service is from the `/services`
page. So this commit removes the redirect if you land on this page with only one
service (else it would prevent you from ever being able to add more).
2016-02-01 13:52:45 +00:00
Rebecca Law
8f7b7122a1 Fixes for small bug found 2016-02-01 13:48:43 +00:00
Adam Shimali
b73a5d8710 Pass selected template id to api when creating job.
Moved query params for original file name and template id
to session.
2016-02-01 11:28:36 +00:00
Adam Shimali
c5100ad176 Merge pull request #127 from alphagov/status_page_update
Status page update
2016-01-29 15:59:04 +00:00
Adam Shimali
4ea50499c3 List and individual job pages now fetch data from api.
Few bug fixes around job uuid.
2016-01-29 15:35:35 +00:00
Nicholas Staples
bed1116587 Status update added. 2016-01-29 14:41:07 +00:00
Adam Shimali
5196436645 Better bucket name pending possible change to uuid for service primary
key.

Also small bugfix around file name and original file name
2016-01-29 12:19:50 +00:00
NIcholas Staples
0dc6f7be1a Merge pull request #124 from alphagov/create-job
Uploading csv creates job via api
2016-01-29 11:27:26 +00:00
Rebecca Law
867ef7ad99 Default service name if service name is not set on the session.
Pop service name off the session on sign out.
2016-01-29 10:40:55 +00:00
Adam Shimali
0995cd2e3c Uploading csv creates job via api 2016-01-29 10:30:02 +00:00
Rebecca Law
0dd20abbb3 Replace Current service with chosen service name. 2016-01-28 17:20:34 +00:00
Nicholas Staples
62150e5596 Added fixes for forms to hide potential email philshing scams. 2016-01-28 16:36:36 +00:00
NIcholas Staples
f2a01c50de Merge pull request #121 from alphagov/user-cleanup
Inherit from flask usermixin for default implementation of
2016-01-28 15:42:41 +00:00
NIcholas Staples
9ecff136d0 Merge pull request #120 from alphagov/set-secure-cookie
Set secure cookie
2016-01-28 15:42:25 +00:00
Rebecca Law
595a17b780 Fix checkstyle 2016-01-28 15:36:18 +00:00
Adam Shimali
5f52c0d3d6 Inherit from flask usermixin for default implementation of
is_authenticated and is_anonymous
2016-01-28 15:34:02 +00:00
Rebecca Law
54a61ac928 Update the cookie to secure on LIVE
Set the expiration of the cookie.
2016-01-28 15:31:32 +00:00
Rebecca Law
5a17bba97e Set SESSION_COOKIE_SECURE=True for live. 2016-01-28 15:01:44 +00:00
Adam Shimali
414e468cb0 Link to send email broken in nav 2016-01-28 14:17:13 +00:00
Nicholas Staples
ab20eaa491 Fix for service settings. 2016-01-28 12:38:43 +00:00
Adam Shimali
91465520a0 Call to client for password check incorrectly passed user instead
of user.id
2016-01-28 12:31:24 +00:00
Adam Shimali
5dccba56c9 Merge pull request #117 from alphagov/password_validation_for_service_changes
Password validation for service changes
2016-01-28 11:37:51 +00:00
Nicholas Staples
e322a5f1c3 Review comment fixes. 2016-01-28 11:34:15 +00:00
Nicholas Staples
ca8d78aee5 Fix for forgot my password. 2016-01-27 18:01:43 +00:00
Nicholas Staples
91bd3e9fdb Fix for email update. 2016-01-27 17:30:48 +00:00
Nicholas Staples
c123098e14 Bug fixes. 2016-01-27 17:26:22 +00:00
Nicholas Staples
ff8a727759 Fix for updated client. 2016-01-27 17:13:56 +00:00
Nicholas Staples
2d35f5f36a All tests passing and merged with master. 2016-01-27 16:30:33 +00:00
Rebecca Law
20e3d1952f Add import for banner 2016-01-27 15:22:47 +00:00
NIcholas Staples
68891d8eb8 Merge pull request #112 from alphagov/post-hack-day
Show all links in side navigation again
2016-01-27 12:25:00 +00:00
NIcholas Staples
8ff5ee9ffb Merge pull request #113 from alphagov/real-templates
Use real templates when sending text messages
2016-01-27 12:24:52 +00:00
NIcholas Staples
0858cec438 Merge pull request #114 from alphagov/no-service-hint
Remove hint from choose service page
2016-01-27 12:24:44 +00:00
Nicholas Staples
6959d695d3 Working tests, hopefully all code changes done. 2016-01-27 12:22:32 +00:00
Chris Hill-Scott
3a864ad132 Use real templates when sending text messages
Sets the value of `template` to the ID of the chosen template when submitting
the form.
2016-01-26 17:17:46 +00:00
Chris Hill-Scott
a6d19ff45b Show correct default state on service settings page
By default a service should be active (ie keys not suspended). For some reason
the API is returning the opposite.

This commit reverses the logic to make it look right for hack day.
2016-01-26 17:16:24 +00:00
Chris Hill-Scott
5637e62493 Remove hint from choose service page
We might want this one day, but for now nothing is better than non-real-looking
text.
2016-01-26 17:12:28 +00:00