From 9e218032c485b7ab6ef8e00f45890151988b0f90 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 28 May 2016 14:29:07 -0400
Subject: Split Gantt controller

---
 app/Template/dashboard/projects.php           |  4 +--
 app/Template/gantt/project.php                | 34 --------------------------
 app/Template/gantt/projects.php               | 30 -----------------------
 app/Template/gantt/task_creation.php          | 35 ---------------------------
 app/Template/project/dropdown.php             |  4 +--
 app/Template/project_gantt/show.php           | 30 +++++++++++++++++++++++
 app/Template/project_header/views.php         |  6 ++---
 app/Template/project_list/show.php            |  4 +--
 app/Template/project_user_overview/layout.php |  4 +--
 app/Template/project_user_overview/roles.php  |  2 +-
 app/Template/task_gantt/show.php              | 34 ++++++++++++++++++++++++++
 app/Template/task_gantt_creation/show.php     | 35 +++++++++++++++++++++++++++
 12 files changed, 111 insertions(+), 111 deletions(-)
 delete mode 100644 app/Template/gantt/project.php
 delete mode 100644 app/Template/gantt/projects.php
 delete mode 100644 app/Template/gantt/task_creation.php
 create mode 100644 app/Template/project_gantt/show.php
 create mode 100644 app/Template/task_gantt/show.php
 create mode 100644 app/Template/task_gantt_creation/show.php

(limited to 'app/Template')

diff --git a/app/Template/dashboard/projects.php b/app/Template/dashboard/projects.php
index 4d33519a..4aa40621 100644
--- a/app/Template/dashboard/projects.php
+++ b/app/Template/dashboard/projects.php
@@ -22,8 +22,8 @@
                 <?php endif ?>
             </td>
             <td>
-                <?php if ($this->user->hasProjectAccess('gantt', 'project', $project['id'])): ?>
-                    <?= $this->url->link('<i class="fa fa-sliders fa-fw"></i>', 'gantt', 'project', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?>
+                <?php if ($this->user->hasProjectAccess('TaskGanttController', 'show', $project['id'])): ?>
+                    <?= $this->url->link('<i class="fa fa-sliders fa-fw"></i>', 'TaskGanttController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?>
                 <?php endif ?>
 
                 <?= $this->url->link('<i class="fa fa-list"></i>', 'TaskListController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('List')) ?>&nbsp;
diff --git a/app/Template/gantt/project.php b/app/Template/gantt/project.php
deleted file mode 100644
index e6c8592f..00000000
--- a/app/Template/gantt/project.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<section id="main">
-    <?= $this->projectHeader->render($project, 'Gantt', 'project') ?>
-    <div class="menu-inline">
-        <ul>
-            <li <?= $sorting === 'board' ? 'class="active"' : '' ?>>
-                <i class="fa fa-sort-numeric-asc fa-fw"></i>
-                <?= $this->url->link(t('Sort by position'), 'gantt', 'project', array('project_id' => $project['id'], 'sorting' => 'board')) ?>
-            </li>
-            <li <?= $sorting === 'date' ? 'class="active"' : '' ?>>
-                <i class="fa fa-sort-amount-asc fa-fw"></i>
-                <?= $this->url->link(t('Sort by date'), 'gantt', 'project', array('project_id' => $project['id'], 'sorting' => 'date')) ?>
-            </li>
-            <li>
-                <i class="fa fa-plus fa-fw"></i>
-                <?= $this->url->link(t('Add task'), 'gantt', 'task', array('project_id' => $project['id']), false, 'popover') ?>
-            </li>
-        </ul>
-    </div>
-
-    <?php if (! empty($tasks)): ?>
-        <div
-            id="gantt-chart"
-            data-records='<?= json_encode($tasks, JSON_HEX_APOS) ?>'
-            data-save-url="<?= $this->url->href('gantt', 'saveTaskDate', array('project_id' => $project['id'])) ?>"
-            data-label-start-date="<?= t('Start date:') ?>"
-            data-label-end-date="<?= t('Due date:') ?>"
-            data-label-assignee="<?= t('Assignee:') ?>"
-            data-label-not-defined="<?= t('There is no start date or due date for this task.') ?>"
-        ></div>
-        <p class="alert alert-info"><?= t('Moving or resizing a task will change the start and due date of the task.') ?></p>
-    <?php else: ?>
-        <p class="alert"><?= t('There is no task in your project.') ?></p>
-    <?php endif ?>
-</section>
\ No newline at end of file
diff --git a/app/Template/gantt/projects.php b/app/Template/gantt/projects.php
deleted file mode 100644
index 9241e372..00000000
--- a/app/Template/gantt/projects.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li>
-                <i class="fa fa-folder fa-fw"></i><?= $this->url->link(t('Projects list'), 'ProjectListController', 'show') ?>
-            </li>
-            <?php if ($this->user->hasAccess('ProjectUserOverviewController', 'managers')): ?>
-                <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'ProjectUserOverviewController', 'managers') ?></li>
-            <?php endif ?>
-        </ul>
-    </div>
-    <section>
-        <?php if (empty($projects)): ?>
-            <p class="alert"><?= t('No project') ?></p>
-        <?php else: ?>
-            <div
-                id="gantt-chart"
-                data-records='<?= json_encode($projects, JSON_HEX_APOS) ?>'
-                data-save-url="<?= $this->url->href('gantt', 'saveProjectDate') ?>"
-                data-label-project-manager="<?= t('Project managers') ?>"
-                data-label-project-member="<?= t('Project members') ?>"
-                data-label-gantt-link="<?= t('Gantt chart for this project') ?>"
-                data-label-board-link="<?= t('Project board') ?>"
-                data-label-start-date="<?= t('Start date:') ?>"
-                data-label-end-date="<?= t('End date:') ?>"
-                data-label-not-defined="<?= t('There is no start date or end date for this project.') ?>"
-            ></div>
-        <?php endif ?>
-    </section>
-</section>
diff --git a/app/Template/gantt/task_creation.php b/app/Template/gantt/task_creation.php
deleted file mode 100644
index 673bd019..00000000
--- a/app/Template/gantt/task_creation.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="page-header">
-    <h2><?= t('New task') ?></h2>
-</div>
-<form method="post" action="<?= $this->url->href('gantt', 'saveTask', array('project_id' => $values['project_id'])) ?>" autocomplete="off">
-    <?= $this->form->csrf() ?>
-    <?= $this->form->hidden('project_id', $values) ?>
-    <?= $this->form->hidden('column_id', $values) ?>
-    <?= $this->form->hidden('position', $values) ?>
-
-    <div class="form-column">
-        <?= $this->form->label(t('Title'), 'title') ?>
-        <?= $this->form->text('title', $values, $errors, array('autofocus', 'required', 'maxlength="200"', 'tabindex="1"'), 'form-input-large') ?>
-
-        <?= $this->form->label(t('Description'), 'description') ?>
-        <?= $this->form->textarea('description', $values, $errors, array('placeholder="'.t('Leave a description').'"', 'tabindex="2"'), 'markdown-editor') ?>
-
-        <?= $this->render('task/color_picker', array('colors_list' => $colors_list, 'values' => $values)) ?>
-    </div>
-
-    <div class="form-column">
-        <?= $this->task->selectAssignee($users_list, $values, $errors) ?>
-        <?= $this->task->selectCategory($categories_list, $values, $errors) ?>
-        <?= $this->task->selectSwimlane($swimlanes_list, $values, $errors) ?>
-        <?= $this->task->selectPriority($project, $values) ?>
-        <?= $this->task->selectScore($values, $errors) ?>
-        <?= $this->task->selectStartDate($values, $errors) ?>
-        <?= $this->task->selectDueDate($values, $errors) ?>
-    </div>
-
-    <div class="form-actions">
-        <button type="submit" class="btn btn-blue" tabindex="15"><?= t('Save') ?></button>
-        <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'BoardViewController', 'show', array('project_id' => $values['project_id']), false, 'close-popover') ?>
-    </div>
-</form>
diff --git a/app/Template/project/dropdown.php b/app/Template/project/dropdown.php
index c803384a..90dccf21 100644
--- a/app/Template/project/dropdown.php
+++ b/app/Template/project/dropdown.php
@@ -13,10 +13,10 @@
             <i class="fa fa-list fa-fw"></i>
             <?= $this->url->link(t('Listing'), 'TaskListController', 'show', array('project_id' => $project['id'])) ?>
         </li>
-        <?php if ($this->user->hasProjectAccess('Gantt', 'project', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('TaskGanttController', 'show', $project['id'])): ?>
         <li>
             <i class="fa fa-sliders fa-fw"></i>
-            <?= $this->url->link(t('Gantt'), 'gantt', 'project', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Gantt'), 'TaskGanttController', 'show', array('project_id' => $project['id'])) ?>
         </li>
         <?php endif ?>
 
diff --git a/app/Template/project_gantt/show.php b/app/Template/project_gantt/show.php
new file mode 100644
index 00000000..af22a6ed
--- /dev/null
+++ b/app/Template/project_gantt/show.php
@@ -0,0 +1,30 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <li>
+                <i class="fa fa-folder fa-fw"></i><?= $this->url->link(t('Projects list'), 'ProjectListController', 'show') ?>
+            </li>
+            <?php if ($this->user->hasAccess('ProjectUserOverviewController', 'managers')): ?>
+                <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'ProjectUserOverviewController', 'managers') ?></li>
+            <?php endif ?>
+        </ul>
+    </div>
+    <section>
+        <?php if (empty($projects)): ?>
+            <p class="alert"><?= t('No project') ?></p>
+        <?php else: ?>
+            <div
+                id="gantt-chart"
+                data-records='<?= json_encode($projects, JSON_HEX_APOS) ?>'
+                data-save-url="<?= $this->url->href('ProjectGanttController', 'save') ?>"
+                data-label-project-manager="<?= t('Project managers') ?>"
+                data-label-project-member="<?= t('Project members') ?>"
+                data-label-gantt-link="<?= t('Gantt chart for this project') ?>"
+                data-label-board-link="<?= t('Project board') ?>"
+                data-label-start-date="<?= t('Start date:') ?>"
+                data-label-end-date="<?= t('End date:') ?>"
+                data-label-not-defined="<?= t('There is no start date or end date for this project.') ?>"
+            ></div>
+        <?php endif ?>
+    </section>
+</section>
diff --git a/app/Template/project_header/views.php b/app/Template/project_header/views.php
index 53ca6fd8..3a41c91b 100644
--- a/app/Template/project_header/views.php
+++ b/app/Template/project_header/views.php
@@ -15,10 +15,10 @@
         <i class="fa fa-list fa-fw"></i>
         <?= $this->url->link(t('List'), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?>
     </li>
-    <?php if ($this->user->hasProjectAccess('gantt', 'project', $project['id'])): ?>
-    <li <?= $this->app->checkMenuSelection('Gantt') ?>>
+    <?php if ($this->user->hasProjectAccess('TaskGanttController', 'show', $project['id'])): ?>
+    <li <?= $this->app->checkMenuSelection('TaskGanttController') ?>>
         <i class="fa fa-sliders fa-fw"></i>
-        <?= $this->url->link(t('Gantt'), 'gantt', 'project', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-gantt', t('Keyboard shortcut: "%s"', 'v g')) ?>
+        <?= $this->url->link(t('Gantt'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-gantt', t('Keyboard shortcut: "%s"', 'v g')) ?>
     </li>
     <?php endif ?>
 </ul>
diff --git a/app/Template/project_list/show.php b/app/Template/project_list/show.php
index 75b5495f..8b9f1396 100644
--- a/app/Template/project_list/show.php
+++ b/app/Template/project_list/show.php
@@ -4,8 +4,8 @@
             <?php if ($this->user->hasAccess('ProjectUserOverviewController', 'managers')): ?>
                 <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'ProjectUserOverviewController', 'managers') ?></li>
             <?php endif ?>
-            <?php if ($this->user->hasAccess('gantt', 'projects')): ?>
-                <li><i class="fa fa-sliders fa-fw"></i><?= $this->url->link(t('Projects Gantt chart'), 'gantt', 'projects') ?></li>
+            <?php if ($this->user->hasAccess('ProjectGanttController', 'show')): ?>
+                <li><i class="fa fa-sliders fa-fw"></i><?= $this->url->link(t('Projects Gantt chart'), 'ProjectGanttController', 'show') ?></li>
             <?php endif ?>
         </ul>
     </div>
diff --git a/app/Template/project_user_overview/layout.php b/app/Template/project_user_overview/layout.php
index ab4326f6..19b83436 100644
--- a/app/Template/project_user_overview/layout.php
+++ b/app/Template/project_user_overview/layout.php
@@ -5,10 +5,10 @@
                 <i class="fa fa-folder fa-fw"></i>
                 <?= $this->url->link(t('Projects list'), 'ProjectListController', 'show') ?>
             </li>
-            <?php if ($this->user->hasAccess('gantt', 'projects')): ?>
+            <?php if ($this->user->hasAccess('ProjectGanttController', 'show')): ?>
                 <li>
                     <i class="fa fa-sliders fa-fw"></i>
-                    <?= $this->url->link(t('Projects Gantt chart'), 'gantt', 'projects') ?>
+                    <?= $this->url->link(t('Projects Gantt chart'), 'ProjectGanttController', 'show') ?>
                 </li>
             <?php endif ?>
         </ul>
diff --git a/app/Template/project_user_overview/roles.php b/app/Template/project_user_overview/roles.php
index 39412aab..87c8df85 100644
--- a/app/Template/project_user_overview/roles.php
+++ b/app/Template/project_user_overview/roles.php
@@ -14,7 +14,7 @@
             </td>
             <td>
                 <?= $this->url->link('<i class="fa fa-th"></i>', 'BoardViewController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Board')) ?>
-                <?= $this->url->link('<i class="fa fa-sliders fa-fw"></i>', 'gantt', 'project', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?>
+                <?= $this->url->link('<i class="fa fa-sliders fa-fw"></i>', 'TaskGanttController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?>
                 <?= $this->url->link('<i class="fa fa-cog fa-fw"></i>', 'ProjectViewController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Project settings')) ?>
 
                 <?= $this->text->e($project['project_name']) ?>
diff --git a/app/Template/task_gantt/show.php b/app/Template/task_gantt/show.php
new file mode 100644
index 00000000..c5d338fb
--- /dev/null
+++ b/app/Template/task_gantt/show.php
@@ -0,0 +1,34 @@
+<section id="main">
+    <?= $this->projectHeader->render($project, 'TaskGanttController', 'show') ?>
+    <div class="menu-inline">
+        <ul>
+            <li <?= $sorting === 'board' ? 'class="active"' : '' ?>>
+                <i class="fa fa-sort-numeric-asc fa-fw"></i>
+                <?= $this->url->link(t('Sort by position'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'sorting' => 'board')) ?>
+            </li>
+            <li <?= $sorting === 'date' ? 'class="active"' : '' ?>>
+                <i class="fa fa-sort-amount-asc fa-fw"></i>
+                <?= $this->url->link(t('Sort by date'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'sorting' => 'date')) ?>
+            </li>
+            <li>
+                <i class="fa fa-plus fa-fw"></i>
+                <?= $this->url->link(t('Add task'), 'TaskGanttCreationController', 'show', array('project_id' => $project['id']), false, 'popover') ?>
+            </li>
+        </ul>
+    </div>
+
+    <?php if (! empty($tasks)): ?>
+        <div
+            id="gantt-chart"
+            data-records='<?= json_encode($tasks, JSON_HEX_APOS) ?>'
+            data-save-url="<?= $this->url->href('TaskGanttController', 'save', array('project_id' => $project['id'])) ?>"
+            data-label-start-date="<?= t('Start date:') ?>"
+            data-label-end-date="<?= t('Due date:') ?>"
+            data-label-assignee="<?= t('Assignee:') ?>"
+            data-label-not-defined="<?= t('There is no start date or due date for this task.') ?>"
+        ></div>
+        <p class="alert alert-info"><?= t('Moving or resizing a task will change the start and due date of the task.') ?></p>
+    <?php else: ?>
+        <p class="alert"><?= t('There is no task in your project.') ?></p>
+    <?php endif ?>
+</section>
diff --git a/app/Template/task_gantt_creation/show.php b/app/Template/task_gantt_creation/show.php
new file mode 100644
index 00000000..683bc8c8
--- /dev/null
+++ b/app/Template/task_gantt_creation/show.php
@@ -0,0 +1,35 @@
+<div class="page-header">
+    <h2><?= t('New task') ?></h2>
+</div>
+<form method="post" action="<?= $this->url->href('TaskGanttCreationController', 'save', array('project_id' => $values['project_id'])) ?>" autocomplete="off">
+    <?= $this->form->csrf() ?>
+    <?= $this->form->hidden('project_id', $values) ?>
+    <?= $this->form->hidden('column_id', $values) ?>
+    <?= $this->form->hidden('position', $values) ?>
+
+    <div class="form-column">
+        <?= $this->form->label(t('Title'), 'title') ?>
+        <?= $this->form->text('title', $values, $errors, array('autofocus', 'required', 'maxlength="200"', 'tabindex="1"'), 'form-input-large') ?>
+
+        <?= $this->form->label(t('Description'), 'description') ?>
+        <?= $this->form->textarea('description', $values, $errors, array('placeholder="'.t('Leave a description').'"', 'tabindex="2"'), 'markdown-editor') ?>
+
+        <?= $this->render('task/color_picker', array('colors_list' => $colors_list, 'values' => $values)) ?>
+    </div>
+
+    <div class="form-column">
+        <?= $this->task->selectAssignee($users_list, $values, $errors) ?>
+        <?= $this->task->selectCategory($categories_list, $values, $errors) ?>
+        <?= $this->task->selectSwimlane($swimlanes_list, $values, $errors) ?>
+        <?= $this->task->selectPriority($project, $values) ?>
+        <?= $this->task->selectScore($values, $errors) ?>
+        <?= $this->task->selectStartDate($values, $errors) ?>
+        <?= $this->task->selectDueDate($values, $errors) ?>
+    </div>
+
+    <div class="form-actions">
+        <button type="submit" class="btn btn-blue" tabindex="15"><?= t('Save') ?></button>
+        <?= t('or') ?>
+        <?= $this->url->link(t('cancel'), 'TaskGanttController', 'show', array('project_id' => $values['project_id']), false, 'close-popover') ?>
+    </div>
+</form>
-- 
cgit v1.2.3