diff options
Diffstat (limited to 'app/Template')
| -rw-r--r-- | app/Template/auth/index.php | 10 | ||||
| -rw-r--r-- | app/Template/config/integrations.php | 6 | ||||
| -rw-r--r-- | app/Template/user/authentication.php | 3 | ||||
| -rw-r--r-- | app/Template/user/create_remote.php | 3 | ||||
| -rw-r--r-- | app/Template/user/external.php | 18 |
5 files changed, 36 insertions, 4 deletions
diff --git a/app/Template/auth/index.php b/app/Template/auth/index.php index 1ad1b9a4..2ffc53cb 100644 --- a/app/Template/auth/index.php +++ b/app/Template/auth/index.php @@ -15,7 +15,7 @@ <?= $this->form->label(t('Password'), 'password') ?> <?= $this->form->password('password', $values, $errors, array('required')) ?> - <?php if ($captcha): ?> + <?php if (isset($captcha) && $captcha): ?> <?= $this->form->label(t('Enter the text below'), 'captcha') ?> <img src="<?= $this->url->href('auth', 'captcha') ?>"/> <?= $this->form->text('captcha', $values, $errors, array('required')) ?> @@ -31,14 +31,18 @@ </form> <?php endif ?> - <?php if (GOOGLE_AUTH || GITHUB_AUTH): ?> + <?php if (GOOGLE_AUTH || GITHUB_AUTH || GITLAB_AUTH): ?> <ul class="no-bullet"> <?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> + <li><?= $this->url->link(t('Login with my Github Account'), 'oauth', 'github') ?></li> + <?php endif ?> + + <?php if (GITLAB_AUTH): ?> + <li><?= $this->url->link(t('Login with my Gitlab Account'), 'oauth', 'gitlab') ?></li> <?php endif ?> </ul> <?php endif ?> diff --git a/app/Template/config/integrations.php b/app/Template/config/integrations.php index 47b45149..ddbd73dd 100644 --- a/app/Template/config/integrations.php +++ b/app/Template/config/integrations.php @@ -18,6 +18,12 @@ <p class="form-help"><a href="http://kanboard.net/documentation/github-authentication" target="_blank"><?= t('Help on Github authentication') ?></a></p> </div> + <h3><img src="<?= $this->url->dir() ?>assets/img/gitlab-icon.png"/> <?= t('Gitlab Authentication') ?></h3> + <div class="listing"> + <input type="text" class="auto-select" readonly="readonly" value="<?= $this->url->href('oauth', 'gitlab', array(), false, '', true) ?>"/><br/> + <p class="form-help"><a href="http://kanboard.net/documentation/gitlab-authentication" target="_blank"><?= t('Help on Gitlab authentication') ?></a></p> + </div> + <h3><img src="<?= $this->url->dir() ?>assets/img/mailgun-icon.png"/> <?= t('Mailgun (incoming emails)') ?></h3> <div class="listing"> <input type="text" class="auto-select" readonly="readonly" value="<?= $this->url->href('webhook', 'mailgun', array('token' => $values['webhook_token']), false, '', true) ?>"/><br/> diff --git a/app/Template/user/authentication.php b/app/Template/user/authentication.php index a62c8f93..20c3d372 100644 --- a/app/Template/user/authentication.php +++ b/app/Template/user/authentication.php @@ -14,6 +14,9 @@ <?= $this->form->label(t('Github Id'), 'github_id') ?> <?= $this->form->text('github_id', $values, $errors) ?> + <?= $this->form->label(t('Gitlab Id'), 'gitlab_id') ?> + <?= $this->form->text('gitlab_id', $values, $errors) ?> + <?= $this->form->checkbox('is_ldap_user', t('Remote user'), 1, isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1) ?> <?= $this->form->checkbox('disable_login_form', t('Disallow login form'), 1, isset($values['disable_login_form']) && $values['disable_login_form'] == 1) ?> diff --git a/app/Template/user/create_remote.php b/app/Template/user/create_remote.php index 6b3678d3..1d04bc87 100644 --- a/app/Template/user/create_remote.php +++ b/app/Template/user/create_remote.php @@ -25,6 +25,9 @@ <?= $this->form->label(t('Github Id'), 'github_id') ?> <?= $this->form->password('github_id', $values, $errors) ?><br/> + + <?= $this->form->label(t('Gitlab Id'), 'gitlab_id') ?> + <?= $this->form->password('gitlab_id', $values, $errors) ?><br/> </div> <div class="form-column"> diff --git a/app/Template/user/external.php b/app/Template/user/external.php index 3b872e85..9ef0b4d1 100644 --- a/app/Template/user/external.php +++ b/app/Template/user/external.php @@ -34,6 +34,22 @@ </p> <?php endif ?> -<?php if (! GOOGLE_AUTH && ! GITHUB_AUTH): ?> +<?php if (GITHUB_AUTH): ?> + <h3><img src="<?= $this->url->dir() ?>assets/img/gitlab-icon.png"/> <?= t('Gitlab Account') ?></h3> + + <p class="listing"> + <?php if ($this->user->isCurrentUser($user['id'])): ?> + <?php if (empty($user['gitlab_id'])): ?> + <?= $this->url->link(t('Link my Gitlab Account'), 'oauth', 'gitlab', array(), true) ?> + <?php else: ?> + <?= $this->url->link(t('Unlink my Gitlab Account'), 'oauth', 'unlink', array('backend' => 'gitlab'), true) ?> + <?php endif ?> + <?php else: ?> + <?= empty($user['gitlab_id']) ? t('No account linked.') : t('Account linked.') ?> + <?php endif ?> + </p> +<?php endif ?> + +<?php if (! GOOGLE_AUTH && ! GITHUB_AUTH && ! GITLAB_AUTH): ?> <p class="alert"><?= t('No external authentication enabled.') ?></p> <?php endif ?> |