AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve PR about task links table

This commit is contained in:
Frederic Guillot 2016-03-09 21:25:41 -05:00
parent 7b20a14e8d
commit d798202835
6 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Template/tasklink/edit.php
View File

@ -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>

2
app/Template/tasklink/remove.php
View File

@ -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>

13
app/Template/tasklink/table.php
View File

@ -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>

2
assets/css/app.css
View File

File diff suppressed because one or more lines are too long

2
assets/css/print.css
View File

File diff suppressed because one or more lines are too long

10
assets/css/src/tasklink.css
View File

@ -1,8 +1,12 @@
/* tasklinks */
.tasklinks-table {
.task-links-table {
font-size: 0.85em;
}
.tasklinks-table td {
.task-links-table td {
vertical-align: middle;
}
}
.task-links-task-count {
color: #999;
}