From e2181612b984489e479f52f748c3199c693d986c Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 5 Feb 2016 19:00:40 -0500
Subject: Remove time form on task summary page and move that to task edit form

---
 app/Template/task_modification/edit_task.php |  1 +
 app/Template/task_modification/edit_time.php | 20 --------------------
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 app/Template/task_modification/edit_time.php

(limited to 'app/Template/task_modification')

diff --git a/app/Template/task_modification/edit_task.php b/app/Template/task_modification/edit_task.php
index 7365648b..9e98ad5e 100644
--- a/app/Template/task_modification/edit_task.php
+++ b/app/Template/task_modification/edit_task.php
@@ -19,6 +19,7 @@
     <div class="form-column">
         <?= $this->task->selectTimeEstimated($values, $errors) ?>
         <?= $this->task->selectTimeSpent($values, $errors) ?>
+        <?= $this->task->selectStartDate($values, $errors) ?>
         <?= $this->task->selectDueDate($values, $errors) ?>
     </div>
 
diff --git a/app/Template/task_modification/edit_time.php b/app/Template/task_modification/edit_time.php
deleted file mode 100644
index 8e7f9b42..00000000
--- a/app/Template/task_modification/edit_time.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<form method="post" action="<?= $this->url->href('taskmodification', 'time', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" class="form-inline task-time-form" autocomplete="off">
-
-    <?php if (empty($values['date_started'])): ?>
-        <?= $this->url->link('<i class="fa fa-play"></i>', 'taskmodification', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-show-start-link', t('Set automatically the start date')) ?>
-    <?php endif ?>
-
-    <?= $this->form->csrf() ?>
-    <?= $this->form->hidden('id', $values) ?>
-
-    <?= $this->form->label(t('Start date'), 'date_started') ?>
-    <?= $this->form->text('date_started', $values, array(), array('placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-datetime') ?>
-
-    <?= $this->form->label(t('Time estimated'), 'time_estimated') ?>
-    <?= $this->form->numeric('time_estimated', $values, array(), array('placeholder="'.t('hours').'"')) ?>
-
-    <?= $this->form->label(t('Time spent'), 'time_spent') ?>
-    <?= $this->form->numeric('time_spent', $values, array(), array('placeholder="'.t('hours').'"')) ?>
-
-    <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-</form>
\ No newline at end of file
-- 
cgit v1.2.3