From 06d0b7048ebcdfdf6e24eec3ac7dc8fb0327dd6f Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Mon, 30 Jun 2014 21:52:02 -0300
Subject: Merge pull-request: Github authentication #162

---
 app/Templates/user_edit.php  | 13 +++++++++++++
 app/Templates/user_login.php | 12 ++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

(limited to 'app/Templates')

diff --git a/app/Templates/user_edit.php b/app/Templates/user_edit.php
index 6b83f748..8fba922f 100644
--- a/app/Templates/user_edit.php
+++ b/app/Templates/user_edit.php
@@ -48,14 +48,27 @@
                 <?= Helper\form_checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?><br/>
             <?php endif ?>
 
+            <ul>
             <?php if (GOOGLE_AUTH && Helper\is_current_user($values['id'])): ?>
+                <li>
                 <?php if (empty($values['google_id'])): ?>
                     <a href="?controller=user&amp;action=google<?= Helper\param_csrf() ?>"><?= t('Link my Google Account') ?></a>
                 <?php else: ?>
                     <a href="?controller=user&amp;action=unlinkGoogle<?= Helper\param_csrf() ?>"><?= t('Unlink my Google Account') ?></a>
                 <?php endif ?>
+                </li>
             <?php endif ?>
 
+            <?php if (GITHUB_AUTH && Helper\is_current_user($values['id'])): ?>
+                <li>
+                <?php if (empty($values['github_id'])): ?>
+                    <a href="?controller=user&amp;action=gitHub<?= Helper\param_csrf() ?>"><?= t('Link my GitHub Account') ?></a>
+                <?php else: ?>
+                    <a href="?controller=user&amp;action=unlinkGitHub<?= Helper\param_csrf() ?>"><?= t('Unlink my GitHub Account') ?></a>
+                <?php endif ?>
+                </li>
+            <?php endif ?>
+            </ul>
         </div>
 
         <div class="form-actions">
diff --git a/app/Templates/user_login.php b/app/Templates/user_login.php
index 49902ebb..948a19e7 100644
--- 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>
-- 
cgit v1.2.3