From 05b8bc36ecc9ee11d2c5650bc1e8cdd74a4d740c Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 9 Jun 2014 10:25:38 +0100 Subject: [PATCH] Style password resets --- services/web/app/views/user/login.jade | 4 +-- .../web/app/views/user/passwordReset.jade | 29 +++++++++--------- services/web/app/views/user/setPassword.jade | 30 +++++++++---------- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/services/web/app/views/user/login.jade b/services/web/app/views/user/login.jade index 926c6305ce..b6ee136a06 100644 --- a/services/web/app/views/user/login.jade +++ b/services/web/app/views/user/login.jade @@ -13,9 +13,9 @@ block content input(name='_csrf', type='hidden', value=csrfToken) input(name='redir', type='hidden', value=redir) .form-group - input#email.email.required.form-control(type='email', autofocus="autofocus", name='email', placeholder='your@email.com') + input#email.email.required.form-control(type='email', autofocus="autofocus", name='email', placeholder='email@example.com') .form-group input#password.required.form-control(type='password', name='password', placeholder='********') .actions button.btn-primary.btn#login(type='submit') Login - a#passwordReset.pull-right(href='/user/passwordreset') Forgot your password? + a#passwordReset.pull-right(href='/user/password/reset') Forgot your password? diff --git a/services/web/app/views/user/passwordReset.jade b/services/web/app/views/user/passwordReset.jade index 5bc8733a10..864a987d87 100644 --- a/services/web/app/views/user/passwordReset.jade +++ b/services/web/app/views/user/passwordReset.jade @@ -1,17 +1,18 @@ extends ../layout block content - .container - .row - .box.span4.offset4 - .page-header - h1 Password Reset - .messageArea - form.validate#passwordReset(method='post') - input(type="hidden", name="_csrf", value=csrfToken) - .clearfix - label(for='xlInput') Email - .input - input.span4.email.required(type='email', name='email', placeholder='your@email.com') - .actions - button.btn.btn-primary.btn.btn-large(type='submit') Submit + .content.content-alt + .container + .row + .col-md-6.col-md-offset-3.col-lg-4.col-lg-offset-4 + .card + .page-header + h1 Password Reset + .messageArea + form.validate#passwordReset(method='post') + input(type="hidden", name="_csrf", value=csrfToken) + .form-group + label(for='email') Please enter your email address + input.email.required.form-control(type='email', name='email', placeholder='email@example.com') + .actions + button.btn.btn-primary.btn.btn-large(type='submit') Request password reset diff --git a/services/web/app/views/user/setPassword.jade b/services/web/app/views/user/setPassword.jade index 929b6aeb46..53e5b27b83 100644 --- a/services/web/app/views/user/setPassword.jade +++ b/services/web/app/views/user/setPassword.jade @@ -1,18 +1,18 @@ extends ../layout block content - .container - .row - .box.span4.offset4 - .page-header - h1 Set Password - .messageArea - form.validate#setPasswordReset(method='post') - input(type="hidden", name="_csrf", value=csrfToken) - .clearfix - .input - input.span4.password.required(type='password', name='password', placeholder='new password') - .input - input(type="hidden", name="passwordResetToken", value=passwordResetToken) - .actions - button.btn.btn-primary.btn.btn-large(type='submit') Submit \ No newline at end of file + .content.content-alt + .container + .row + .col-md-6.col-md-offset-3.col-lg-4.col-lg-offset-4 + .card + .page-header + h1 Reset your password + .messageArea + form.validate#setPasswordReset(method='post') + input(type="hidden", name="_csrf", value=csrfToken) + .form-group + input.password.required.form-control(type='password', name='password', placeholder='new password') + input(type="hidden", name="passwordResetToken", value=passwordResetToken) + .actions + button.btn.btn-primary.btn.btn-large(type='submit') Set new password \ No newline at end of file