From 253d5a9331e4b4775066ec8cb9664da9a2aa6ac9 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 1 Apr 2017 15:43:36 -0400
Subject: Move calendar to external plugin

---
 app/Template/calendar/project.php          |  6 -----
 app/Template/calendar/user.php             |  4 ----
 app/Template/config/calendar.php           | 36 ------------------------------
 app/Template/config/keyboard_shortcuts.php |  1 -
 app/Template/config/sidebar.php            |  3 ---
 app/Template/dashboard/show.php            |  4 +---
 app/Template/project/dropdown.php          |  3 ---
 app/Template/project_header/views.php      |  4 +---
 8 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 app/Template/calendar/project.php
 delete mode 100644 app/Template/calendar/user.php
 delete mode 100644 app/Template/config/calendar.php

(limited to 'app/Template')

diff --git a/app/Template/calendar/project.php b/app/Template/calendar/project.php
deleted file mode 100644
index 769e019b..00000000
--- a/app/Template/calendar/project.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?= $this->projectHeader->render($project, 'CalendarController', 'show') ?>
-
-<?= $this->calendar->render(
-    $this->url->href('CalendarController', 'projectEvents', array('project_id' => $project['id'])),
-    $this->url->href('CalendarController', 'save', array('project_id' => $project['id']))
-) ?>
diff --git a/app/Template/calendar/user.php b/app/Template/calendar/user.php
deleted file mode 100644
index c68bd32d..00000000
--- a/app/Template/calendar/user.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?= $this->calendar->render(
-    $this->url->href('CalendarController', 'userEvents', array('user_id' => $user['id'])),
-    $this->url->href('CalendarController', 'save')
-) ?>
diff --git a/app/Template/config/calendar.php b/app/Template/config/calendar.php
deleted file mode 100644
index 0cc3d064..00000000
--- a/app/Template/config/calendar.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Calendar settings') ?></h2>
-</div>
-<form method="post" action="<?= $this->url->href('ConfigController', 'save', array('redirect' => 'calendar')) ?>" autocomplete="off">
-
-    <?= $this->form->csrf() ?>
-
-    <fieldset>
-        <legend><?= t('Project calendar view') ?></legend>
-        <?= $this->form->radios('calendar_project_tasks', array(
-                'date_creation' => t('Show tasks based on the creation date'),
-                'date_started' => t('Show tasks based on the start date'),
-            ),
-            $values
-        ) ?>
-    </fieldset>
-
-    <fieldset>
-        <legend><?= t('User calendar view') ?></legend>
-        <?= $this->form->radios('calendar_user_tasks', array(
-                'date_creation' => t('Show tasks based on the creation date'),
-                'date_started' => t('Show tasks based on the start date'),
-            ),
-            $values
-        ) ?>
-    </fieldset>
-
-    <fieldset>
-        <legend><?= t('Subtasks time tracking') ?></legend>
-        <?= $this->form->checkbox('calendar_user_subtasks_time_tracking', t('Show subtasks based on the time tracking'), 1, $values['calendar_user_subtasks_time_tracking'] == 1) ?>
-    </fieldset>
-
-    <div class="form-actions">
-        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-    </div>
-</form>
diff --git a/app/Template/config/keyboard_shortcuts.php b/app/Template/config/keyboard_shortcuts.php
index 6ac71ee0..ed9ea541 100644
--- a/app/Template/config/keyboard_shortcuts.php
+++ b/app/Template/config/keyboard_shortcuts.php
@@ -6,7 +6,6 @@
     <ul>
         <li><?= t('Switch to the project overview') ?> = <strong>v o</strong></li>
         <li><?= t('Switch to the board view') ?> = <strong>v b</strong></li>
-        <li><?= t('Switch to the calendar view') ?> = <strong>v c</strong></li>
         <li><?= t('Switch to the list view') ?> = <strong>v l</strong></li>
         <li><?= t('Switch to the Gantt chart view') ?> = <strong>v g</strong></li>
     </ul>
diff --git a/app/Template/config/sidebar.php b/app/Template/config/sidebar.php
index 95be963b..2f265ed2 100644
--- a/app/Template/config/sidebar.php
+++ b/app/Template/config/sidebar.php
@@ -15,9 +15,6 @@
         <li <?= $this->app->checkMenuSelection('ConfigController', 'board') ?>>
             <?= $this->url->link(t('Board settings'), 'ConfigController', 'board') ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('ConfigController', 'calendar') ?>>
-            <?= $this->url->link(t('Calendar settings'), 'ConfigController', 'calendar') ?>
-        </li>
         <li <?= $this->app->checkMenuSelection('TagController', 'index') ?>>
             <?= $this->url->link(t('Tags management'), 'TagController', 'index') ?>
         </li>
diff --git a/app/Template/dashboard/show.php b/app/Template/dashboard/show.php
index 2cc78e3f..64b90516 100644
--- a/app/Template/dashboard/show.php
+++ b/app/Template/dashboard/show.php
@@ -16,9 +16,7 @@
         <li>
             <?= $this->modal->medium('dashboard', t('My activity stream'), 'ActivityController', 'user') ?>
         </li>
-        <li>
-            <?= $this->modal->medium('calendar', t('My calendar'), 'CalendarController', 'user') ?>
-        </li>
+        <?= $this->hook->render('template:dashboard:page-header:menu', array('user' => $user)) ?>
     </ul>
 </div>
 
diff --git a/app/Template/project/dropdown.php b/app/Template/project/dropdown.php
index 72c687a1..39cb985c 100644
--- a/app/Template/project/dropdown.php
+++ b/app/Template/project/dropdown.php
@@ -4,9 +4,6 @@
         <li>
             <?= $this->url->icon('th', t('Board'), 'BoardViewController', 'show', array('project_id' => $project['id'])) ?>
         </li>
-        <li>
-            <?= $this->url->icon('calendar', t('Calendar'), 'CalendarController', 'show', array('project_id' => $project['id'])) ?>
-        </li>
         <li>
             <?= $this->url->icon('list', t('Listing'), 'TaskListController', 'show', array('project_id' => $project['id'])) ?>
         </li>
diff --git a/app/Template/project_header/views.php b/app/Template/project_header/views.php
index 2684c744..f200801a 100644
--- a/app/Template/project_header/views.php
+++ b/app/Template/project_header/views.php
@@ -5,9 +5,6 @@
     <li <?= $this->app->checkMenuSelection('BoardViewController') ?>>
         <?= $this->url->icon('th', t('Board'), 'BoardViewController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-board', t('Keyboard shortcut: "%s"', 'v b')) ?>
     </li>
-    <li <?= $this->app->checkMenuSelection('CalendarController') ?>>
-        <?= $this->url->icon('calendar', t('Calendar'), 'CalendarController', 'project', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?>
-    </li>
     <li <?= $this->app->checkMenuSelection('TaskListController') ?>>
         <?= $this->url->icon('list', t('List'), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?>
     </li>
@@ -16,4 +13,5 @@
         <?= $this->url->icon('sliders', t('Gantt'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-gantt', t('Keyboard shortcut: "%s"', 'v g')) ?>
     </li>
     <?php endif ?>
+    <?= $this->hook->render('template:project-header:view-switcher', array('project' => $project, 'filters' => $filters)) ?>
 </ul>
-- 
cgit v1.2.3