Centered login form (merge pull-requests #142 and #143)

This commit is contained in:
Frédéric Guillot 2014-07-14 20:37:27 -02:30
parent 1583427190
commit 0db514bbf7
2 changed files with 43 additions and 38 deletions

View File

@ -1,38 +1,42 @@
<div class="page-header">
<h1><?= t('Sign in') ?></h1>
</div>
<div class="form-login">
<?php if (isset($errors['login'])): ?>
<p class="alert alert-error"><?= Helper\escape($errors['login']) ?></p>
<?php endif ?>
<form method="post" action="?controller=user&amp;action=check" class="form-login">
<?= Helper\form_csrf() ?>
<?= Helper\form_label(t('Username'), 'username') ?>
<?= Helper\form_text('username', $values, $errors, array('autofocus', 'required')) ?><br/>
<?= Helper\form_label(t('Password'), 'password') ?>
<?= Helper\form_password('password', $values, $errors, array('required')) ?>
<?= Helper\form_checkbox('remember_me', t('Remember Me'), 1) ?><br/>
<ul>
<?php if (GOOGLE_AUTH): ?>
<li>
<a href="?controller=user&amp;action=google"><?= t('Login with my Google Account') ?></a>
</li>
<?php endif ?>
<?php if (GITHUB_AUTH): ?>
<li>
<a href="?controller=user&amp;action=gitHub"><?= t('Login with my GitHub Account') ?></a>
</li>
<?php endif ?>
</ul>
<div class="form-actions">
<input type="submit" value="<?= t('Sign in') ?>" class="btn btn-blue"/>
<div class="page-header">
<h1><?= t('Sign in') ?></h1>
</div>
</form>
<?php if (isset($errors['login'])): ?>
<p class="alert alert-error"><?= Helper\escape($errors['login']) ?></p>
<?php endif ?>
<form method="post" action="?controller=user&amp;action=check">
<?= Helper\form_csrf() ?>
<?= Helper\form_label(t('Username'), 'username') ?>
<?= Helper\form_text('username', $values, $errors, array('autofocus', 'required')) ?><br/>
<?= Helper\form_label(t('Password'), 'password') ?>
<?= Helper\form_password('password', $values, $errors, array('required')) ?>
<?= Helper\form_checkbox('remember_me', t('Remember Me'), 1) ?><br/>
<ul>
<?php if (GOOGLE_AUTH): ?>
<li>
<a href="?controller=user&amp;action=google"><?= t('Login with my Google Account') ?></a>
</li>
<?php endif ?>
<?php if (GITHUB_AUTH): ?>
<li>
<a href="?controller=user&amp;action=gitHub"><?= t('Login with my GitHub Account') ?></a>
</li>
<?php endif ?>
</ul>
<div class="form-actions">
<input type="submit" value="<?= t('Sign in') ?>" class="btn btn-blue"/>
</div>
</form>
</div>

View File

@ -254,8 +254,9 @@ input.form-date {
}
.form-login {
padding-left: 20px;
width: 430px;
width: 470px;
padding: 10px;
margin: 3% auto 20% auto;
}
.form-column li,