diff options
| author | Frederic Guillot <fred@kanboard.net> | 2015-07-04 12:39:43 -0400 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2015-07-04 12:39:43 -0400 |
| commit | 37c1b79bddfb7a43aacbcad6f790562786645a03 (patch) | |
| tree | 0289610eb14539538f73663816a3ae006fd800b9 /app/Template | |
| parent | 554500aa493faa66b43b2ddce72338880a874724 (diff) | |
Do not allow closed tasks to move on the board
Diffstat (limited to 'app/Template')
| -rw-r--r-- | app/Template/board/task_private.php | 9 | ||||
| -rw-r--r-- | app/Template/layout.php | 2 | ||||
| -rw-r--r-- | app/Template/task/edit_description.php | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php index 44ce9d97..3cd471d7 100644 --- a/app/Template/board/task_private.php +++ b/app/Template/board/task_private.php @@ -1,4 +1,7 @@ -<div class="task-board draggable-item color-<?= $task['color_id'] ?> <?= $task['date_modification'] > time() - $board_highlight_period ? 'task-board-recent' : '' ?>" +<div class=" + task-board + <?= $task['is_active'] == 1 ? 'draggable-item task-board-status-open '.($task['date_modification'] > (time() - $board_highlight_period) ? 'task-board-recent' : '') : 'task-board-status-closed' ?> + color-<?= $task['color_id'] ?>" data-task-id="<?= $task['id'] ?>" data-owner-id="<?= $task['owner_id'] ?>" data-category-id="<?= $task['category_id'] ?>" @@ -31,10 +34,14 @@ ) ?> </span> + <?php if ($task['is_active'] == 1): ?> <div class="task-board-days"> <span title="<?= t('Task age in days')?>" class="task-days-age"><?= $this->datetime->age($task['date_creation']) ?></span> <span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= $this->datetime->age($task['date_moved']) ?></span> </div> + <?php else: ?> + <div class="task-board-closed"><i class="fa fa-ban fa-fw"></i><?= t('Closed') ?></div> + <?php endif ?> <div class="task-board-title"> <?= $this->url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> diff --git a/app/Template/layout.php b/app/Template/layout.php index c630132d..a6d00470 100644 --- a/app/Template/layout.php +++ b/app/Template/layout.php @@ -15,9 +15,9 @@ <?= $this->asset->js('assets/js/app.js', true) ?> <?php endif ?> + <?= $this->asset->colorCss() ?> <?= $this->asset->css('assets/css/app.css') ?> <?= $this->asset->css('assets/css/print.css', true, 'print') ?> - <?= $this->asset->colorCss() ?> <?= $this->asset->customCss() ?> <link rel="icon" type="image/png" href="assets/img/favicon.png"> diff --git a/app/Template/task/edit_description.php b/app/Template/task/edit_description.php index 84f0cebd..99a547e1 100644 --- a/app/Template/task/edit_description.php +++ b/app/Template/task/edit_description.php @@ -17,7 +17,7 @@ </li> </ul> <div class="write-area"> - <?= $this->form->textarea('description', $values, $errors, array('autofocus', 'placeholder="'.t('Leave a description').'"'), 'description-textarea') ?> + <?= $this->form->textarea('description', $values, $errors, array('autofocus', 'placeholder="'.t('Leave a description').'"'), 'task-show-description-textarea') ?> </div> <div class="preview-area"> <div class="markdown"></div> |