Merge pull-request: Github authentication #162

2014-06-30 21:52:02 -03:00
parent f70ac7d65f
commit 06d0b7048e
23 changed files with 488 additions and 57 deletions
--- a/app/Templates/user_login.php
+++ b/app/Templates/user_login.php
@@ -18,12 +18,20 @@

    <?= Helper\form_checkbox('remember_me', t('Remember Me'), 1) ?><br/>

+    <ul>
    <?php if (GOOGLE_AUTH): ?>
-        <p>
+        <li>
            <a href="?controller=user&amp;action=google"><?= t('Login with my Google Account') ?></a>
-        </p>
+        </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>