diff options
| author | Lesstat <florianbarth@gmx.de> | 2015-07-11 11:44:26 +0200 |
|---|---|---|
| committer | Lesstat <florianbarth@gmx.de> | 2015-07-11 11:44:26 +0200 |
| commit | a85a1c613239c20fe72eb96c2921f4c220ec156b (patch) | |
| tree | d032b4591e518cbbbfaa8886f8f5d98a6ea2efb7 /app/Template/project | |
| parent | 5101eaa8060ce3c75a81a26f6e47aae40e3d4ac3 (diff) | |
| parent | 7e94d0ca233d15d6124c0adf3f956a119c82ccae (diff) | |
Merged branch 'master' of https://github.com/fguillot/kanboard
only imports conflicted
Diffstat (limited to 'app/Template/project')
| -rw-r--r-- | app/Template/project/filters.php | 13 | ||||
| -rw-r--r-- | app/Template/project/integrations.php | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/app/Template/project/filters.php b/app/Template/project/filters.php index 396baadf..3beb2f44 100644 --- a/app/Template/project/filters.php +++ b/app/Template/project/filters.php @@ -5,12 +5,13 @@ <ul> <?php if (isset($is_board)): ?> <li> - <span class="filter-collapse"> - <i class="fa fa-compress fa-fw"></i> <a href="#" class="filter-collapse-link" title="<?= t('Keyboard shortcut: "%s"', 's') ?>"><?= t('Collapse tasks') ?></a> - </span> - <span class="filter-expand" style="display: none"> - <i class="fa fa-expand fa-fw"></i> <a href="#" class="filter-expand-link" title="<?= t('Keyboard shortcut: "%s"', 's') ?>"><?= t('Expand tasks') ?></a> - </span> + <?php if ($this->board->isCollapsed($project['id'])): ?> + <i class="fa fa-expand fa-fw"></i> + <?= $this->url->link(t('Expand tasks'), 'board', 'expand', array('project_id' => $project['id']), false, 'board-display-mode', t('Keyboard shortcut: "%s"', 's')) ?> + <?php else: ?> + <i class="fa fa-compress fa-fw"></i> + <?= $this->url->link(t('Collapse tasks'), 'board', 'collapse', array('project_id' => $project['id']), false, 'board-display-mode', t('Keyboard shortcut: "%s"', 's')) ?> + <?php endif ?> </li> <li> <span class="filter-compact"> diff --git a/app/Template/project/integrations.php b/app/Template/project/integrations.php index 698e438c..445e7bfb 100644 --- a/app/Template/project/integrations.php +++ b/app/Template/project/integrations.php @@ -85,6 +85,8 @@ <?= $this->form->label(t('Webhook URL'), 'slack_webhook_url') ?> <?= $this->form->text('slack_webhook_url', $values, $errors) ?> + <?= $this->form->label(t('Channel/Group/User (Optional)'), 'slack_webhook_channel') ?> + <?= $this->form->text('slack_webhook_channel', $values, $errors) ?> <p class="form-help"><a href="http://kanboard.net/documentation/slack" target="_blank"><?= t('Help on Slack integration') ?></a></p> |