diff options
| author | Frederic Guillot <fred@kanboard.net> | 2015-09-05 12:03:20 -0400 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2015-09-05 12:03:20 -0400 |
| commit | 512840fe1dca3ddc686360107ae1369e82696502 (patch) | |
| tree | 5e983be9f84be97e50d72bbc0a946d52f251e2f8 /app/Template | |
| parent | bac18d80f8ff8fce9d167671273e80a492f4c3c5 (diff) | |
Improve pull-request about swimlane description
Diffstat (limited to 'app/Template')
| -rw-r--r-- | app/Template/board/table_swimlane.php | 26 | ||||
| -rw-r--r-- | app/Template/swimlane/index.php | 2 |
2 files changed, 15 insertions, 13 deletions
diff --git a/app/Template/board/table_swimlane.php b/app/Template/board/table_swimlane.php index ab4735b1..1caa920d 100644 --- a/app/Template/board/table_swimlane.php +++ b/app/Template/board/table_swimlane.php @@ -7,6 +7,20 @@ <i class="fa fa-minus-circle hide-icon-swimlane-<?= $swimlane['id'] ?>"></i> <i class="fa fa-plus-circle show-icon-swimlane-<?= $swimlane['id'] ?>" style="display: none"></i> </a> + + <?php if (! empty($swimlane['description'])): ?> + <span + title="<?= t('Description') ?>" + class="tooltip" + data-href="<?= $this->url->href('board', 'swimlane', array('swimlane_id' => $swimlane['id'], 'project_id' => $project['id'])) ?>"> + <i class="fa fa-info-circle"></i> + </span> + <?php endif ?> + + <span title="<?= t('Task count') ?>" class="board-column-header-task-count swimlane-task-count-<?= $swimlane['id'] ?>"> + (<?= $swimlane['nb_tasks'] ?>) + </span> + <span class="board-swimlane-toggle-title show-icon-swimlane-<?= $swimlane['id'] ?>"><?= $this->e($swimlane['name']) ?></span> <?php endif ?> </th> @@ -62,18 +76,6 @@ <?php if (! $hide_swimlane): ?> <th class="board-swimlane-title"> <?= $this->e($swimlane['name']) ?> - - <div title="<?= t('Task count') ?>" class="board-column-header-task-count"> - (<span><?= $swimlane['nb_tasks'] ?></span>) - - <?php if (! empty($swimlane['description'])): ?> - <span title="<?= t('Description') ?>" class="tooltip" - data-href="<?= $this->url->href('swimlane', 'description', array('swimlane_id' => $swimlane['id'], 'project_id' => $swimlane['project_id'])) ?>"> - <i class="fa fa-file-text-o"></i> - </span> - <?php endif ?> - - </div> </th> <?php endif ?> diff --git a/app/Template/swimlane/index.php b/app/Template/swimlane/index.php index 1bf31afa..797d2ca2 100644 --- a/app/Template/swimlane/index.php +++ b/app/Template/swimlane/index.php @@ -14,7 +14,7 @@ <?= $this->form->hidden('project_id', $values) ?> <?= $this->form->label(t('Name'), 'name') ?> - <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?> + <?= $this->form->text('name', $values, $errors, array('required', 'maxlength="50"')) ?> <?= $this->form->label(t('Description'), 'description') ?> |