diff options
Diffstat (limited to 'app/Template/board')
| -rw-r--r-- | app/Template/board/edit.php | 2 | ||||
| -rw-r--r-- | app/Template/board/index.php | 18 | ||||
| -rw-r--r-- | app/Template/board/public.php | 43 | ||||
| -rw-r--r-- | app/Template/board/show.php | 73 | ||||
| -rw-r--r-- | app/Template/board/swimlane.php | 59 | ||||
| -rw-r--r-- | app/Template/board/task.php | 16 |
6 files changed, 115 insertions, 96 deletions
diff --git a/app/Template/board/edit.php b/app/Template/board/edit.php index d7086504..a44abcc8 100644 --- a/app/Template/board/edit.php +++ b/app/Template/board/edit.php @@ -16,7 +16,7 @@ </tr> <?php foreach ($columns as $column): ?> <tr> - <td><?= Helper\form_label(++$i, 'title['.$column['id'].']', array('title="column_id='.$column['id'].'"')) ?></td> + <td><?= Helper\form_label('#'.++$i, 'title['.$column['id'].']', array('title="column_id='.$column['id'].'"')) ?></td> <td><?= Helper\form_text('title['.$column['id'].']', $values, $errors, array('required')) ?></td> <td><?= Helper\form_number('task_limit['.$column['id'].']', $values, $errors, array('placeholder="'.t('limit').'"')) ?></td> <td> diff --git a/app/Template/board/index.php b/app/Template/board/index.php index 21040373..53c662a0 100644 --- a/app/Template/board/index.php +++ b/app/Template/board/index.php @@ -6,16 +6,12 @@ 'project' => $project, )) ?> - <?php if (empty($board)): ?> - <p class="alert alert-error"><?= t('There is no column in your project!') ?></p> - <?php else: ?> - <?= Helper\template('board/show', array( - 'project' => $project, - 'board' => $board, - 'categories' => $categories, - 'board_private_refresh_interval' => $board_private_refresh_interval, - 'board_highlight_period' => $board_highlight_period, - )) ?> - <?php endif ?> + <?= Helper\template('board/show', array( + 'project' => $project, + 'swimlanes' => $swimlanes, + 'categories' => $categories, + 'board_private_refresh_interval' => $board_private_refresh_interval, + 'board_highlight_period' => $board_highlight_period, + )) ?> </section> diff --git a/app/Template/board/public.php b/app/Template/board/public.php index 090d617b..0544f392 100644 --- a/app/Template/board/public.php +++ b/app/Template/board/public.php @@ -1,39 +1,12 @@ <section id="main" class="public-board"> - <?php if (empty($columns)): ?> - <p class="alert alert-error"><?= t('There is no column in your project!') ?></p> - <?php else: ?> - <table id="board"> - <tr> - <?php $column_with = round(100 / count($columns), 2); ?> - <?php foreach ($columns as $column): ?> - <th width="<?= $column_with ?>%"> - <?= Helper\escape($column['title']) ?> - <?php if ($column['task_limit']): ?> - <span title="<?= t('Task limit') ?>" class="task-limit">(<?= Helper\escape(count($column['tasks']).'/'.$column['task_limit']) ?>)</span> - <?php endif ?> - </th> - <?php endforeach ?> - </tr> - <tr> - <?php foreach ($columns as $column): ?> - <td class="column <?= $column['task_limit'] && count($column['tasks']) > $column['task_limit'] ? 'task-limit-warning' : '' ?>"> - <?php foreach ($column['tasks'] as $task): ?> - <div class="task-board task-<?= $task['color_id'] ?>"> - - <?= Helper\template('board/task', array( - 'task' => $task, - 'categories' => $categories, - 'not_editable' => true, - 'project' => $project - )) ?> - - </div> - <?php endforeach ?> - </td> - <?php endforeach ?> - </tr> - </table> - <?php endif ?> + <?= Helper\template('board/show', array( + 'project' => $project, + 'swimlanes' => $swimlanes, + 'categories' => $categories, + 'board_private_refresh_interval' => $board_private_refresh_interval, + 'board_highlight_period' => $board_highlight_period, + 'not_editable' => true, + )) ?> </section>
\ No newline at end of file diff --git a/app/Template/board/show.php b/app/Template/board/show.php index 142969c9..7df19bc1 100644 --- a/app/Template/board/show.php +++ b/app/Template/board/show.php @@ -1,51 +1,28 @@ -<table id="board" - data-project-id="<?= $project['id'] ?>" - data-check-interval="<?= $board_private_refresh_interval ?>" - data-save-url="<?= Helper\u('board', 'save', array('project_id' => $project['id'])) ?>" - data-check-url="<?= Helper\u('board', 'check', array('project_id' => $project['id'], 'timestamp' => time())) ?>" -> -<tr> - <?php $column_with = round(100 / count($board), 2); ?> - <?php foreach ($board as $column): ?> - <th width="<?= $column_with ?>%"> - <div class="board-add-icon"> - <?= Helper\a('+', 'task', 'create', array('project_id' => $column['project_id'], 'column_id' => $column['id']), false, 'task-creation-popover', t('Add a new task')) ?> - </div> - <?= Helper\escape($column['title']) ?> - <?php if ($column['task_limit']): ?> - <span title="<?= t('Task limit') ?>" class="task-limit"> - (<span id="task-number-column-<?= $column['id'] ?>"><?= count($column['tasks']) ?></span>/<?= Helper\escape($column['task_limit']) ?>) - </span> - <?php else: ?> - <span title="<?= t('Task count') ?>" class="task-count"> - (<span id="task-number-column-<?= $column['id'] ?>"><?= count($column['tasks']) ?></span>) - </span> - <?php endif ?> - </th> - <?php endforeach ?> -</tr> -<tr> - <?php foreach ($board as $column): ?> - <td - id="column-<?= $column['id'] ?>" - class="column <?= $column['task_limit'] && count($column['tasks']) > $column['task_limit'] ? 'task-limit-warning' : '' ?>" - data-column-id="<?= $column['id'] ?>" - data-task-limit="<?= $column['task_limit'] ?>" - > - <?php foreach ($column['tasks'] as $task): ?> - <div class="task-board draggable-item task-<?= $task['color_id'] ?> <?= $task['date_modification'] > time() - $board_highlight_period ? 'task-board-recent' : '' ?>" - data-task-id="<?= $task['id'] ?>" - data-owner-id="<?= $task['owner_id'] ?>" - data-category-id="<?= $task['category_id'] ?>" - data-due-date="<?= $task['date_due'] ?>" - data-task-url="<?= Helper\u('task', 'show', array('task_id' => $task['id'])) ?>" - title="<?= t('View this task') ?>"> - <?= Helper\template('board/task', array('task' => $task, 'categories' => $categories)) ?> +<?php if (isset($not_editable)): ?> + <table id="board"> +<?php else: ?> + <table id="board" + data-project-id="<?= $project['id'] ?>" + data-check-interval="<?= $board_private_refresh_interval ?>" + data-save-url="<?= Helper\u('board', 'save', array('project_id' => $project['id'])) ?>" + data-check-url="<?= Helper\u('board', 'check', array('project_id' => $project['id'], 'timestamp' => time())) ?>" + > +<?php endif ?> - </div> - <?php endforeach ?> - </td> - <?php endforeach ?> -</tr> +<?php foreach ($swimlanes as $swimlane): ?> + <?php if (empty($swimlane['columns'])): ?> + <p class="alert alert-error"><?= t('There is no column in your project!') ?></p> + <?php break ?> + <?php else: ?> + <?= Helper\template('board/swimlane', array( + 'project' => $project, + 'swimlane' => $swimlane, + 'board_highlight_period' => $board_highlight_period, + 'categories' => $categories, + 'hide_swimlane' => count($swimlanes) === 1, + 'not_editable' => isset($not_editable), + )) ?> + <?php endif ?> +<?php endforeach ?> </table> diff --git a/app/Template/board/swimlane.php b/app/Template/board/swimlane.php new file mode 100644 index 00000000..e48eb6f1 --- /dev/null +++ b/app/Template/board/swimlane.php @@ -0,0 +1,59 @@ +<tr> + <?php if (! $hide_swimlane): ?> + <td width="10%"></td> + <?php endif ?> + + <?php foreach ($swimlane['columns'] as $column): ?> + <th> + <?php if (! $not_editable): ?> + <div class="board-add-icon"> + <?= Helper\a('+', 'task', 'create', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'task-creation-popover', t('Add a new task')) ?> + </div> + <?php endif ?> + + <?= Helper\escape($column['title']) ?> + + <?php if ($column['task_limit']): ?> + <span title="<?= t('Task limit') ?>" class="task-limit"> + (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>/<?= Helper\escape($column['task_limit']) ?>) + </span> + <?php else: ?> + <span title="<?= t('Task count') ?>" class="task-count"> + (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>) + </span> + <?php endif ?> + </th> + <?php endforeach ?> +</tr> +<tr> + <?php if (! $hide_swimlane): ?> + <th class="board-swimlane-title"> + <?= Helper\escape($swimlane['name']) ?> + </th> + <?php endif ?> + + <?php foreach ($swimlane['columns'] as $column): ?> + + <?php if ($not_editable): ?> + <td> + <?php else: ?> + <td + id="column-<?= $column['id'] ?>" + class="column <?= $column['task_limit'] && count($column['tasks']) > $column['task_limit'] ? 'task-limit-warning' : '' ?>" + data-column-id="<?= $column['id'] ?>" + data-swimlane-id="<?= $swimlane['id'] ?>" + data-task-limit="<?= $column['task_limit'] ?>"> + <?php endif ?> + + <?php foreach ($column['tasks'] as $task): ?> + <?= Helper\template('board/task', array( + 'project' => $project, + 'task' => $task, + 'categories' => $categories, + 'board_highlight_period' => $board_highlight_period, + 'not_editable' => $not_editable, + )) ?> + <?php endforeach ?> + </td> + <?php endforeach ?> +</tr>
\ No newline at end of file diff --git a/app/Template/board/task.php b/app/Template/board/task.php index 64448acc..d077c773 100644 --- a/app/Template/board/task.php +++ b/app/Template/board/task.php @@ -1,4 +1,8 @@ -<?php if (isset($not_editable)): ?> + + +<?php if ($not_editable): ?> + +<div class="task-board task-<?= $task['color_id'] ?> <?= $task['date_modification'] > time() - $board_highlight_period ? 'task-board-recent' : '' ?>"> <?= Helper\a('#'.$task['id'], 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> @@ -28,6 +32,14 @@ <?php else: ?> +<div class="task-board draggable-item task-<?= $task['color_id'] ?> <?= $task['date_modification'] > time() - $board_highlight_period ? 'task-board-recent' : '' ?>" + data-task-id="<?= $task['id'] ?>" + data-owner-id="<?= $task['owner_id'] ?>" + data-category-id="<?= $task['category_id'] ?>" + data-due-date="<?= $task['date_due'] ?>" + data-task-url="<?= Helper\u('task', 'show', array('task_id' => $task['id'])) ?>" + title="<?= t('View this task') ?>"> + <?= Helper\a('#'.$task['id'], 'task', 'edit', array('task_id' => $task['id']), false, 'task-edit-popover', t('Edit this task')) ?> <?php if ($task['reference']): ?> @@ -114,3 +126,5 @@ </div> </div> <?php endif ?> + +</div>
\ No newline at end of file |