From b6e92cb64a5ba6c8eb5222a7732fba50e6079622 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 24 Jun 2016 18:09:01 -0400
Subject: Remove dropdown menus that are now available with task edit form

---
 app/Template/task/dropdown.php                     | 12 ------
 app/Template/task/sidebar.php                      |  4 --
 .../task_modification/edit_description.php         | 27 --------------
 app/Template/task_modification/edit_task.php       | 43 ----------------------
 app/Template/task_modification/show.php            | 43 ++++++++++++++++++++++
 app/Template/task_popover/change_assignee.php      | 20 ----------
 app/Template/task_popover/change_category.php      | 20 ----------
 7 files changed, 43 insertions(+), 126 deletions(-)
 delete mode 100644 app/Template/task_modification/edit_description.php
 delete mode 100644 app/Template/task_modification/edit_task.php
 create mode 100644 app/Template/task_modification/show.php
 delete mode 100644 app/Template/task_popover/change_assignee.php
 delete mode 100644 app/Template/task_popover/change_category.php

(limited to 'app/Template')

diff --git a/app/Template/task/dropdown.php b/app/Template/task/dropdown.php
index b6b9c789..95c7a88c 100644
--- a/app/Template/task/dropdown.php
+++ b/app/Template/task/dropdown.php
@@ -7,22 +7,10 @@
             <?= $this->url->link(t('Set automatically the start date'), 'TaskModificationController', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
         <?php endif ?>
-        <li>
-            <i class="fa fa-user fa-fw"></i>
-            <?= $this->url->link(t('Change assignee'), 'TaskPopoverController', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
-        </li>
-        <li>
-            <i class="fa fa-tag fa-fw"></i>
-            <?= $this->url->link(t('Change category'), 'TaskPopoverController', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
-        </li>
         <li>
             <i class="fa fa-pencil-square-o fa-fw"></i>
             <?= $this->url->link(t('Edit the task'), 'TaskModificationController', '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'), 'TaskModificationController', 'description', 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'), 'SubtaskController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index e77ec18a..b44e6f0b 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -34,10 +34,6 @@
             <i class="fa fa-pencil-square-o fa-fw"></i>
             <?= $this->url->link(t('Edit the task'), 'TaskModificationController', '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'), 'TaskModificationController', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
-        </li>
         <li>
             <i class="fa fa-refresh fa-rotate-90 fa-fw"></i>
             <?= $this->url->link(t('Edit recurrence'), 'TaskRecurrenceController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
diff --git a/app/Template/task_modification/edit_description.php b/app/Template/task_modification/edit_description.php
deleted file mode 100644
index 339ed036..00000000
--- a/app/Template/task_modification/edit_description.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Edit the description') ?></h2>
-</div>
-
-<form class="popover-form" method="post" action="<?= $this->url->href('TaskModificationController', 'updateDescription', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
-
-    <?= $this->form->csrf() ?>
-    <?= $this->form->hidden('id', $values) ?>
-
-    <?= $this->form->textarea(
-        'description',
-        $values,
-        $errors,
-        array(
-            'autofocus',
-            'placeholder="'.t('Leave a description').'"',
-            'data-mention-search-url="'.$this->url->href('UserAjaxController', 'mention', array('project_id' => $task['project_id'])).'"'
-        ),
-        'markdown-editor'
-    ) ?>
-
-    <div class="form-actions">
-        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-        <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
-    </div>
-</form>
diff --git a/app/Template/task_modification/edit_task.php b/app/Template/task_modification/edit_task.php
deleted file mode 100644
index d747407e..00000000
--- a/app/Template/task_modification/edit_task.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Edit a task') ?></h2>
-</div>
-<form class="popover-form" method="post" action="<?= $this->url->href('TaskModificationController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
-    <?= $this->form->csrf() ?>
-    <?= $this->form->hidden('id', $values) ?>
-    <?= $this->form->hidden('project_id', $values) ?>
-
-    <div class="form-columns">
-        <div class="form-column">
-            <?= $this->task->selectTitle($values, $errors) ?>
-            <?= $this->task->selectDescription($values, $errors) ?>
-            <?= $this->task->selectTags($project, $tags) ?>
-
-            <?= $this->hook->render('template:task:form:first-column', array('values' => $values, 'errors' => $errors)) ?>
-        </div>
-
-        <div class="form-column">
-            <?= $this->task->selectColor($values) ?>
-            <?= $this->task->selectAssignee($users_list, $values, $errors) ?>
-            <?= $this->task->selectCategory($categories_list, $values, $errors) ?>
-            <?= $this->task->selectPriority($project, $values) ?>
-            <?= $this->task->selectScore($values, $errors) ?>
-
-            <?= $this->hook->render('template:task:form:second-column', array('values' => $values, 'errors' => $errors)) ?>
-        </div>
-
-        <div class="form-column">
-            <?= $this->task->selectTimeEstimated($values, $errors) ?>
-            <?= $this->task->selectTimeSpent($values, $errors) ?>
-            <?= $this->task->selectStartDate($values, $errors) ?>
-            <?= $this->task->selectDueDate($values, $errors) ?>
-
-            <?= $this->hook->render('template:task:form:third-column', array('values' => $values, 'errors' => $errors)) ?>
-        </div>
-    </div>
-
-    <div class="form-actions">
-        <button type="submit" class="btn btn-blue" tabindex="15"><?= t('Save') ?></button>
-        <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
-    </div>
-</form>
diff --git a/app/Template/task_modification/show.php b/app/Template/task_modification/show.php
new file mode 100644
index 00000000..d747407e
--- /dev/null
+++ b/app/Template/task_modification/show.php
@@ -0,0 +1,43 @@
+<div class="page-header">
+    <h2><?= t('Edit a task') ?></h2>
+</div>
+<form class="popover-form" method="post" action="<?= $this->url->href('TaskModificationController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+    <?= $this->form->csrf() ?>
+    <?= $this->form->hidden('id', $values) ?>
+    <?= $this->form->hidden('project_id', $values) ?>
+
+    <div class="form-columns">
+        <div class="form-column">
+            <?= $this->task->selectTitle($values, $errors) ?>
+            <?= $this->task->selectDescription($values, $errors) ?>
+            <?= $this->task->selectTags($project, $tags) ?>
+
+            <?= $this->hook->render('template:task:form:first-column', array('values' => $values, 'errors' => $errors)) ?>
+        </div>
+
+        <div class="form-column">
+            <?= $this->task->selectColor($values) ?>
+            <?= $this->task->selectAssignee($users_list, $values, $errors) ?>
+            <?= $this->task->selectCategory($categories_list, $values, $errors) ?>
+            <?= $this->task->selectPriority($project, $values) ?>
+            <?= $this->task->selectScore($values, $errors) ?>
+
+            <?= $this->hook->render('template:task:form:second-column', array('values' => $values, 'errors' => $errors)) ?>
+        </div>
+
+        <div class="form-column">
+            <?= $this->task->selectTimeEstimated($values, $errors) ?>
+            <?= $this->task->selectTimeSpent($values, $errors) ?>
+            <?= $this->task->selectStartDate($values, $errors) ?>
+            <?= $this->task->selectDueDate($values, $errors) ?>
+
+            <?= $this->hook->render('template:task:form:third-column', array('values' => $values, 'errors' => $errors)) ?>
+        </div>
+    </div>
+
+    <div class="form-actions">
+        <button type="submit" class="btn btn-blue" tabindex="15"><?= t('Save') ?></button>
+        <?= t('or') ?>
+        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+    </div>
+</form>
diff --git a/app/Template/task_popover/change_assignee.php b/app/Template/task_popover/change_assignee.php
deleted file mode 100644
index 02f3e198..00000000
--- a/app/Template/task_popover/change_assignee.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <h2><?= t('Change assignee for the task "%s"', $values['title']) ?></h2>
-    </div>
-    <form class="popover-form" method="post" action="<?= $this->url->href('TaskPopoverController', 'updateAssignee', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>">
-
-        <?= $this->form->csrf() ?>
-
-        <?= $this->form->hidden('id', $values) ?>
-        <?= $this->form->hidden('project_id', $values) ?>
-
-        <?= $this->task->selectAssignee($users_list, $values, array(), array('autofocus')) ?>
-
-        <div class="form-actions">
-            <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-            <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'BoardViewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
-        </div>
-    </form>
-</section>
diff --git a/app/Template/task_popover/change_category.php b/app/Template/task_popover/change_category.php
deleted file mode 100644
index eb6a373d..00000000
--- a/app/Template/task_popover/change_category.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <h2><?= t('Change category for the task "%s"', $values['title']) ?></h2>
-    </div>
-    <form class="popover-form" method="post" action="<?= $this->url->href('TaskPopoverController', 'updateCategory', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>">
-
-        <?= $this->form->csrf() ?>
-
-        <?= $this->form->hidden('id', $values) ?>
-        <?= $this->form->hidden('project_id', $values) ?>
-
-        <?= $this->task->selectCategory($categories_list, $values, array(), array('autofocus'), true) ?>
-
-        <div class="form-actions">
-            <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-            <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'BoardViewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
-        </div>
-    </form>
-</section>
-- 
cgit v1.2.3