Commit Graph

113 Commits

Author SHA1 Message Date
Nicholas Staples
7693ba8a18 Update register view form and template. 2016-01-05 12:41:20 +00:00
Rebecca Law
785c413cde Move and rename macro.html
Remove print statements
Fix code style
2016-01-04 15:50:26 +00:00
Rebecca Law
ac05f6931e Refactor add-service form such that the dao is not exposed in the forms. 2016-01-04 15:31:50 +00:00
Rebecca Law
b2f544a165 110880218: Completed implementation of resend the verificaton code 2015-12-31 13:16:59 +00:00
Rebecca Law
64812c1614 109898688: All codes are valid until one code is used, then they are all marked used.
Fixed the is_active() method on the Users model, if the user was pending they would come back as active, allowing a user to sign in before being active.
There is still a problem with the validate_sms_code and validate_email_code method.
2015-12-17 14:33:20 +00:00
Rebecca Law
bd8bb3c926 109898688: Implementation of text-not-received and email-not-received 2015-12-17 14:33:20 +00:00
Pete Herlihy
7ddf2b0a9c Updated direct URLs to method ones 2015-12-16 14:12:24 +00:00
Pete Herlihy
a7e6fc340a Added some data and links to the dashboard to give it a 'flavour' 2015-12-16 13:51:46 +00:00
Pete Herlihy
a534441fa0 Merge pull request #30 from alphagov/new-nav
Create side navigation for logged in pages
2015-12-15 15:17:25 +00:00
Chris Heathcote
6fa29e769d Rolling back to thirds 2015-12-15 13:57:19 +00:00
Chris Heathcote
1ad5f7f8e6 Trialling 1/4 width nav 2015-12-15 13:48:23 +00:00
Chris Heathcote
17850dc170 Changed nav urls to be url_fors 2015-12-15 10:52:24 +00:00
Rebecca Law
23b5cffbe8 110067722: Update template with the form. 2015-12-15 10:32:26 +00:00
Chris Heathcote
89189f2e35 Add URLs to main nav; add user profile to nav 2015-12-14 16:58:43 +00:00
Chris Heathcote
15c9269a80 Added main nav to logged in pages 2015-12-14 16:53:07 +00:00
Chris Heathcote
ec020a42f4 Initial nav & implementation on dashboard 2015-12-14 16:37:15 +00:00
Chris Hill-Scott
7ac08e9a85 Simplify check and send SMS page
This commit:
- removes the row numbering so it’s easier to scan the list of phone numbers
- adds subheadings for 'first three' and 'last three'
- puts the 'see all' link at the end
2015-12-11 17:27:26 +00:00
Chris Hill-Scott
c6a73c287a Improvements to send SMS page
- make messages align horizontally
- change wording of step 2 (from Lorena)
2015-12-11 14:32:43 +00:00
Chris Hill-Scott
d2562889b8 Replace CSV preview with rendered messages
If there are less than 7 messages, show them all.

If there are more than 7, show the first and last three, and a link to the
remaining x.
2015-12-11 14:02:42 +00:00
Chris Hill-Scott
4c14e273c2 Try out previewing messages 2015-12-11 12:02:21 +00:00
Chris Hill-Scott
64f03bed06 Make labels blocks, put next to message templates 2015-12-11 11:39:52 +00:00
Chris Hill-Scott
703eed3d36 Add 'back' button 2015-12-11 09:49:39 +00:00
Chris Hill-Scott
8a34fa7e0a Use Flask for routing
This commit:
- replaces links that look like buttons with forms and submit buttons
- splits the view code for SMS into its own file
- moves the routing into the Python by adding handling for `post` requests
- uses Flask’s `url_for` to generate URLs, rather than hard coding them (so that
  it’s easier to change the URLs)
- chages the URLs for sending text messages
2015-12-11 09:49:38 +00:00
Chris Hill-Scott
dbc55e76b0 Add table of recipients
Uses an adapted version of the 'summary table' pattern from Digital Marketplace
frontend toolkit:
http://alphagov.github.io/digitalmarketplace-frontend-toolkit/summary-table.html
2015-12-11 09:49:38 +00:00
Chris Hill-Scott
c4df25c8db Add a non-JS template picker
We could do something with Javascript to only show the selected template. For
now this is something that works without Javascript.

This means we can put off getting the build and testing pipeline for Javascript
set up, which is a bigger and more unknown piece of work.
2015-12-11 09:49:38 +00:00
Chris Hill-Scott
73ccea4d1f Add GOV.UK Elements as a submodule
Since GOV.UK Elements is versionned now it makes sense to bring it in as a
dependency. This enforces a separation between what generic stuff we’re using
from Elements and what is specific to our app.

The benefit is that when the generic stuff changes it will be easy to bring
those changes in.

This commit also bumps GOV.UK frontend toolkit to the latest version (v4.5.0).
2015-12-11 09:49:31 +00:00
Chris Hill-Scott
1f39a0fe61 Hard code some data in the Python
This commit adds some stubbed data for the pages. The structure of the data
is just a proposal, but it gives the templates something to work with for now.
2015-12-11 09:48:59 +00:00
Chris Hill-Scott
b46872d2b9 Add a template filter for message placeholders
As a first guess placeholders can be added to messages with the
`((placeholder))` syntax.

This commit adds a Jinja template filter to convert strings containing
said-formatted strings into HTML, which can then be styled to highlight which
parts will be substituted in messages.
2015-12-11 09:48:59 +00:00
Chris Hill-Scott
a5f4580a7f Get SASS compilation working
Main thing that was missing was including the main CSS file in the template.

There are a few hacky bits here, like moving the whole of toolkit inside the
stylesheets directory.

Would arguably be cleaner using something that isn’t Flask Assets, but that’s
something for later.
2015-12-11 09:48:59 +00:00
Chris Hill-Scott
2f980ab622 Move all pages into their own directory
There are a lot of pages. It seems like a good idea to keep them in one place,
so they don’t get mixed up with partials and layouts.
2015-12-11 09:48:52 +00:00
minglis
3b327c9986 Merge pull request #22 from alphagov/implement_two_factor
Implement two factor
2015-12-09 14:20:29 +00:00
Chris Heathcote
b60b4f6d3a Merge pull request #23 from alphagov/change_labels
Change labels
2015-12-09 14:14:38 +00:00
Rebecca Law
f19cebd5fc Use the labels in the template rather than the form 2015-12-09 12:02:59 +00:00
Rebecca Law
5afb36cf71 Put the label in the templates rather than use the form label.
Just to make it easier.
2015-12-09 12:01:07 +00:00
Pete Herlihy
b038e00fab Added mange templates link to the dashboard 2015-12-09 11:14:45 +00:00
Pete Herlihy
80461e330c Added an add template button to manage templates page 2015-12-09 11:09:29 +00:00
Pete Herlihy
c145a07072 Added link to template edit page 2015-12-09 10:58:01 +00:00
Pete Herlihy
65c661d8d7 Created an initial page for editing templates [ci skip] 2015-12-09 10:52:09 +00:00
Pete Herlihy
7f1cdd2d27 Added initial template manage page [ci skip] 2015-12-09 10:47:38 +00:00
Rebecca Law
2e59870490 109638656: Implement two factor verify flow
When user enters valid sms code they are redirected to the dashboard.
Otherwise, form errors are present.
2015-12-09 10:17:09 +00:00
Rebecca Law
16618e80f9 109526520: Implement verify flow
When a person registers with a valid mobile number and email address,
a code will be sent to each. That person can enter the verify codes and continue to the add-service page.
2015-12-09 10:12:21 +00:00
Rebecca Law
60ed0c541b Remove the temporary endpoint to create users. 2015-12-08 09:03:48 +00:00
Chris Heathcote
12cbc04080 Changed main GOV.UK link depending on whether user is logged in or not
Goes to / for not logged in, /dashboard for logged in.
2015-12-07 16:18:05 +00:00
Lorena Sutherland
782d68a071 Add line break 2015-12-07 11:49:29 +00:00
Lorena Sutherland
1803fea9ab Fix bullet layout 2015-12-07 11:44:32 +00:00
Lorena Sutherland
851026970c Amend text 2015-12-07 11:16:14 +00:00
Lorena Sutherland
f91f5b5f02 Add line break to label 2015-12-07 10:04:51 +00:00
Lorena Sutherland
e9c9b8c271 Amend text 2015-12-04 15:12:48 +00:00
Lorena Sutherland
619df26690 Amend text 2015-12-04 15:08:41 +00:00
Lorena Sutherland
30f55321b2 Amend text 2015-12-04 15:07:21 +00:00