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

Conflicts:
	app/Locale/de_DE/translations.php

7 files changed, 227 insertions, 171 deletions

diff --git a/app/Template/task/comments.php b/app/Template/task/comments.php
index 57fb305f..c22e39ec 100644
--- a/app/Template/task/comments.php
+++ b/app/Template/task/comments.php
@@ -28,7 +28,7 @@
                 'task_id' => $task['id'],
             ),
             'errors' => array(),
-            'task' => $task
+            'task' => $task,
         )) ?>
     <?php endif ?>
 </div>
diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index d885ca9c..838eb260 100644
--- a/app/Template/task/details.php
+++ b/app/Template/task/details.php
@@ -1,104 +1,130 @@
-<div class="color-<?= $task['color_id'] ?> task-show-details">
-    <h2><?= $this->e('#'.$task['id'].' '.$task['title']) ?></h2>
-    <?php if ($task['score']): ?>
-        <span class="task-score"><?= $this->e($task['score']) ?></span>
-    <?php endif ?>
-    <ul>
-        <li>
-            <strong><?= t('Priority: %d', $task['priority']) ?></strong>
-        </li>
-        <?php if ($task['reference']): ?>
-        <li>
-            <strong><?= t('Reference: %s', $task['reference']) ?></strong>
-        </li>
-        <?php endif ?>
-        <?php if (! empty($task['swimlane_name'])): ?>
-        <li>
-            <?= t('Swimlane: %s', $task['swimlane_name']) ?>
-        </li>
-        <?php endif ?>
-        <li>
-            <?= dt('Created on %B %e, %Y at %k:%M %p', $task['date_creation']) ?>
-        </li>
-        <?php if ($task['date_modification']): ?>
-        <li>
-            <?= dt('Last modified on %B %e, %Y at %k:%M %p', $task['date_modification']) ?>
-        </li>
-        <?php endif ?>
-        <?php if ($task['date_completed']): ?>
-        <li>
-            <?= dt('Completed on %B %e, %Y at %k:%M %p', $task['date_completed']) ?>
-        </li>
-        <?php endif ?>
-        <?php if ($task['date_started']): ?>
-        <li>
-            <?= dt('Started on %B %e, %Y', $task['date_started']) ?>
-        </li>
-        <?php endif ?>
-        <?php if ($task['date_due']): ?>
-        <li>
-            <strong><?= dt('Must be done before %B %e, %Y', $task['date_due']) ?></strong>
-        </li>
-        <?php endif ?>
-        <?php if ($task['time_estimated']): ?>
-        <li>
-            <?= t('Estimated time: %s hours', $task['time_estimated']) ?>
-        </li>
-        <?php endif ?>
-        <?php if ($task['time_spent']): ?>
-        <li>
-            <?= t('Time spent: %s hours', $task['time_spent']) ?>
-        </li>
-        <?php endif ?>
-        <?php if ($task['creator_username']): ?>
-        <li>
-            <?= t('Created by %s', $task['creator_name'] ?: $task['creator_username']) ?>
-        </li>
-        <?php endif ?>
-        <li>
-            <strong>
-            <?php if ($task['assignee_username']): ?>
-                <?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?>
-            <?php else: ?>
-                <?= t('There is nobody assigned') ?>
-            <?php endif ?>
-            </strong>
-        </li>
-        <li>
-            <?= t('Column on the board:') ?>
-            <strong><?= $this->e($task['column_title']) ?></strong>
-            (<?= $this->e($task['project_name']) ?>)
-            <?= dt('since %B %e, %Y at %k:%M %p', $task['date_moved']) ?>
-        </li>
-        <li><?= t('Task position:').' '.$this->e($task['position']) ?></li>
-        <?php if ($task['category_name']): ?>
-        <li>
-            <?= t('Category:') ?> <strong><?= $this->e($task['category_name']) ?></strong>
-        </li>
-        <?php endif ?>
-        <li>
-            <?php if ($task['is_active'] == 1): ?>
-                <?= t('Status is open') ?>
-            <?php else: ?>
-                <?= t('Status is closed') ?>
-            <?php endif ?>
-        </li>
-        <?php if ($project['is_public']): ?>
-        <li>
-            <?= $this->url->link(t('Public link'), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token']), false, '', '', true) ?>
-        </li>
-        <?php endif ?>
-
-        <?php if ($editable && $task['recurrence_status'] != \Kanboard\Model\Task::RECURRING_STATUS_NONE): ?>
-        <li>
-            <strong><?= t('Recurring information') ?></strong>
-            <?= $this->render('task/recurring_info', array(
-                'task' => $task,
-                'recurrence_trigger_list' => $recurrence_trigger_list,
-                'recurrence_timeframe_list' => $recurrence_timeframe_list,
-                'recurrence_basedate_list' => $recurrence_basedate_list,
-            )) ?>
-        </li>
-        <?php endif ?>
-    </ul>
-</div>
+<section id="task-summary">
+    <h2><?= $this->e($task['title']) ?></h2>
+    <div class="task-summary-container color-<?= $task['color_id'] ?>">
+        <div class="task-summary-column">
+            <ul class="no-bullet">
+                <li>
+                    <strong><?= t('Status:') ?></strong>
+                    <span>
+                    <?php if ($task['is_active'] == 1): ?>
+                        <?= t('open') ?>
+                    <?php else: ?>
+                        <?= t('closed') ?>
+                    <?php endif ?>
+                    </span>
+                </li>
+                <li>
+                    <strong><?= t('Priority:') ?></strong> <span><?= $task['priority'] ?></span>
+                </li>
+                <?php if (! empty($task['reference'])): ?>
+                    <li>
+                        <strong><?= t('Reference:') ?></strong> <span><?= $this->e($task['reference']) ?></span>
+                    </li>
+                <?php endif ?>
+                <?php if (! empty($task['score'])): ?>
+                    <li>
+                        <strong><?= t('Complexity:') ?></strong> <span><?= $this->e($task['score']) ?></span>
+                    </li>
+                <?php endif ?>
+                <?php if ($project['is_public']): ?>
+                <li class="smaller">
+                    <i class="fa fa-external-link fa-fw"></i>
+                    <?= $this->url->link(t('Public link'), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token']), false, '', '', true) ?>
+                </li>
+                <?php endif ?>
+            </ul>
+        </div>
+        <div class="task-summary-column">
+            <ul class="no-bullet">
+                <?php if (! empty($task['category_name'])): ?>
+                    <li>
+                        <strong><?= t('Category:') ?></strong>
+                        <span><?= $this->e($task['category_name']) ?></span>
+                    </li>
+                <?php endif ?>
+                <?php if (! empty($task['swimlane_name'])): ?>
+                    <li>
+                        <strong><?= t('Swimlane:') ?></strong>
+                        <span><?= $this->e($task['swimlane_name']) ?></span>
+                    </li>
+                <?php endif ?>
+                <li>
+                    <strong><?= t('Column:') ?></strong>
+                    <span><?= $this->e($task['column_title']) ?></span>
+                </li>
+                <li>
+                    <strong><?= t('Position:') ?></strong>
+                    <span><?= $task['position'] ?></span>
+                </li>
+            </ul>
+        </div>
+        <div class="task-summary-column">
+            <ul class="no-bullet">
+                <li>
+                    <strong><?= t('Assignee:') ?></strong>
+                    <span>
+                    <?php if ($task['assignee_username']): ?>
+                        <?= $this->e($task['assignee_name'] ?: $task['assignee_username']) ?>
+                    <?php else: ?>
+                        <?= t('not assigned') ?>
+                    <?php endif ?>
+                    </span>
+                </li>
+                <?php if ($task['creator_username']): ?>
+                    <li>
+                        <strong><?= t('Creator:') ?></strong>
+                        <span><?= $this->e($task['creator_name'] ?: $task['creator_username']) ?></span>
+                    </li>
+                <?php endif ?>
+                <?php if ($task['date_due']): ?>
+                <li>
+                    <strong><?= t('Due date:') ?></strong>
+                    <span><?= dt('%B %e, %Y', $task['date_due']) ?></span>
+                </li>
+                <?php endif ?>
+                <?php if ($task['time_estimated']): ?>
+                <li>
+                    <strong><?= t('Time estimated:') ?></strong>
+                    <span><?= t('%s hours', $task['time_estimated']) ?></span>
+                </li>
+                <?php endif ?>
+                <?php if ($task['time_spent']): ?>
+                <li>
+                    <strong><?= t('Time spent:') ?></strong>
+                    <span><?= t('%s hours', $task['time_spent']) ?></span>
+                </li>
+                <?php endif ?>
+            </ul>
+        </div>
+        <div class="task-summary-column">
+            <ul class="no-bullet">
+                <li>
+                    <strong><?= t('Created:') ?></strong>
+                    <span><?= dt('%B %e, %Y at %k:%M %p', $task['date_creation']) ?></span>
+                </li>
+                <li>
+                    <strong><?= t('Modified:') ?></strong>
+                    <span><?= dt('%B %e, %Y at %k:%M %p', $task['date_modification']) ?></span>
+                </li>
+                <?php if ($task['date_completed']): ?>
+                <li>
+                    <strong><?= t('Completed:') ?></strong>
+                    <span><?= dt('%B %e, %Y at %k:%M %p', $task['date_completed']) ?></span>
+                </li>
+                <?php endif ?>
+                <?php if ($task['date_started']): ?>
+                <li>
+                    <strong><?= t('Started:') ?></strong>
+                    <span><?= dt('%B %e, %Y at %k:%M %p', $task['date_started']) ?></span>
+                </li>
+                <?php endif ?>
+                <?php if ($task['date_moved']): ?>
+                <li>
+                    <strong><?= t('Moved:') ?></strong>
+                    <span><?= dt('%B %e, %Y at %k:%M %p', $task['date_moved']) ?></span>
+                </li>
+                <?php endif ?>
+            </ul>
+        </div>
+    </div>
+</section>
diff --git a/app/Template/task/layout.php b/app/Template/task/layout.php
index 9fe1a716..9cbbfec9 100644
--- a/app/Template/task/layout.php
+++ b/app/Template/task/layout.php
@@ -2,6 +2,9 @@
     <div class="page-header">
         <ul>
             <li>
+                <?= $this->render('task/menu', array('task' => $task)) ?>
+            </li>
+            <li>
                 <i class="fa fa-th fa-fw"></i>
                 <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $task['project_id']), false, '', '', false, $task['swimlane_id'] != 0 ? 'swimlane-'.$task['swimlane_id'] : '') ?>
             </li>
@@ -17,12 +20,12 @@
             <?php endif ?>
         </ul>
     </div>
-    <section class="sidebar-container" id="task-section">
+    <section class="sidebar-container">
 
-        <?= $this->render('task/sidebar', array('task' => $task)) ?>
+        <?= $this->render($sidebar_template, array('task' => $task)) ?>
 
         <div class="sidebar-content">
-            <?= $task_content_for_layout ?>
+            <?= $content_for_sublayout ?>
         </div>
     </section>
 </section>
\ No newline at end of file
diff --git a/app/Template/task/menu.php b/app/Template/task/menu.php
new file mode 100644
index 00000000..426cfb3d
--- /dev/null
+++ b/app/Template/task/menu.php
@@ -0,0 +1,72 @@
+<?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
+<div class="dropdown">
+    <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Actions') ?></a>
+    <ul>
+        <li>
+            <i class="fa fa-pencil-square-o fa-fw"></i>
+            <?= $this->url->link(t('Edit the task'), 'taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+        </li>
+        <li>
+            <i class="fa fa-align-left fa-fw"></i>
+            <?= $this->url->link(t('Edit the description'), 'taskmodification', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+        </li>
+        <li>
+            <i class="fa fa-clock-o fa-fw"></i>
+            <?= $this->url->link(t('Edit recurrence'), 'TaskRecurrence', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+        </li>
+        <li>
+            <i class="fa fa-plus fa-fw"></i>
+            <?= $this->url->link(t('Add a sub-task'), 'subtask', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+        </li>
+        <li>
+            <i class="fa fa-code-fork fa-fw"></i>
+            <?= $this->url->link(t('Add internal link'), 'tasklink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+        </li>
+        <li>
+            <i class="fa fa-external-link fa-fw"></i>
+            <?= $this->url->link(t('Add external link'), 'TaskExternalLink', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+        </li>
+        <li>
+            <i class="fa fa-comment-o fa-fw"></i>
+            <?= $this->url->link(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+        </li>
+        <li>
+            <i class="fa fa-file fa-fw"></i>
+            <?= $this->url->link(t('Attach a document'), 'file', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+        </li>
+        <li>
+            <i class="fa fa-camera fa-fw"></i>
+            <?= $this->url->link(t('Add a screenshot'), 'file', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+        </li>
+        <li>
+            <i class="fa fa-files-o fa-fw"></i>
+            <?= $this->url->link(t('Duplicate'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+        </li>
+        <li>
+            <i class="fa fa-clipboard fa-fw"></i>
+            <?= $this->url->link(t('Duplicate to another project'), 'taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+        </li>
+        <li>
+            <i class="fa fa-clone fa-fw"></i>
+            <?= $this->url->link(t('Move to another project'), 'taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+        </li>
+        <li>
+            <?php if ($task['is_active'] == 1): ?>
+                <i class="fa fa-times fa-fw"></i>
+                <?= $this->url->link(t('Close this task'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?php else: ?>
+                <i class="fa fa-check-square-o fa-fw"></i>
+                <?= $this->url->link(t('Open this task'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?php endif ?>
+        </li>
+        <?php if ($this->task->canRemove($task)): ?>
+        <li>
+            <i class="fa fa-trash-o fa-fw"></i>
+            <?= $this->url->link(t('Remove'), 'task', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+        </li>
+        <?php endif ?>
+
+        <?= $this->hook->render('template:task:menu:actions') ?>
+    </ul>
+</div>
+<?php endif ?>
diff --git a/app/Template/task/remove.php b/app/Template/task/remove.php
index 2f6edc22..e0d655fe 100644
--- a/app/Template/task/remove.php
+++ b/app/Template/task/remove.php
@@ -10,6 +10,6 @@
     <div class="form-actions">
         <?= $this->url->link(t('Yes'), 'task', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/app/Template/task/show.php b/app/Template/task/show.php
index f6d47e53..e18b47fc 100644
--- a/app/Template/task/show.php
+++ b/app/Template/task/show.php
@@ -13,20 +13,20 @@
 
 <?= $this->render('task/description', array('task' => $task)) ?>
 
-<?= $this->render('tasklink/show', array(
-    'task' => $task,
-    'links' => $links,
-    'link_label_list' => $link_label_list,
-    'editable' => $this->user->hasProjectAccess('tasklink', 'edit', $project['id']),
-    'is_public' => false,
-)) ?>
-
 <?= $this->render('subtask/show', array(
     'task' => $task,
     'subtasks' => $subtasks,
     'project' => $project,
     'users_list' => isset($users_list) ? $users_list : array(),
-    'editable' => $this->user->hasProjectAccess('subtask', 'edit', $project['id']),
+    'editable' => true,
+)) ?>
+
+<?= $this->render('tasklink/show', array(
+    'task' => $task,
+    'links' => $links,
+    'link_label_list' => $link_label_list,
+    'editable' => true,
+    'is_public' => false,
 )) ?>
 
 <?= $this->render('task/time_tracking_summary', array('task' => $task)) ?>
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index f522c1c4..c60a1810 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -1,5 +1,5 @@
 <div class="sidebar">
-    <h2><?= t('Information') ?></h2>
+    <h2><?= t('Task #%d', $task['id']) ?></h2>
     <ul>
         <li <?= $this->app->checkMenuSelection('task', 'show') ?>>
             <?= $this->url->link(t('Summary'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
@@ -18,61 +18,16 @@
             <?= $this->url->link(t('Time tracking'), 'task', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
         <?php endif ?>
-
-        <?= $this->hook->render('template:task:sidebar:information') ?>
-    </ul>
-    <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
-    <h2><?= t('Actions') ?></h2>
-    <ul>
-        <li <?= $this->app->checkMenuSelection('taskmodification', 'edit') ?>>
-            <?= $this->url->link(t('Edit the task'), 'taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('taskmodification', 'description') ?>>
-            <?= $this->url->link(t('Edit the description'), 'taskmodification', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('taskmodification', 'recurrence') ?>>
-            <?= $this->url->link(t('Edit recurrence'), 'taskmodification', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('subtask', 'create') ?>>
-            <?= $this->url->link(t('Add a sub-task'), 'subtask', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('tasklink', 'create') ?>>
-            <?= $this->url->link(t('Add a link'), 'tasklink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        <li <?= $this->app->checkMenuSelection('subtask', 'show') ?>>
+            <?= $this->url->link(t('Sub-tasks'), 'subtask', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('comment', 'create') ?>>
-            <?= $this->url->link(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        <li <?= $this->app->checkMenuSelection('tasklink', 'show') ?>>
+            <?= $this->url->link(t('Internal links'), 'tasklink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('file', 'create') ?>>
-            <?= $this->url->link(t('Attach a document'), 'file', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        <li <?= $this->app->checkMenuSelection('TaskExternalLink', 'show') ?>>
+            <?= $this->url->link(t('External links'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('file', 'screenshot') ?>>
-            <?= $this->url->link(t('Add a screenshot'), 'file', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('taskduplication', 'duplicate') ?>>
-            <?= $this->url->link(t('Duplicate'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('taskduplication', 'copy') ?>>
-            <?= $this->url->link(t('Duplicate to another project'), 'taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('taskduplication', 'move') ?>>
-            <?= $this->url->link(t('Move to another project'), 'taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('taskstatus') ?>>
-            <?php if ($task['is_active'] == 1): ?>
-                <?= $this->url->link(t('Close this task'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
-            <?php else: ?>
-                <?= $this->url->link(t('Open this task'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
-            <?php endif ?>
-        </li>
-        <?php if ($this->task->canRemove($task)): ?>
-        <li <?= $this->app->checkMenuSelection('task', 'remove') ?>>
-            <?= $this->url->link(t('Remove'), 'task', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
-        </li>
-        <?php endif ?>
 
-        <?= $this->hook->render('template:task:sidebar:actions') ?>
+        <?= $this->hook->render('template:task:sidebar:information') ?>
     </ul>
-    <?php endif ?>
-    <div class="sidebar-collapse"><a href="#" title="<?= t('Hide sidebar') ?>"><i class="fa fa-chevron-left"></i></a></div>
-    <div class="sidebar-expand" style="display: none"><a href="#" title="<?= t('Expand sidebar') ?>"><i class="fa fa-chevron-right"></i></a></div>
 </div>