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

Display subtask icon status and title everywhere

This commit is contained in:
Frederic Guillot 2015-02-09 21:49:53 -05:00
parent 755b38f09e
commit 1de845e6c3
5 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Core/Helper.php
View File

@ -634,7 +634,7 @@ class Helper
if ($subtask['status'] == 0 && isset($this->session['has_subtask_inprogress']) && $this->session['has_subtask_inprogress'] === true) {
return $this->a(
trim($this->render('subtask/icons', array('subtask' => $subtask))) . $this->e($subtask['status_name']),
trim($this->render('subtask/icons', array('subtask' => $subtask))) . $this->e($subtask['title']),
'subtask',
'subtaskRestriction',
array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'redirect' => $redirect),
@ -644,7 +644,7 @@ class Helper
}
return $this->a(
trim($this->render('subtask/icons', array('subtask' => $subtask))) . $this->e($subtask['status_name']),
trim($this->render('subtask/icons', array('subtask' => $subtask))) . $this->e($subtask['title']),
'subtask',
'toggleStatus',
array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'redirect' => $redirect)

4
app/Template/app/subtasks.php
View File

@ -6,7 +6,6 @@
<tr>
<th class="column-10"><?= $paginator->order('Id', 'tasks.id') ?></th>
<th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th>
<th class="column-15"><?= $paginator->order(t('Status'), 'status') ?></th>
<th><?= $paginator->order(t('Subtask'), 'title') ?></th>
<th class="column-20"><?= t('Time tracking') ?></th>
</tr>
@ -21,9 +20,6 @@
<td>
<?= $this->toggleSubtaskStatus($subtask, 'dashboard') ?>
</td>
<td>
<?= $this->a($this->e($subtask['title']), 'task', 'show', array('task_id' => $subtask['task_id'], 'project_id' => $subtask['project_id'])) ?>
</td>
<td>
<?php if (! empty($subtask['time_spent'])): ?>
<strong><?= $this->e($subtask['time_spent']).'h' ?></strong> <?= t('spent') ?>

2
app/Template/subtask/show.php
View File

@ -8,7 +8,6 @@
<table class="subtasks-table">
<tr>
<th class="column-40"><?= t('Title') ?></th>
<th class="column-15"><?= t('Status') ?></th>
<th><?= t('Assignee') ?></th>
<th><?= t('Time tracking') ?></th>
<?php if (! isset($not_editable)): ?>
@ -17,7 +16,6 @@
</tr>
<?php foreach ($subtasks as $subtask): ?>
<tr>
<td><?= $this->e($subtask['title']) ?></td>
<td>
<?php if (! isset($not_editable)): ?>
<?= $this->toggleSubtaskStatus($subtask, 'task') ?>

2
assets/css/app.css
View File

@ -1499,7 +1499,7 @@ a.task-board-nobody {
}
.task-board-footer {
height: 20px;
height: 25px;
}
.task-board-date {

2
assets/css/src/task.css
View File

@ -73,7 +73,7 @@ a.task-board-nobody {
}
.task-board-footer {
height: 20px;
height: 25px;
}
.task-board-date {