feat(signin): use XO 5 style (#394)

Fixes vatesfr/xo-web#1161
This commit is contained in:
Pierre Donias 2016-09-14 17:56:05 +02:00 committed by Julien Fontanet
parent 6d6a630c31
commit 1707cbcb54
2 changed files with 43 additions and 53 deletions

View File

@ -6,54 +6,44 @@ html
meta(name = 'viewport' content = 'width=device-width, initial-scale=1.0') meta(name = 'viewport' content = 'width=device-width, initial-scale=1.0')
title Xen Orchestra title Xen Orchestra
meta(name = 'author' content = 'Vates SAS') meta(name = 'author' content = 'Vates SAS')
link(rel = 'stylesheet' href = 'styles/main.css') link(rel = 'stylesheet' href = 'index.css')
link(rel = 'stylesheet' href = 'v4/styles/main.css') body(style = 'display: flex; height: 100vh;')
body div(style = 'margin: auto; width: 20em;')
.container div.m-b-2(style = 'display: flex;')
.row-login img(src = 'assets/logo.png' style = 'margin: auto;')
.page-header h2.text-xs-center.m-b-2 Xen Orchestra
img(src = 'images/logo_small.png') form(action = 'signin/local' method = 'post')
h2 Xen Orchestra
form.form-horizontal(action = 'signin/local' method = 'post')
fieldset fieldset
legend.login
h3 Sign in
if error if error
p.text-danger #{error} p.text-danger #{error}
.form-group .input-group.m-b-1
.col-sm-12
.input-group
span.input-group-addon span.input-group-addon
i.xo-icon-user.fa-fw i.xo-icon-user.fa-fw
input.form-control.input-sm( input.form-control(
name = 'username' name = 'username'
type = 'text' type = 'text'
placeholder = 'Username' placeholder = 'Username'
required required
) )
.form-group .input-group.m-b-1
.col-sm-12
.input-group
span.input-group-addon span.input-group-addon
i.fa.fa-key.fa-fw i.fa.fa-key.fa-fw
input.form-control.input-sm( input.form-control(
name = 'password' name = 'password'
type = 'password' type = 'password'
placeholder = 'Password' placeholder = 'Password'
required required
) )
.form-group
.col-sm-5
.checkbox .checkbox
label label
input( input(
name = 'remember-me' name = 'remember-me'
type = 'checkbox' type = 'checkbox'
) )
|  
| Remember me | Remember me
.form-group div
.col-sm-12 button.btn.btn-block.btn-info
button.btn.btn-login.btn-block.btn-success
i.fa.fa-sign-in i.fa.fa-sign-in
| Sign in | Sign in
each label, id in strategies each label, id in strategies

View File

@ -179,7 +179,7 @@ async function setUpPassport (express, xo) {
next() next()
} else if (req.cookies.token) { } else if (req.cookies.token) {
next() next()
} else if (/favicon|fontawesome|images|styles/.test(url)) { } else if (/favicon|fontawesome|images|styles|\.(?:css|jpg|png)$/.test(url)) {
next() next()
} else { } else {
req.flash('return-url', url) req.flash('return-url', url)