1 files changed, 82 insertions, 22 deletions

diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php
index e33438d6..678b4bed 100644
--- a/app/Helper/TaskHelper.php
+++ b/app/Helper/TaskHelper.php
@@ -27,17 +27,74 @@ class TaskHelper extends Base
 
     public function recurrenceTriggers()
     {
-        return $this->taskModel->getRecurrenceTriggerList();
+        return $this->taskRecurrenceModel->getRecurrenceTriggerList();
     }
 
     public function recurrenceTimeframes()
     {
-        return $this->taskModel->getRecurrenceTimeframeList();
+        return $this->taskRecurrenceModel->getRecurrenceTimeframeList();
     }
 
     public function recurrenceBasedates()
     {
-        return $this->taskModel->getRecurrenceBasedateList();
+        return $this->taskRecurrenceModel->getRecurrenceBasedateList();
+    }
+
+    public function selectTitle(array $values, array $errors)
+    {
+        $html = $this->helper->form->label(t('Title'), 'title');
+        $html .= $this->helper->form->text('title', $values, $errors, array('autofocus', 'required', 'maxlength="200"', 'tabindex="1"'), 'form-input-large');
+        return $html;
+    }
+
+    public function selectDescription(array $values, array $errors)
+    {
+        $html = $this->helper->form->label(t('Description'), 'description');
+        $html .= '<div class="markdown-editor-container">';
+        $html .= $this->helper->form->textarea(
+            'description',
+            $values,
+            $errors,
+            array(
+                'placeholder="'.t('Leave a description').'"',
+                'tabindex="2"',
+                'data-mention-search-url="'.$this->helper->url->href('UserAjaxController', 'mention', array('project_id' => $values['project_id'])).'"'
+            ),
+            'markdown-editor'
+        );
+
+        $html .= '</div>';
+        return $html;
+    }
+
+    public function selectTags(array $project, array $tags = array())
+    {
+        $options = $this->tagModel->getAssignableList($project['id']);
+
+        $html = $this->helper->form->label(t('Tags'), 'tags[]');
+        $html .= '<input type="hidden" name="tags[]" value="">';
+        $html .= '<select name="tags[]" id="form-tags" class="tag-autocomplete" multiple>';
+
+        foreach ($options as $tag) {
+            $html .= sprintf(
+                '<option value="%s" %s>%s</option>',
+                $this->helper->text->e($tag),
+                in_array($tag, $tags) ? 'selected="selected"' : '',
+                $this->helper->text->e($tag)
+            );
+        }
+
+        $html .= '</select>';
+
+        return $html;
+    }
+
+    public function selectColor(array $values)
+    {
+        $colors = $this->colorModel->getList();
+        $html = $this->helper->form->label(t('Color'), 'color_id');
+        $html .= $this->helper->form->select('color_id', $colors, $values, array(), array(), 'color-picker');
+        return $html;
     }
 
     public function selectAssignee(array $users, array $values, array $errors = array(), array $attributes = array())
@@ -46,7 +103,10 @@ class TaskHelper extends Base
 
         $html = $this->helper->form->label(t('Assignee'), 'owner_id');
         $html .= $this->helper->form->select('owner_id', $users, $values, $errors, $attributes);
-        $html .= '&nbsp;<a href="#" class="assign-me" data-target-id="form-owner_id" data-current-id="'.$this->userSession->getId().'" title="'.t('Assign to me').'">'.t('Me').'</a>';
+        $html .= '&nbsp;';
+        $html .= '<small>';
+        $html .= '<a href="#" class="assign-me" data-target-id="form-owner_id" data-current-id="'.$this->userSession->getId().'" title="'.t('Assign to me').'">'.t('Me').'</a>';
+        $html .= '</small>';
 
         return $html;
     }
@@ -91,7 +151,7 @@ class TaskHelper extends Base
     {
         $html = '';
 
-        if ($project['priority_end'] > $project['priority_start']) {
+        if ($project['priority_end'] != $project['priority_start']) {
             $range = range($project['priority_start'], $project['priority_end']);
             $options = array_combine($range, $range);
             $values += array('priority' => $project['priority_default']);
@@ -113,10 +173,20 @@ class TaskHelper extends Base
         return $html;
     }
 
-    public function selectTimeEstimated(array $values, array $errors = array(), array $attributes = array())
+    public function selectReference(array $values, array $errors = array(), array $attributes = array())
     {
         $attributes = array_merge(array('tabindex="9"'), $attributes);
 
+        $html = $this->helper->form->label(t('Reference'), 'reference');
+        $html .= $this->helper->form->text('reference', $values, $errors, $attributes, 'form-input-small');
+
+        return $html;
+    }
+
+    public function selectTimeEstimated(array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="10"'), $attributes);
+
         $html = $this->helper->form->label(t('Original estimate'), 'time_estimated');
         $html .= $this->helper->form->numeric('time_estimated', $values, $errors, $attributes);
         $html .= ' '.t('hours');
@@ -126,7 +196,7 @@ class TaskHelper extends Base
 
     public function selectTimeSpent(array $values, array $errors = array(), array $attributes = array())
     {
-        $attributes = array_merge(array('tabindex="10"'), $attributes);
+        $attributes = array_merge(array('tabindex="11"'), $attributes);
 
         $html = $this->helper->form->label(t('Time spent'), 'time_spent');
         $html .= $this->helper->form->numeric('time_spent', $values, $errors, $attributes);
@@ -137,31 +207,21 @@ class TaskHelper extends Base
 
     public function selectStartDate(array $values, array $errors = array(), array $attributes = array())
     {
-        $placeholder = date($this->configModel->get('application_date_format', 'm/d/Y H:i'));
-        $attributes = array_merge(array('tabindex="11"', 'placeholder="'.$placeholder.'"'), $attributes);
-
-        $html = $this->helper->form->label(t('Start Date'), 'date_started');
-        $html .= $this->helper->form->text('date_started', $values, $errors, $attributes, 'form-datetime');
-
-        return $html;
+        $attributes = array_merge(array('tabindex="12"'), $attributes);
+        return $this->helper->form->datetime(t('Start Date'), 'date_started', $values, $errors, $attributes);
     }
 
     public function selectDueDate(array $values, array $errors = array(), array $attributes = array())
     {
-        $placeholder = date($this->configModel->get('application_date_format', 'm/d/Y'));
-        $attributes = array_merge(array('tabindex="12"', 'placeholder="'.$placeholder.'"'), $attributes);
-
-        $html = $this->helper->form->label(t('Due Date'), 'date_due');
-        $html .= $this->helper->form->text('date_due', $values, $errors, $attributes, 'form-date');
-
-        return $html;
+        $attributes = array_merge(array('tabindex="13"'), $attributes);
+        return $this->helper->form->date(t('Due Date'), 'date_due', $values, $errors, $attributes);
     }
 
     public function formatPriority(array $project, array $task)
     {
         $html = '';
 
-        if ($project['priority_end'] > $project['priority_start']) {
+        if ($project['priority_end'] != $project['priority_start']) {
             $html .= '<span class="task-board-priority" title="'.t('Task priority').'">';
             $html .= $task['priority'] >= 0 ? 'P'.$task['priority'] : '-P'.abs($task['priority']);
             $html .= '</span>';