diff options
| author | Frederic Guillot <fred@kanboard.net> | 2015-07-16 20:35:56 -0400 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2015-07-16 20:35:56 -0400 |
| commit | ede1f1d9b0c06a05845f4125d59c97c29b6d9842 (patch) | |
| tree | 2fc9f21c586501d43440dace17e71bfb40618bfc /app/Template | |
| parent | 12036aa21f4308aca4d816864b357f9627a0f437 (diff) | |
Refactoring of Github authentication (oauth url change)
Diffstat (limited to 'app/Template')
| -rw-r--r-- | app/Template/auth/index.php | 16 | ||||
| -rw-r--r-- | app/Template/user/external.php | 4 |
2 files changed, 12 insertions, 8 deletions
diff --git a/app/Template/auth/index.php b/app/Template/auth/index.php index ed923f07..9dcdfa37 100644 --- a/app/Template/auth/index.php +++ b/app/Template/auth/index.php @@ -16,12 +16,16 @@ <?= $this->form->checkbox('remember_me', t('Remember Me'), 1, true) ?><br/> - <?php if (GOOGLE_AUTH): ?> - <?= $this->url->link(t('Login with my Google Account'), 'oauth', 'google') ?> - <?php endif ?> - - <?php if (GITHUB_AUTH): ?> - <?= $this->url->link(t('Login with my GitHub Account'), 'user', 'gitHub') ?> + <?php if (GOOGLE_AUTH || GITHUB_AUTH): ?> + <ul> + <?php if (GOOGLE_AUTH): ?> + <li><?= $this->url->link(t('Login with my Google Account'), 'oauth', 'google') ?></li> + <?php endif ?> + + <?php if (GITHUB_AUTH): ?> + <li><?= $this->url->link(t('Login with my Github Account'), 'oauth', 'gitHub') ?></li> + <?php endif ?> + </ul> <?php endif ?> <div class="form-actions"> diff --git a/app/Template/user/external.php b/app/Template/user/external.php index 18d40d79..3b872e85 100644 --- a/app/Template/user/external.php +++ b/app/Template/user/external.php @@ -24,9 +24,9 @@ <p class="listing"> <?php if ($this->user->isCurrentUser($user['id'])): ?> <?php if (empty($user['github_id'])): ?> - <?= $this->url->link(t('Link my GitHub Account'), 'user', 'github', array(), true) ?> + <?= $this->url->link(t('Link my Github Account'), 'oauth', 'github', array(), true) ?> <?php else: ?> - <?= $this->url->link(t('Unlink my GitHub Account'), 'user', 'unlinkGitHub', array(), true) ?> + <?= $this->url->link(t('Unlink my Github Account'), 'oauth', 'unlink', array('backend' => 'github'), true) ?> <?php endif ?> <?php else: ?> <?= empty($user['github_id']) ? t('No account linked.') : t('Account linked.') ?> |