diff --git a/module/project/config.php b/module/project/config.php index 1af2a0f2c9..27288cdde1 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -26,6 +26,7 @@ $config->project->editor->edit = array('id' => 'desc', 'tools' => 'simple $config->project->editor->putoff = array('id' => 'comment', 'tools' => 'simpleTools'); $config->project->editor->activate = array('id' => 'comment', 'tools' => 'simpleTools'); $config->project->editor->close = array('id' => 'comment', 'tools' => 'simpleTools'); +$config->project->editor->start = array('id' => 'comment', 'tools' => 'simpleTools'); $config->project->editor->suspend = array('id' => 'comment', 'tools' => 'simpleTools'); $config->project->search['module'] = 'task'; @@ -63,38 +64,38 @@ $config->project->search['fields']['closedDate'] = $lang->task->closedDate; $config->project->search['fields']['canceledDate'] = $lang->task->canceledDate; $config->project->search['fields']['lastEditedDate'] = $lang->task->lastEditedDate; -$config->project->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); -$config->project->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->statusList); -$config->project->search['params']['desc'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); -$config->project->search['params']['assignedTo'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->project->search['params']['pri'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->priList); +$config->project->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); +$config->project->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->statusList); +$config->project->search['params']['desc'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); +$config->project->search['params']['assignedTo'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->project->search['params']['pri'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->priList); -$config->project->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => ''); -$config->project->search['params']['module'] = array('operator' => 'belong', 'control' => 'select', 'values' => ''); -$config->project->search['params']['estimate'] = array('operator' => '=', 'control' => 'input', 'values' => ''); -$config->project->search['params']['left'] = array('operator' => '=', 'control' => 'input', 'values' => ''); -$config->project->search['params']['consumed'] = array('operator' => '=', 'control' => 'input', 'values' => ''); -$config->project->search['params']['type'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->typeList); -$config->project->search['params']['fromBug'] = array('operator' => '=', 'control' => 'input', 'values' => $lang->task->typeList); -$config->project->search['params']['closedReason'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->reasonList); +$config->project->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => ''); +$config->project->search['params']['module'] = array('operator' => 'belong', 'control' => 'select', 'values' => ''); +$config->project->search['params']['estimate'] = array('operator' => '=', 'control' => 'input', 'values' => ''); +$config->project->search['params']['left'] = array('operator' => '=', 'control' => 'input', 'values' => ''); +$config->project->search['params']['consumed'] = array('operator' => '=', 'control' => 'input', 'values' => ''); +$config->project->search['params']['type'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->typeList); +$config->project->search['params']['fromBug'] = array('operator' => '=', 'control' => 'input', 'values' => $lang->task->typeList); +$config->project->search['params']['closedReason'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->reasonList); -$config->project->search['params']['openedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->project->search['params']['finishedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->project->search['params']['closedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->project->search['params']['cancelBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->project->search['params']['lastEditedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->project->search['params']['openedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->project->search['params']['finishedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->project->search['params']['closedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->project->search['params']['cancelBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->project->search['params']['lastEditedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->project->search['params']['mailto'] = array('operator' => 'include', 'control' => 'select', 'values' => 'users'); +$config->project->search['params']['mailto'] = array('operator' => 'include', 'control' => 'select', 'values' => 'users'); -$config->project->search['params']['openedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['deadline'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['estStarted'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['realStarted'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['assignedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['finishedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['closedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['canceledDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['lastEditedDate']= array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['openedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['deadline'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['estStarted'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['realStarted'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['assignedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['finishedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['closedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['canceledDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['lastEditedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->printKanban = new stdClass(); $config->printKanban->col['story'] = 1; diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php index 59a7fd7b46..ba62c720ac 100644 --- a/module/project/view/activate.html.php +++ b/module/project/view/activate.html.php @@ -11,7 +11,6 @@ */ ?> -
@@ -25,11 +24,12 @@
- + - + +
comment;?>comment;?>
goback, $this->session->taskList); ?>goback, $this->session->taskList); ?>
diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php index 950aa14be8..ad9351e6a3 100644 --- a/module/project/view/close.html.php +++ b/module/project/view/close.html.php @@ -24,12 +24,11 @@ - - - + +
comment;?>
goback, $this->session->taskList); ?>goback, $this->session->taskList); ?>
diff --git a/module/project/view/start.html.php b/module/project/view/start.html.php index af8c20bf31..2cd4b88667 100644 --- a/module/project/view/start.html.php +++ b/module/project/view/start.html.php @@ -11,7 +11,7 @@ */ ?> - +
@@ -23,11 +23,12 @@
- + - + +
comment;?>comment;?>
project->start) . html::linkButton($lang->goback, $this->session->taskList); ?>project->start) . html::linkButton($lang->goback, $this->session->taskList); ?>
diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php index c56a17dfc5..70be041044 100644 --- a/module/project/view/suspend.html.php +++ b/module/project/view/suspend.html.php @@ -24,12 +24,11 @@ - - - + +
comment;?>
goback, $this->session->taskList); ?>goback, $this->session->taskList); ?>