Add dropdown menu to the tasks

2015-02-01 18:57:07 -05:00
parent 695ed5701c
commit 7283692c1d
24 changed files with 330 additions and 131 deletions
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@@ -699,4 +699,5 @@ return array(
    // 'All status' => '',
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
+    // 'Change description' => '',
 );
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -699,4 +699,5 @@ return array(
    // 'All status' => '',
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
+    // 'Change description' => '',
 );
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@@ -699,4 +699,5 @@ return array(
    'All status' => 'Todos los estados',
    // 'Add a comment logging moving the task between columns' => '',
    'Moved to column %s' => 'Movido a columna %s',
+    // 'Change description' => '',
 );
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -699,4 +699,5 @@ return array(
    // 'All status' => '',
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
+    // 'Change description' => '',
 );
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -699,4 +699,5 @@ return array(
    'All status' => 'Tous les états',
    'Add a comment logging moving the task between columns' => 'Ajouter un commentaire de log lorsqu\'une tâche est déplacée dans une autre colonne',
    'Moved to column %s' => 'Tâche déplacée à la colonne %s',
+    'Change description' => 'Changer la description',
 );
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@@ -699,4 +699,5 @@ return array(
    // 'All status' => '',
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
+    // 'Change description' => '',
 );
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@@ -699,4 +699,5 @@ return array(
    // 'All status' => '',
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
+    // 'Change description' => '',
 );
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -699,4 +699,5 @@ return array(
    // 'All status' => '',
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
+    // 'Change description' => '',
 );
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@@ -699,4 +699,5 @@ return array(
    'All status' => 'Wszystkie statusy',
    'Add a comment logging moving the task between columns' => 'Dodaj komentarz dokumentujący przeniesienie zadania pomiędzy kolumnami',
    'Moved to column %s' => 'Przeniosiono do kolumny %s',
+    // 'Change description' => '',
 );
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -699,4 +699,5 @@ return array(
    'All status' => 'Todos os status',
    'Add a comment logging moving the task between columns' => 'Adicionar un comentário de log ao mover uma tarefa em outra coluna',
    'Moved to column %s' => 'Mover para a coluna %s',
+    // 'Change description' => '',
 );
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@@ -699,4 +699,5 @@ return array(
    // 'All status' => '',
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
+    // 'Change description' => '',
 );
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@@ -699,4 +699,5 @@ return array(
    // 'All status' => '',
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
+    // 'Change description' => '',
 );
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@@ -699,4 +699,5 @@ return array(
    // 'All status' => '',
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
+    // 'Change description' => '',
 );
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -699,4 +699,5 @@ return array(
    // 'All status' => '',
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
+    // 'Change description' => '',
 );
--- a/app/Template/board/filters.php
+++ b/app/Template/board/filters.php
@@ -30,6 +30,7 @@
                            <i class="fa fa-cog fa-fw"></i>
                            <?= $this->a(t('Configure'), 'project', 'show', array('project_id' => $project['id'])) ?>
                        </li>
+                        <?php endif ?>
                    </ul>
                </li>
            </ul>
@@ -45,6 +46,5 @@
        <li>
            <a href="#" id="filter-due-date"><?= t('Filter by due date') ?></a>
        </li>
-        <?php endif ?>
    </ul>
 </div>
--- a/app/Template/board/task.php
+++ b/app/Template/board/task.php
@@ -38,7 +38,17 @@
     data-task-url="<?= $this->u('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
     title="<?= t('View this task') ?>">

-    <?= $this->a('#'.$task['id'], 'task', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-edit-popover', t('Edit this task')) ?>
+    <ul class="dropdown">
+        <li>
+            <a href="#" class="dropdown-menu"><?= '#'.$task['id'] ?></a>
+            <ul>
+                <li><i class="fa fa-user"></i> <?= $this->a(t('Change assignee'), 'board', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'assignee-popover') ?></li>
+                <li><i class="fa fa-tag"></i> <?= $this->a(t('Change category'), 'board', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'category-popover') ?></li>
+                <li><i class="fa fa-align-left"></i> <?= $this->a(t('Change description'), 'task', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-description-popover') ?></li>
+                <li><i class="fa fa-pencil-square-o"></i> <?= $this->a(t('Edit this task'), 'task', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-edit-popover') ?></li>
+            </li>
+        </li>
+    </ul>

    <?php if ($task['reference']): ?>
    <span class="task-board-reference" title="<?= t('Reference') ?>">
@@ -111,11 +121,7 @@

        <?php if (! empty($task['description'])): ?>
            <span title="<?= t('Description') ?>" class="task-board-tooltip" data-href="<?= $this->u('board', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
-            <?php if (! isset($not_editable)): ?>
-                <a class="task-description-popover" href="?controller=task&amp;action=description&amp;task_id=<?= $task['id'] ?>"><i class="fa fa-file-text-o" data-href="?controller=task&amp;action=description&amp;task_id=<?= $task['id'] ?>"></i></a>
-            <?php else: ?>
                <i class="fa fa-file-text-o"></i>
-            <?php endif ?>
            </span>
        <?php endif ?>
    </div>