diff options
| author | Max Kamashev <kamashev@gollard.ru> | 2015-09-30 09:19:33 +0300 |
|---|---|---|
| committer | Max Kamashev <kamashev@gollard.ru> | 2015-09-30 09:19:33 +0300 |
| commit | cabcdc9d9e58d279ac6a5992ae5202568ed4d24e (patch) | |
| tree | eebdc4ec16eb7dc2ed0edd953321fa3e02869f34 /app/Template/project | |
| parent | 930406bf70e42413a83114b9530b3f63ccf9419f (diff) | |
| parent | 421e8751ebca5b566ecbd8d08e9d56b93ce81ffa (diff) | |
Merge branch 'master' of https://github.com/fguillot/kanboard into 1245_bug_with_subtask_timer
Diffstat (limited to 'app/Template/project')
| -rw-r--r-- | app/Template/project/filters.php | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/app/Template/project/filters.php b/app/Template/project/filters.php index fa50b36a..5b9ac472 100644 --- a/app/Template/project/filters.php +++ b/app/Template/project/filters.php @@ -21,6 +21,14 @@ <i class="fa fa-arrows-h fa-fw"></i> <a href="#" class="filter-toggle-scrolling" title="<?= t('Keyboard shortcut: "%s"', 'c') ?>"><?= t('Horizontal scrolling') ?></a> </span> </li> + <li> + <span class="filter-max-height" style="display: none"> + <i class="fa fa-arrows-v fa-fw"></i> <a href="#" class="filter-toggle-height"><?= t('Set maximum column height') ?></a> + </span> + <span class="filter-min-height"> + <i class="fa fa-arrows-v fa-fw"></i> <a href="#" class="filter-toggle-height"><?= t('Remove maximum column height') ?></a> + </span> + </li> <?php endif ?> <?= $this->render('project/dropdown', array('project' => $project)) ?> </ul> @@ -59,10 +67,9 @@ <div class="dropdown filters"> <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Users') ?></a> <ul> - <li><a href="#" class="filter-helper" data-filter="status:open"><?= t('All users') ?></a></li> - <li><a href="#" class="filter-helper" data-filter="status:open assignee:nobody"><?= t('Not assigned') ?></a></li> + <li><a href="#" class="filter-helper" data-append-filter="assignee:nobody"><?= t('Not assigned') ?></a></li> <?php foreach ($users_list as $user): ?> - <li><a href="#" class="filter-helper" data-filter='status:open assignee:"<?= $this->e($user) ?>"'><?= $this->e($user) ?></a></li> + <li><a href="#" class="filter-helper" data-append-filter='assignee:"<?= $this->e($user) ?>"'><?= $this->e($user) ?></a></li> <?php endforeach ?> </ul> </div> @@ -72,10 +79,9 @@ <div class="dropdown filters"> <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Categories') ?></a> <ul> - <li><a href="#" class="filter-helper" data-filter="status:open"><?= t('All categories') ?></a></li> - <li><a href="#" class="filter-helper" data-filter="status:open category:none"><?= t('No category') ?></a></li> + <li><a href="#" class="filter-helper" data-append-filter="category:none"><?= t('No category') ?></a></li> <?php foreach ($categories_list as $category): ?> - <li><a href="#" class="filter-helper" data-filter='status:open category:"<?= $this->e($category) ?>"'><?= $this->e($category) ?></a></li> + <li><a href="#" class="filter-helper" data-append-filter='category:"<?= $this->e($category) ?>"'><?= $this->e($category) ?></a></li> <?php endforeach ?> </ul> </div> |