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

Merge pull-request #444, Allow click on subtask status icon to toggle

Browse Source
This commit is contained in:
Frédéric Guillot
2014-12-04 20:02:43 -05:00
parent 73e2282259 8005d4f070
commit 0f9ad1966a
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Template/board/subtasks.php
View File

@@ -1,9 +1,7 @@
<section id="tooltip-subtasks"> <section id="tooltip-subtasks">
<?php foreach ($subtasks as $subtask): ?> <?php foreach ($subtasks as $subtask): ?>
<?= Helper\template('subtask/icons', array('subtask' => $subtask)) ?>
<?= Helper\a( <?= Helper\a(
Helper\escape($subtask['title']), trim(Helper\template('subtask/icons', array('subtask' => $subtask))) . Helper\escape($subtask['title']),
'board', 'board',
'toggleSubtask', 'toggleSubtask',
array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']) array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'])
@@ -13,4 +11,4 @@
<br/> <br/>
<?php endforeach ?> <?php endforeach ?>
</section> </section>

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

@@ -19,12 +19,11 @@
<tr> <tr>
<td><?= Helper\escape($subtask['title']) ?></td> <td><?= Helper\escape($subtask['title']) ?></td>
<td> <td>
<?= Helper\template('subtask/icons', array('subtask' => $subtask)) ?>
<?php if (! isset($not_editable)): ?> <?php if (! isset($not_editable)): ?>
<?= Helper\a(Helper\escape($subtask['status_name']), 'subtask', 'toggleStatus', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?> <?= Helper\a(trim(Helper\template('subtask/icons', array('subtask' => $subtask))) . Helper\escape($subtask['status_name']),
'subtask', 'toggleStatus', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
<?php else: ?> <?php else: ?>
<?= Helper\escape($subtask['status_name']) ?> <?= Helper\template('subtask/icons', array('subtask' => $subtask)) . Helper\escape($subtask['status_name']) ?>
<?php endif ?> <?php endif ?>
</td> </td>
<td> <td>