diff options
| author | Frederic Guillot <fred@kanboard.net> | 2016-03-09 21:25:41 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2016-03-09 21:25:41 -0500 |
| commit | d79820283523823be71cb68fe2910db157d5d233 (patch) | |
| tree | 529705ca7ad520198e5a611cee422aa9439c881c /app | |
| parent | 7b20a14e8df545080fd5f1e98d31a763a51af517 (diff) | |
Improve PR about task links table
Diffstat (limited to 'app')
| -rw-r--r-- | app/Template/tasklink/edit.php | 2 | ||||
| -rw-r--r-- | app/Template/tasklink/remove.php | 2 | ||||
| -rw-r--r-- | app/Template/tasklink/table.php | 13 |
3 files changed, 9 insertions, 8 deletions
diff --git a/app/Template/tasklink/edit.php b/app/Template/tasklink/edit.php index 15afe047..b174c348 100644 --- a/app/Template/tasklink/edit.php +++ b/app/Template/tasklink/edit.php @@ -29,6 +29,6 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </form>
\ No newline at end of file diff --git a/app/Template/tasklink/remove.php b/app/Template/tasklink/remove.php index 262fb488..42bf3012 100644 --- a/app/Template/tasklink/remove.php +++ b/app/Template/tasklink/remove.php @@ -10,6 +10,6 @@ <div class="form-actions"> <?= $this->url->link(t('Yes'), 'tasklink', 'remove', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), true, 'btn btn-red') ?> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </div>
\ No newline at end of file diff --git a/app/Template/tasklink/table.php b/app/Template/tasklink/table.php index 3378f60f..62531cc7 100644 --- a/app/Template/tasklink/table.php +++ b/app/Template/tasklink/table.php @@ -1,7 +1,7 @@ <?php if (empty($links)): ?> <p class="alert"><?= t('There is no internal link for the moment.') ?></p> <?php else: ?> -<table class="tasklinks-table table-stripped"> +<table class="task-links-table table-stripped"> <?php foreach ($links as $label => $grouped_links): ?> <?php $hide_td = false ?> <?php foreach ($grouped_links as $link): ?> @@ -10,7 +10,7 @@ <td class="column-40" colspan="2"> <?= t('This task') ?> <strong><?= t($label) ?></strong> - <span class="board-column-header-task-count">(<?= count($grouped_links) ?>)</span> + <span class="task-links-task-count">(<?= count($grouped_links) ?>)</span> </td> <th><?= t('Assignee') ?></th> <th><?= t('Time tracking') ?></th> @@ -45,11 +45,12 @@ <?php if ($link['project_id'] != $project['id']): ?> <br> - <?= t('Project') ?> <?= $this->text->e($link['project_name']) ?> <?php endif ?> </td> - <td><?= $this->text->e($link['column_title']) ?></td> + <td> + <?= $this->text->e($link['column_title']) ?> + </td> <td> <?php if (! empty($link['task_assignee_username'])): ?> <?php if ($editable): ?> @@ -73,8 +74,8 @@ <div class="dropdown"> <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a> <ul> - <li><?= $this->url->link(t('Edit'), 'tasklink', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id'])) ?></li> - <li><?= $this->url->link(t('Remove'), 'tasklink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id'])) ?></li> + <li><?= $this->url->link(t('Edit'), 'tasklink', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> + <li><?= $this->url->link(t('Remove'), 'tasklink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> </ul> </div> </td> |