Added the possibility to convert a subtask to a task

3 files changed, 34 insertions, 5 deletions

diff --git a/app/Template/subtask/menu.php b/app/Template/subtask/menu.php
index 6c98b951..aa7b9a53 100644
--- a/app/Template/subtask/menu.php
+++ b/app/Template/subtask/menu.php
@@ -2,10 +2,16 @@
     <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>
+            <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
             <?= $this->url->link(t('Edit'), 'subtask', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), false, 'popover') ?>
         </li>
         <li>
+            <i class="fa fa-trash-o" aria-hidden="true"></i>
             <?= $this->url->link(t('Remove'), 'subtask', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), false, 'popover') ?>
         </li>
+        <li>
+            <i class="fa fa-clone" aria-hidden="true"></i>
+            <?= $this->url->link(t('Convert to task'), 'SubtaskConverterController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), false, 'popover') ?>
+        </li>
     </ul>
 </div>
diff --git a/app/Template/subtask/remove.php b/app/Template/subtask/remove.php
index 374256fd..7ea43555 100644
--- a/app/Template/subtask/remove.php
+++ b/app/Template/subtask/remove.php
@@ -3,15 +3,18 @@
 </div>
 
 <div class="confirm">
-    <p class="alert alert-info">
+    <div class="alert alert-info">
         <?= t('Do you really want to remove this sub-task?') ?>
-    </p>
-
-    <p><strong><?= $this->text->e($subtask['title']) ?></strong></p>
+        <ul>
+            <li>
+                <strong><?= $this->text->e($subtask['title']) ?></strong>
+            </li>
+        </ul>
+    </div>
 
     <div class="form-actions">
         <?= $this->url->link(t('Yes'), 'subtask', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
         <?= $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
+</div>
diff --git a/app/Template/subtask_converter/show.php b/app/Template/subtask_converter/show.php
new file mode 100644
index 00000000..af8af49e
--- /dev/null
+++ b/app/Template/subtask_converter/show.php
@@ -0,0 +1,20 @@
+<div class="page-header">
+    <h2><?= t('Convert sub-task to task') ?></h2>
+</div>
+
+<div class="confirm">
+    <div class="alert alert-info">
+        <?= t('Do you really want to convert this sub-task to a task?') ?>
+        <ul>
+            <li>
+                <strong><?= $this->text->e($subtask['title']) ?></strong>
+            </li>
+        </ul>
+    </div>
+
+    <div class="form-actions">
+        <?= $this->url->link(t('Yes'), 'SubtaskConverterController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?>
+        <?= t('or') ?>
+        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+    </div>
+</div>