Move task import outside of project settings

5 files changed, 23 insertions, 10 deletions

diff --git a/app/Template/export/sidebar.php b/app/Template/export/sidebar.php
index c9d4d0a3..55fbaeef 100644
--- a/app/Template/export/sidebar.php
+++ b/app/Template/export/sidebar.php
@@ -1,16 +1,16 @@
 <div class="sidebar">
     <h2><?= t('Exports') ?></h2>
     <ul>
-        <li <?= $this->app->getRouterAction() === 'tasks' ? 'class="active"' : '' ?>>
+        <li <?= $this->app->checkMenuSelection('ExportController', 'tasks') ?>>
             <?= $this->url->link(t('Tasks'), 'ExportController', 'tasks', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->getRouterAction() === 'subtasks' ? 'class="active"' : '' ?>>
+        <li <?= $this->app->checkMenuSelection('ExportController', 'subtasks') ?>>
             <?= $this->url->link(t('Subtasks'), 'ExportController', 'subtasks', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->getRouterAction() === 'transitions' ? 'class="active"' : '' ?>>
+        <li <?= $this->app->checkMenuSelection('ExportController', 'transitions') ?>>
             <?= $this->url->link(t('Task transitions'), 'ExportController', 'transitions', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->getRouterAction() === 'summary' ? 'class="active"' : '' ?>>
+        <li <?= $this->app->checkMenuSelection('ExportController', 'summary') ?>>
             <?= $this->url->link(t('Daily project summary'), 'ExportController', 'summary', array('project_id' => $project['id'])) ?>
         </li>
         <?= $this->hook->render('template:export:sidebar') ?>
diff --git a/app/Template/project/sidebar.php b/app/Template/project/sidebar.php
index 3fac3fd1..9bc0c9c4 100644
--- a/app/Template/project/sidebar.php
+++ b/app/Template/project/sidebar.php
@@ -29,7 +29,7 @@
             <li <?= $this->app->checkMenuSelection('SwimlaneController') ?>>
                 <?= $this->url->link(t('Swimlanes'), 'SwimlaneController', 'index', array('project_id' => $project['id'])) ?>
             </li>
-            <li <?= $this->app->checkMenuSelection('category') ?>>
+            <li <?= $this->app->checkMenuSelection('CategoryController') ?>>
                 <?= $this->url->link(t('Categories'), 'CategoryController', 'index', array('project_id' => $project['id'])) ?>
             </li>
             <?php if ($project['is_private'] == 0): ?>
@@ -51,9 +51,6 @@
                     <?= $this->url->link(t('Enable'), 'ProjectStatusController', 'confirmEnable', array('project_id' => $project['id']), false, 'popover') ?>
                 <?php endif ?>
             </li>
-            <li <?= $this->app->checkMenuSelection('TaskImportController') ?>>
-                <?= $this->url->link(t('Import'), 'TaskImportController', 'step1', array('project_id' => $project['id'])) ?>
-            </li>
             <?php if ($this->user->hasProjectAccess('ProjectStatusController', 'remove', $project['id'])): ?>
                 <li>
                     <?= $this->url->link(t('Remove'), 'ProjectStatusController', 'confirmRemove', array('project_id' => $project['id']), false, 'popover') ?>
diff --git a/app/Template/project_header/dropdown.php b/app/Template/project_header/dropdown.php
index 6b5c51a6..79a1b389 100644
--- a/app/Template/project_header/dropdown.php
+++ b/app/Template/project_header/dropdown.php
@@ -67,11 +67,18 @@
 
         <?php if ($this->user->hasProjectAccess('ExportController', 'tasks', $project['id'])): ?>
             <li>
-                <i class="fa fa-download fa-fw"></i>
+                <i class="fa fa-upload fa-fw"></i>
                 <?= $this->url->link(t('Exports'), 'ExportController', 'tasks', array('project_id' => $project['id'])) ?>
             </li>
         <?php endif ?>
 
+        <?php if ($this->user->hasProjectAccess('TaskImportController', 'tasks', $project['id'])): ?>
+            <li>
+                <i class="fa fa-download fa-fw"></i>
+                <?= $this->url->link(t('Imports'), 'TaskImportController', 'show', array('project_id' => $project['id'])) ?>
+            </li>
+        <?php endif ?>
+
         <?php if ($this->user->hasProjectAccess('ProjectEditController', 'edit', $project['id'])): ?>
             <li>
                 <i class="fa fa-cog fa-fw"></i>
diff --git a/app/Template/task_import/step1.php b/app/Template/task_import/show.php
index 23fcc11c..cc6a7b3a 100644
--- a/app/Template/task_import/step1.php
+++ b/app/Template/task_import/show.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Tasks Importation') ?></h2>
 </div>
-<form action="<?= $this->url->href('TaskImportController', 'step2', array('project_id' => $project['id'])) ?>" method="post" enctype="multipart/form-data">
+<form action="<?= $this->url->href('TaskImportController', 'save', array('project_id' => $project['id'])) ?>" method="post" enctype="multipart/form-data">
     <?= $this->form->csrf() ?>
 
     <?= $this->form->label(t('Delimiter'), 'delimiter') ?>
diff --git a/app/Template/task_import/sidebar.php b/app/Template/task_import/sidebar.php
new file mode 100644
index 00000000..4cd92af8
--- /dev/null
+++ b/app/Template/task_import/sidebar.php
@@ -0,0 +1,9 @@
+<div class="sidebar">
+    <h2><?= t('Imports') ?></h2>
+    <ul>
+        <li <?= $this->app->checkMenuSelection('TaskImportController', 'show') ?>>
+            <?= $this->url->link(t('Tasks').' (CSV)', 'TaskImportController', 'show', array('project_id' => $project['id'])) ?>
+        </li>
+        <?= $this->hook->render('template:task-import:sidebar') ?>
+    </ul>
+</div>