From 554500aa493faa66b43b2ddce72338880a874724 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 4 Jul 2015 11:14:21 -0400
Subject: Refactoring to implement new layout with filters: board/calendar/list
 views (work in progress)

---
 app/Template/calendar/show.php    | 53 ++++++++-------------------------------
 app/Template/calendar/sidebar.php | 40 -----------------------------
 2 files changed, 10 insertions(+), 83 deletions(-)
 delete mode 100644 app/Template/calendar/sidebar.php

(limited to 'app/Template/calendar')

diff --git a/app/Template/calendar/show.php b/app/Template/calendar/show.php
index cf2a20ec..0406414c 100644
--- a/app/Template/calendar/show.php
+++ b/app/Template/calendar/show.php
@@ -1,46 +1,13 @@
 <section id="main">
-    <div class="page-header">
-        <ul>
-            <li>
-            <span class="dropdown">
-                <span>
-                    <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Actions') ?></a>
-                    <ul>
-                        <?= $this->render('project/dropdown', array('project' => $project)) ?>
-                    </ul>
-                </span>
-            </span>
-        </li>
-            <li>
-                <i class="fa fa-table fa-fw"></i>
-                <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?>
-            </li>
-            <li>
-                <i class="fa fa-folder fa-fw"></i>
-                <?= $this->url->link(t('All projects'), 'project', 'index') ?>
-            </li>
-        </ul>
-    </div>
-    <section class="sidebar-container">
-
-        <?= $this->render('calendar/sidebar', array(
-            'project' => $project,
-            'users_list' => $users_list,
-            'categories_list' => $categories_list,
-            'columns_list' => $columns_list,
-            'swimlanes_list' => $swimlanes_list,
-            'colors_list' => $colors_list,
-            'status_list' => $status_list
-        )) ?>
+    <?= $this->render('project/filters', array(
+        'project' => $project,
+        'filters' => $filters,
+    )) ?>
 
-        <div class="sidebar-content">
-            <div id="calendar"
-                 data-project-id="<?= $project['id'] ?>"
-                 data-save-url="<?= $this->url->href('calendar', 'save') ?>"
-                 data-check-url="<?= $this->url->href('calendar', 'project', array('project_id' => $project['id'])) ?>"
-                 data-check-interval="<?= $check_interval ?>"
-            >
-            </div>
-        </div>
-    </section>
+    <div id="calendar"
+         data-save-url="<?= $this->url->href('calendar', 'save') ?>"
+         data-check-url="<?= $this->url->href('calendar', 'project', array('project_id' => $project['id'])) ?>"
+         data-check-interval="<?= $check_interval ?>"
+    >
+    </div>
 </section>
\ No newline at end of file
diff --git a/app/Template/calendar/sidebar.php b/app/Template/calendar/sidebar.php
deleted file mode 100644
index 6c4fb5b0..00000000
--- a/app/Template/calendar/sidebar.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="sidebar">
-    <ul class="no-bullet">
-        <li>
-            <?= t('Filter by user') ?>
-        </li>
-        <li>
-            <?= $this->form->select('owner_id', $users_list, array(), array(), array(), 'calendar-filter') ?>
-        </li>
-        <li>
-            <?= t('Filter by category') ?>
-        </li>
-        <li>
-            <?= $this->form->select('category_id', $categories_list, array(), array(), array(), 'calendar-filter') ?>
-        </li>
-        <li>
-            <?= t('Filter by column') ?>
-        </li>
-        <li>
-            <?= $this->form->select('column_id', $columns_list, array(), array(), array(), 'calendar-filter') ?>
-        </li>
-        <li>
-            <?= t('Filter by swimlane') ?>
-        </li>
-        <li>
-            <?= $this->form->select('swimlane_id', $swimlanes_list, array(), array(), array(), 'calendar-filter') ?>
-        </li>
-        <li>
-            <?= t('Filter by color') ?>
-        </li>
-        <li>
-            <?= $this->form->select('color_id', $colors_list, array(), array(), array(), 'calendar-filter') ?>
-        </li>
-        <li>
-            <?= t('Filter by status') ?>
-        </li>
-        <li>
-            <?= $this->form->select('is_active', $status_list, array(), array(), array(), 'calendar-filter') ?>
-        </li>
-    </ul>
-</div>
-- 
cgit v1.2.3