alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

did some of the forms

Browse Source
This commit is contained in:
Henry Oswald
2014-07-31 14:01:37 +01:00
parent 43750e9cb6
commit ab10d84f6a
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/views/user/login.jade
+6 -6
View File
@@ -7,7 +7,7 @@ block content
.col-md-6.col-md-offset-3.col-lg-4.col-lg-offset-4
.card
.page-header
h1 Log In
h1 #{translate("log_in")}
form(async-form="login", name="loginForm", action='/login', ng-cloak)
input(name='_csrf', type='hidden', value=csrfToken)
input(name='redir', type='hidden', value=redir)
@@ -23,7 +23,7 @@ block content
focus="true"
)
span.small.text-primary(ng-show="loginForm.email.$invalid && loginForm.email.$dirty")
| Must be an email address
| #{translate("must_be_email_address")}
.form-group
input.form-control(
type='password',
@@ -33,12 +33,12 @@ block content
ng-model="password"
)
span.small.text-primary(ng-show="loginForm.password.$invalid && loginForm.password.$dirty")
| Required
| #{translate("required")}
.actions
button.btn-primary.btn(
type='submit',
ng-disabled="loginForm.inflight"
)
span(ng-show="!loginForm.inflight") Login
span(ng-show="loginForm.inflight") Logging in...
a.pull-right(href='/user/password/reset') Forgot your password?
span(ng-show="!loginForm.inflight") #{translate("login")}
span(ng-show="loginForm.inflight") #{translate("logging_in")}...
a.pull-right(href='/user/password/reset') #{translate("forgot_your_password")}?
services/web/app/views/user/passwordReset.jade
+5 -5
View File
@@ -7,7 +7,7 @@ block content
.col-md-6.col-md-offset-3.col-lg-4.col-lg-offset-4
.card
.page-header
h1 Password Reset
h1 #{translate("password_reset")}
.messageArea
form(
async-form="password-reset-request",
@@ -18,9 +18,9 @@ block content
input(type="hidden", name="_csrf", value=csrfToken)
form-messages(for="passwordResetForm")
.alert.alert-success(ng-show="passwordResetForm.response.success")
| You have been sent an email to complete your password reset.
| #{translate("password_reset_email_sent")}
.form-group
label(for='email') Please enter your email address
label(for='email') #{translate("please_enter_email")}
input.form-control(
type='email',
name='email',
@@ -31,9 +31,9 @@ block content
)
span.small.text-primary(
ng-show="passwordResetForm.email.$invalid && passwordResetForm.email.$dirty"
) Must be a valid email address
) #{translate("must_be_email_address")}
.actions
button.btn.btn-primary(
type='submit',
ng-disabled="passwordResetForm.$invalid"
) Request password reset
) #{translate("request_password_reset")}
services/web/app/views/user/setPassword.jade
+5 -5
View File
@@ -7,7 +7,7 @@ block content
.col-md-6.col-md-offset-3.col-lg-4.col-lg-offset-4
.card
.page-header
h1 Reset your password
h1 #{translate("reset_your_password")}
form(
async-form="password-reset",
name="passwordResetForm",
@@ -17,8 +17,8 @@ block content
input(type="hidden", name="_csrf", value=csrfToken)
form-messages(for="passwordResetForm")
.alert.alert-success(ng-show="passwordResetForm.response.success")
| Your password has been reset.
a(href='/login') Login here
| #{translate("password_has_been_reset")}
a(href='/login') #{translate("login_here")}
.form-group
input.form-control(
@@ -31,7 +31,7 @@ block content
)
span.small.text-primary(
ng-show="passwordResetForm.password.$invalid && passwordResetForm.password.$dirty"
) Required
) #{translate("required")}
input(
type="hidden",
name="passwordResetToken",
@@ -41,4 +41,4 @@ block content
button.btn.btn-primary(
type='submit',
ng-disabled="passwordResetForm.$invalid"
) Set new password
) #{translate("set_new_password")}