summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois Ferrand <thetypz@gmail.com>2014-12-04 18:32:22 +0100
committerFrancois Ferrand <thetypz@gmail.com>2014-12-04 18:37:31 +0100
commit8005d4f070944abe179707f9e7c4701abe2733a1 (patch)
treef8195cf079d99c95e3b9ee8027dc4ee74c28fe08
parent0ccf6c8bc20656921f31582a0b5b329264dd6813 (diff)
Allow click on subtask status icon to toggle
-rw-r--r--app/Template/board/subtasks.php6
-rw-r--r--app/Template/subtask/show.php7
2 files changed, 5 insertions, 8 deletions
diff --git a/app/Template/board/subtasks.php b/app/Template/board/subtasks.php
index c7f995d7..53330022 100644
--- a/app/Template/board/subtasks.php
+++ b/app/Template/board/subtasks.php
@@ -1,9 +1,7 @@
<section id="tooltip-subtasks">
<?php foreach ($subtasks as $subtask): ?>
- <?= Helper\template('subtask/icons', array('subtask' => $subtask)) ?>
-
<?= Helper\a(
- Helper\escape($subtask['title']),
+ trim(Helper\template('subtask/icons', array('subtask' => $subtask))) . Helper\escape($subtask['title']),
'board',
'toggleSubtask',
array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'])
@@ -13,4 +11,4 @@
<br/>
<?php endforeach ?>
-</section> \ No newline at end of file
+</section>
diff --git a/app/Template/subtask/show.php b/app/Template/subtask/show.php
index 686b160e..4d341f26 100644
--- a/app/Template/subtask/show.php
+++ b/app/Template/subtask/show.php
@@ -19,12 +19,11 @@
<tr>
<td><?= Helper\escape($subtask['title']) ?></td>
<td>
- <?= Helper\template('subtask/icons', array('subtask' => $subtask)) ?>
-
<?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: ?>
- <?= Helper\escape($subtask['status_name']) ?>
+ <?= Helper\template('subtask/icons', array('subtask' => $subtask)) . Helper\escape($subtask['status_name']) ?>
<?php endif ?>
</td>
<td>