diff options
| author | Frederic Guillot <fred@kanboard.net> | 2016-05-04 21:51:38 -0400 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2016-05-04 21:51:38 -0400 |
| commit | 6bdc25490f02649242b1d96025f8da1f4c41884b (patch) | |
| tree | ab30b54786c0c08f85facb6d0703f7837b4bc471 /app/Template/board | |
| parent | 60c8867feeeefcf160fb1432419887f17a0d957b (diff) | |
Unify task drop-down menu between different views
Diffstat (limited to 'app/Template/board')
| -rw-r--r-- | app/Template/board/task_menu.php | 18 | ||||
| -rw-r--r-- | app/Template/board/task_private.php | 4 |
2 files changed, 2 insertions, 20 deletions
diff --git a/app/Template/board/task_menu.php b/app/Template/board/task_menu.php deleted file mode 100644 index c0d97cda..00000000 --- a/app/Template/board/task_menu.php +++ /dev/null @@ -1,18 +0,0 @@ -<span class="dropdown"> - <a href="#" class="dropdown-menu"><?= '#'.$task['id'] ?> <i class="fa fa-caret-down"></i></a> - <ul> - <li><i class="fa fa-user fa-fw"></i> <?= $this->url->link(t('Change assignee'), 'BoardPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> - <li><i class="fa fa-tag fa-fw"></i> <?= $this->url->link(t('Change category'), 'BoardPopover', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> - <li><i class="fa fa-align-left fa-fw"></i> <?= $this->url->link(t('Change description'), 'taskmodification', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> - <li><i class="fa fa-pencil-square-o fa-fw"></i> <?= $this->url->link(t('Edit this task'), 'taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> - <li><i class="fa fa-comment-o fa-fw"></i> <?= $this->url->link(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> - <li><i class="fa fa-code-fork fa-fw"></i> <?= $this->url->link(t('Add internal link'), 'TaskInternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> - <li><i class="fa fa-external-link fa-fw"></i> <?= $this->url->link(t('Add external link'), 'TaskExternalLink', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> - <li><i class="fa fa-camera fa-fw"></i> <?= $this->url->link(t('Add a screenshot'), 'BoardPopover', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> - <?php if ($task['is_active'] == 1): ?> - <li><i class="fa fa-close fa-fw"></i> <?= $this->url->link(t('Close this task'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> - <?php else: ?> - <li><i class="fa fa-check-square-o fa-fw"></i> <?= $this->url->link(t('Open this task'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> - <?php endif ?> - </ul> -</span>
\ No newline at end of file diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php index 19bcbcfa..57623042 100644 --- a/app/Template/board/task_private.php +++ b/app/Template/board/task_private.php @@ -17,7 +17,7 @@ <div class="task-board-collapsed"> <div class="task-board-saving-icon" style="display: none;"><i class="fa fa-spinner fa-pulse"></i></div> <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?> - <?= $this->render('board/task_menu', array('task' => $task)) ?> + <?= $this->render('task/dropdown', array('task' => $task)) ?> <?php else: ?> <strong><?= '#'.$task['id'] ?></strong> <?php endif ?> @@ -33,7 +33,7 @@ <div class="task-board-expanded"> <div class="task-board-saving-icon" style="display: none;"><i class="fa fa-spinner fa-pulse fa-2x"></i></div> <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?> - <?= $this->render('board/task_menu', array('task' => $task)) ?> + <?= $this->render('task/dropdown', array('task' => $task)) ?> <?php else: ?> <strong><?= '#'.$task['id'] ?></strong> <?php endif ?> |