Add subtasks restrictions and time tracking

app/Template/subtask/edit.php

@@ -12,9 +12,6 @@
     <?= $this->formLabel(t('Title'), 'title') ?>
     <?= $this->formText('title', $values, $errors, array('required', 'autofocus', 'maxlength="50"')) ?><br/>
 
-    <?= $this->formLabel(t('Status'), 'status') ?>
-    <?= $this->formSelect('status', $status_list, $values, $errors) ?><br/>
-
     <?= $this->formLabel(t('Assignee'), 'user_id') ?>
     <?= $this->formSelect('user_id', $users_list, $values, $errors) ?><br/>
 

app/Template/subtask/restriction_change_status.php

@@ -0,0 +1,19 @@
+<div class="page-header">
+    <h2><?= t('You already have one subtask in progress') ?></h2>
+</div>
+
+    <form action="<?= $this->u('subtask', 'changeRestrictionStatus', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>" method="post">
+
+    <?= $this->formCsrf() ?>
+    <?= $this->formHidden('redirect', array('redirect' => $redirect)) ?>
+
+    <p><?= t('Select the new status of the subtask: "%s"', $subtask_inprogress['title']) ?></p>
+    <?= $this->formRadios('status', $status_list) ?>
+    <?= $this->formHidden('id', $subtask_inprogress) ?>
+
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-red"/>
+        <?= t('or') ?>
+        <a href="#" class="close-popover"><?= t('cancel') ?></a>
+    </div>
+</form>

app/Template/subtask/show.php

@@ -20,15 +20,14 @@
             <td><?= $this->e($subtask['title']) ?></td>
             <td>
                 <?php if (! isset($not_editable)): ?>
-                    <?= $this->a(trim($this->render('subtask/icons', array('subtask' => $subtask))) . $this->e($subtask['status_name']),
-                                 'subtask', 'toggleStatus', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>
+                    <?= $this->toggleSubtaskStatus($subtask, 'task') ?>
                 <?php else: ?>
                     <?= $this->render('subtask/icons', array('subtask' => $subtask)) . $this->e($subtask['status_name']) ?>
                 <?php endif ?>
             </td>
             <td>
                 <?php if (! empty($subtask['username'])): ?>
-                    <?= $this->e($subtask['name'] ?: $subtask['username']) ?>
+                    <?= $this->a($this->e($subtask['name'] ?: $subtask['username']), 'user', 'show', array('user_id' => $subtask['user_id'])) ?>
                 <?php endif ?>
             </td>
             <td>