Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	app/Locale/de_DE/translations.php

3 files changed, 353 insertions, 18 deletions

diff --git a/app/Helper/Layout.php b/app/Helper/Layout.php
new file mode 100644
index 00000000..3db23920
--- /dev/null
+++ b/app/Helper/Layout.php
@@ -0,0 +1,171 @@
+<?php
+
+namespace Kanboard\Helper;
+
+use Kanboard\Core\Base;
+
+/**
+ * Layout helpers
+ *
+ * @package helper
+ * @author  Frederic Guillot
+ */
+class Layout extends Base
+{
+    /**
+     * Render a template without the layout if Ajax request
+     *
+     * @access public
+     * @param  string $template Template name
+     * @param  array  $params   Template parameters
+     * @return string
+     */
+    public function app($template, array $params = array())
+    {
+        if ($this->request->isAjax()) {
+            return $this->template->render($template, $params);
+        }
+
+        if (! isset($params['no_layout']) && ! isset($params['board_selector'])) {
+            $params['board_selector'] = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId());
+        }
+
+        return $this->template->layout($template, $params);
+    }
+
+    /**
+     * Common layout for user views
+     *
+     * @access public
+     * @param  string $template Template name
+     * @param  array  $params   Template parameters
+     * @return string
+     */
+    public function user($template, array $params)
+    {
+        if (isset($params['user'])) {
+            $params['title'] = '#'.$params['user']['id'].' '.($params['user']['name'] ?: $params['user']['username']);
+        }
+
+        return $this->subLayout('user/layout', 'user/sidebar', $template, $params);
+    }
+
+    /**
+     * Common layout for task views
+     *
+     * @access public
+     * @param  string $template Template name
+     * @param  array  $params   Template parameters
+     * @return string
+     */
+    public function task($template, array $params)
+    {
+        $params['title'] = $params['task']['title'];
+        return $this->subLayout('task/layout', 'task/sidebar', $template, $params);
+    }
+
+    /**
+     * Common layout for project views
+     *
+     * @access public
+     * @param  string $template
+     * @param  array  $params
+     * @param  string $sidebar
+     * @return string
+     */
+    public function project($template, array $params, $sidebar = 'project/sidebar')
+    {
+        if (empty($params['title'])) {
+            $params['title'] = $params['project']['name'];
+        } elseif ($params['project']['name'] !== $params['title']) {
+            $params['title'] = $params['project']['name'].' &gt; '.$params['title'];
+        }
+
+        return $this->subLayout('project/layout', $sidebar, $template, $params);
+    }
+
+    /**
+     * Common layout for project user views
+     *
+     * @access public
+     * @param  string $template
+     * @param  array  $params
+     * @return string
+     */
+    public function projectUser($template, array $params)
+    {
+        $params['filter'] = array('user_id' => $params['user_id']);
+        return $this->subLayout('project_user/layout', 'project_user/sidebar', $template, $params);
+    }
+
+    /**
+     * Common layout for config views
+     *
+     * @access public
+     * @param  string $template
+     * @param  array  $params
+     * @return string
+     */
+    public function config($template, array $params)
+    {
+        if (! isset($params['values'])) {
+            $params['values'] = $this->config->getAll();
+        }
+
+        if (! isset($params['errors'])) {
+            $params['errors'] = array();
+        }
+
+        return $this->subLayout('config/layout', 'config/sidebar', $template, $params);
+    }
+
+    /**
+     * Common layout for dashboard views
+     *
+     * @access public
+     * @param  string $template
+     * @param  array  $params
+     * @return string
+     */
+    public function dashboard($template, array $params)
+    {
+        return $this->subLayout('app/layout', 'app/sidebar', $template, $params);
+    }
+
+    /**
+     * Common layout for analytic views
+     *
+     * @access public
+     * @param  string $template
+     * @param  array  $params
+     * @return string
+     */
+    public function analytic($template, array $params)
+    {
+        return $this->subLayout('analytic/layout', 'analytic/sidebar', $template, $params);
+    }
+
+    /**
+     * Common method to generate a sublayout
+     *
+     * @access public
+     * @param  string $sublayout
+     * @param  string $sidebar
+     * @param  string $template
+     * @param  array  $params
+     * @return string
+     */
+    public function subLayout($sublayout, $sidebar, $template, array $params = array())
+    {
+        $content = $this->template->render($template, $params);
+
+        if ($this->request->isAjax()) {
+            return $content;
+        }
+
+        $params['content_for_sublayout'] = $content;
+        $params['sidebar_template'] = $sidebar;
+
+        return $this->app($sublayout, $params);
+    }
+}
diff --git a/app/Helper/Subtask.php b/app/Helper/Subtask.php
index 90bd733e..38074b78 100644
--- a/app/Helper/Subtask.php
+++ b/app/Helper/Subtask.php
@@ -10,37 +10,82 @@ namespace Kanboard\Helper;
  */
 class Subtask extends \Kanboard\Core\Base
 {
+    public function getTitle(array $subtask)
+    {
+        if ($subtask['status'] == 0) {
+            $html = '<i class="fa fa-square-o fa-fw"></i>';
+        } elseif ($subtask['status'] == 1) {
+            $html = '<i class="fa fa-gears fa-fw"></i>';
+        } else {
+            $html = '<i class="fa fa-check-square-o fa-fw"></i>';
+        }
+
+        return $html.$this->helper->e($subtask['title']);
+    }
+
     /**
      * Get the link to toggle subtask status
      *
      * @access public
      * @param  array    $subtask
-     * @param  string   $redirect
      * @param  integer  $project_id
      * @return string
      */
-    public function toggleStatus(array $subtask, $redirect, $project_id = 0)
+    public function toggleStatus(array $subtask, $project_id)
     {
-        if ($project_id > 0 && ! $this->helper->user->hasProjectAccess('subtask', 'edit', $project_id)) {
-            return trim($this->template->render('subtask/icons', array('subtask' => $subtask))) . $this->helper->e($subtask['title']);
+        if (! $this->helper->user->hasProjectAccess('subtask', 'edit', $project_id)) {
+            return $this->getTitle($subtask);
         }
 
+        $params = array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']);
+
         if ($subtask['status'] == 0 && isset($this->sessionStorage->hasSubtaskInProgress) && $this->sessionStorage->hasSubtaskInProgress) {
-            return $this->helper->url->link(
-                trim($this->template->render('subtask/icons', array('subtask' => $subtask))) . $this->helper->e($subtask['title']),
-                'subtask',
-                'subtaskRestriction',
-                array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'redirect' => $redirect),
-                false,
-                'popover task-board-popover'
-            );
+            return $this->helper->url->link($this->getTitle($subtask), 'SubtaskRestriction', 'popover', $params, false, 'popover');
         }
 
-        return $this->helper->url->link(
-            trim($this->template->render('subtask/icons', array('subtask' => $subtask))) . $this->helper->e($subtask['title']),
-            'subtask',
-            'toggleStatus',
-            array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'redirect' => $redirect)
-        );
+        return $this->helper->url->link($this->getTitle($subtask), 'SubtaskStatus', 'change', $params, false, 'ajax-replace');
+    }
+
+    public function selectTitle(array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="1"', 'required', 'maxlength="255"'), $attributes);
+
+        $html = $this->helper->form->label(t('Title'), 'title');
+        $html .= $this->helper->form->text('title', $values, $errors, $attributes);
+
+        return $html;
+    }
+
+    public function selectAssignee(array $users, array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="2"'), $attributes);
+
+        $html = $this->helper->form->label(t('Assignee'), 'user_id');
+        $html .= $this->helper->form->select('user_id', $users, $values, $errors, $attributes);
+        $html .= '&nbsp;<a href="#" class="assign-me" data-target-id="form-user_id" data-current-id="'.$this->userSession->getId().'" title="'.t('Assign to me').'">'.t('Me').'</a>';
+
+        return $html;
+    }
+
+    public function selectTimeEstimated(array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="3"'), $attributes);
+
+        $html = $this->helper->form->label(t('Original estimate'), 'time_estimated');
+        $html .= $this->helper->form->numeric('time_estimated', $values, $errors, $attributes);
+        $html .= ' '.t('hours');
+
+        return $html;
+    }
+
+    public function selectTimeSpent(array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="4"'), $attributes);
+
+        $html = $this->helper->form->label(t('Time spent'), 'time_spent');
+        $html .= $this->helper->form->numeric('time_spent', $values, $errors, $attributes);
+        $html .= ' '.t('hours');
+
+        return $html;
     }
 }
diff --git a/app/Helper/Task.php b/app/Helper/Task.php
index 500b8a89..1cb36b86 100644
--- a/app/Helper/Task.php
+++ b/app/Helper/Task.php
@@ -12,6 +12,14 @@ use Kanboard\Core\Base;
  */
 class Task extends Base
 {
+    /**
+     * Local cache for project columns
+     *
+     * @access private
+     * @var array
+     */
+    private $columns = array();
+
     public function getColors()
     {
         return $this->color->getList();
@@ -37,6 +45,53 @@ class Task extends Base
         return $this->taskPermission->canRemoveTask($task);
     }
 
+    public function selectAssignee(array $users, array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="3"'), $attributes);
+
+        $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>';
+
+        return $html;
+    }
+
+    public function selectCategory(array $categories, array $values, array $errors = array(), array $attributes = array(), $allow_one_item = false)
+    {
+        $attributes = array_merge(array('tabindex="4"'), $attributes);
+        $html = '';
+
+        if (! (! $allow_one_item && count($categories) === 1 && key($categories) == 0)) {
+            $html .= $this->helper->form->label(t('Category'), 'category_id');
+            $html .= $this->helper->form->select('category_id', $categories, $values, $errors, $attributes);
+        }
+
+        return $html;
+    }
+
+    public function selectSwimlane(array $swimlanes, array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="5"'), $attributes);
+        $html = '';
+
+        if (! (count($swimlanes) === 1 && key($swimlanes) == 0)) {
+            $html .= $this->helper->form->label(t('Swimlane'), 'swimlane_id');
+            $html .= $this->helper->form->select('swimlane_id', $swimlanes, $values, $errors, $attributes);
+        }
+
+        return $html;
+    }
+
+    public function selectColumn(array $columns, array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="6"'), $attributes);
+
+        $html = $this->helper->form->label(t('Column'), 'column_id');
+        $html .= $this->helper->form->select('column_id', $columns, $values, $errors, $attributes);
+
+        return $html;
+    }
+
     public function selectPriority(array $project, array $values)
     {
         $html = '';
@@ -53,6 +108,61 @@ class Task extends Base
         return $html;
     }
 
+    public function selectScore(array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="8"'), $attributes);
+
+        $html = $this->helper->form->label(t('Complexity'), 'score');
+        $html .= $this->helper->form->number('score', $values, $errors, $attributes);
+
+        return $html;
+    }
+
+    public function selectTimeEstimated(array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="9"'), $attributes);
+
+        $html = $this->helper->form->label(t('Original estimate'), 'time_estimated');
+        $html .= $this->helper->form->numeric('time_estimated', $values, $errors, $attributes);
+        $html .= ' '.t('hours');
+
+        return $html;
+    }
+
+    public function selectTimeSpent(array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="10"'), $attributes);
+
+        $html = $this->helper->form->label(t('Time spent'), 'time_spent');
+        $html .= $this->helper->form->numeric('time_spent', $values, $errors, $attributes);
+        $html .= ' '.t('hours');
+
+        return $html;
+    }
+
+    public function selectStartDate(array $values, array $errors = array(), array $attributes = array())
+    {
+        $placeholder = $this->helper->text->in($this->config->get('application_date_format'), $this->dateParser->getAvailableFormats());
+        $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-date');
+
+        return $html;
+    }
+
+    public function selectDueDate(array $values, array $errors = array(), array $attributes = array())
+    {
+        $placeholder = $this->helper->text->in($this->config->get('application_date_format'), $this->dateParser->getAvailableFormats());
+        $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');
+        $html .= '<div class="form-help">'.t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')).'</div>';
+
+        return $html;
+    }
+
     public function formatPriority(array $project, array $task)
     {
         $html = '';
@@ -65,4 +175,13 @@ class Task extends Base
 
         return $html;
     }
+
+    public function getProgress($task)
+    {
+        if (! isset($this->columns[$task['project_id']])) {
+            $this->columns[$task['project_id']] = $this->board->getColumnsList($task['project_id']);
+        }
+
+        return $this->task->getProgress($task, $this->columns[$task['project_id']]);
+    }
 }