710 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Adam Shimali	b5b13254c7	Merge pull request #131 from alphagov/use-template-var ... Small bug fixes	2016-02-01 14:23:36 +00:00
Adam Shimali	8fcf9866fe	Merge pull request #130 from alphagov/nav-2.0 ... Fix the navigation and menus on frontend	2016-02-01 13:58: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
NIcholas Staples	674e40d8d4	Merge pull request #129 from alphagov/set-template-with-csv ... Pass selected template id to api when creating job.	2016-02-01 11:43:20 +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
NIcholas Staples	fa34dcd3a6	Merge pull request #128 from alphagov/view-job ... List and individual job pages now fetch data from api.	2016-01-29 15:57:37 +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	c3b2fc1ca2	push-tag file added.	2016-01-29 14:42:45 +00:00
Nicholas Staples	bed1116587	Status update added.	2016-01-29 14:41:07 +00:00
NIcholas Staples	5f7b9fed3a	Merge pull request #126 from alphagov/better-bucket-name ... Better bucket name pending possible change to uuid for service primary	2016-01-29 12:53:06 +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
NIcholas Staples	6f0d74247d	Merge pull request #125 from alphagov/set-service-name-on-session ... Set service name on session	2016-01-29 11:16:57 +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
Adam Shimali	828255c98e	Merge pull request #123 from alphagov/set-service-name-on-session ... Replace Current service with chosen service name.	2016-01-29 10:29:38 +00:00
Rebecca Law	0dd20abbb3	Replace Current service with chosen service name.	2016-01-28 17:20:34 +00:00
Rebecca Law	ec044fe5b8	Merge pull request #122 from alphagov/sign_in_fixes ... Sign in fixes	2016-01-28 16:47:20 +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	d52a5553a9	Merge remote-tracking branch 'origin/master' into sign_in_fixes	2016-01-28 16:04:50 +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	b8b7b246d8	Merge pull request #119 from alphagov/fix-send-email-link ... Link to send email broken in nav	2016-01-28 15:33:40 +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	32de812e6d	Merge pull request #118 from alphagov/fix-user-urls ... Call to client for password check incorrectly passed user instead	2016-01-28 12:41:37 +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	816aecd8fd	Merge pull request #116 from alphagov/add-banner-import ... Add import for banner	2016-01-27 17:47:23 +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	ae05da4c01	Update for python client.	2016-01-27 17:04:01 +00:00
Nicholas Staples	479e96b646	Removed postgres from travis.yml.	2016-01-27 16:45:05 +00:00
Nicholas Staples	268b24463c	Code style fix.	2016-01-27 16:41:49 +00:00