diff options
Diffstat (limited to 'app/Template')
| -rw-r--r-- | app/Template/board/index.php | 2 | ||||
| -rw-r--r-- | app/Template/board/public.php | 2 | ||||
| -rw-r--r-- | app/Template/board/show.php | 2 | ||||
| -rw-r--r-- | app/Template/board/swimlane.php | 2 | ||||
| -rw-r--r-- | app/Template/board/task_footer.php | 8 | ||||
| -rw-r--r-- | app/Template/board/task_private.php | 2 | ||||
| -rw-r--r-- | app/Template/board/task_public.php | 2 | ||||
| -rw-r--r-- | app/Template/project/sidebar.php | 2 |
8 files changed, 5 insertions, 17 deletions
diff --git a/app/Template/board/index.php b/app/Template/board/index.php index f87e0077..6f6fddbe 100644 --- a/app/Template/board/index.php +++ b/app/Template/board/index.php @@ -9,8 +9,6 @@ <?= $this->render('board/show', array( 'project' => $project, 'swimlanes' => $swimlanes, - 'categories_listing' => $categories_listing, - 'categories_description' => $categories_description, 'board_private_refresh_interval' => $board_private_refresh_interval, 'board_highlight_period' => $board_highlight_period, )) ?> diff --git a/app/Template/board/public.php b/app/Template/board/public.php index 9e5360ce..ad7515db 100644 --- a/app/Template/board/public.php +++ b/app/Template/board/public.php @@ -3,8 +3,6 @@ <?= $this->render('board/show', array( 'project' => $project, 'swimlanes' => $swimlanes, - 'categories_listing' => $categories_listing, - 'categories_description' => $categories_description, 'board_private_refresh_interval' => $board_private_refresh_interval, 'board_highlight_period' => $board_highlight_period, 'not_editable' => true, diff --git a/app/Template/board/show.php b/app/Template/board/show.php index 3b10d82c..c0aa5d36 100644 --- a/app/Template/board/show.php +++ b/app/Template/board/show.php @@ -21,8 +21,6 @@ 'project' => $project, 'swimlane' => $swimlane, 'board_highlight_period' => $board_highlight_period, - 'categories_listing' => $categories_listing, - 'categories_description' => $categories_description, 'hide_swimlane' => count($swimlanes) === 1, 'not_editable' => isset($not_editable), )) ?> diff --git a/app/Template/board/swimlane.php b/app/Template/board/swimlane.php index 201ee2fc..b86fc446 100644 --- a/app/Template/board/swimlane.php +++ b/app/Template/board/swimlane.php @@ -74,8 +74,6 @@ <?= $this->render($not_editable ? 'board/task_public' : 'board/task_private', array( 'project' => $project, 'task' => $task, - 'categories_listing' => $categories_listing, - 'categories_description' => $categories_description, 'board_highlight_period' => $board_highlight_period, 'not_editable' => $not_editable, )) ?> diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php index 55161921..7593c102 100644 --- a/app/Template/board/task_footer.php +++ b/app/Template/board/task_footer.php @@ -2,16 +2,16 @@ <div class="task-board-category-container"> <span class="task-board-category"> <?php if ($not_editable): ?> - <?= $this->text->in($task['category_id'], $categories_listing) ?> + <?= $this->e($task['category_name']) ?> <?php else: ?> <?= $this->url->link( - $this->text->in($task['category_id'], $categories_listing), + $this->e($task['category_name']), 'board', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, - 'task-board-popover' . (isset($categories_description[$task['category_id']]) ? ' column-tooltip' : ''), - isset($categories_description[$task['category_id']]) ? $this->text->markdown($categories_description[$task['category_id']]) : t('Change category') + 'task-board-popover' . (! empty($task['category_description']) ? ' column-tooltip' : ''), + ! empty($task['category_description']) ? $this->text->markdown($task['category_description']) : t('Change category') ) ?> <?php endif ?> </span> diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php index 77f3b958..44ce9d97 100644 --- a/app/Template/board/task_private.php +++ b/app/Template/board/task_private.php @@ -42,8 +42,6 @@ <?= $this->render('board/task_footer', array( 'task' => $task, - 'categories_listing' => $categories_listing, - 'categories_description' => $categories_description, 'not_editable' => $not_editable, )) ?> </div> diff --git a/app/Template/board/task_public.php b/app/Template/board/task_public.php index 9ac6e570..bacdcef4 100644 --- a/app/Template/board/task_public.php +++ b/app/Template/board/task_public.php @@ -24,8 +24,6 @@ <?= $this->render('board/task_footer', array( 'task' => $task, - 'categories_listing' => $categories_listing, - 'categories_description' => $categories_description, 'not_editable' => $not_editable, )) ?> </div>
\ No newline at end of file diff --git a/app/Template/project/sidebar.php b/app/Template/project/sidebar.php index a58c4604..3762f1ff 100644 --- a/app/Template/project/sidebar.php +++ b/app/Template/project/sidebar.php @@ -16,7 +16,7 @@ <?= $this->url->link(t('Edit project'), 'project', 'edit', array('project_id' => $project['id'])) ?> </li> <li> - <?= $this->url->link(t('Edit board'), 'column', 'index', array('project_id' => $project['id'])) ?> + <?= $this->url->link(t('Columns'), 'column', 'index', array('project_id' => $project['id'])) ?> </li> <li> <?= $this->url->link(t('Swimlanes'), 'swimlane', 'index', array('project_id' => $project['id'])) ?> |