Refactoring to implement new layout with filters: board/calendar/list views (work in progress)

4 files changed, 56 insertions, 15 deletions

diff --git a/app/Template/project/dropdown.php b/app/Template/project/dropdown.php
index 2e2650a7..aa4322e6 100644
--- a/app/Template/project/dropdown.php
+++ b/app/Template/project/dropdown.php
@@ -1,18 +1,6 @@
 <li>
-    <i class="fa fa-search fa-fw"></i>
-    <?= $this->url->link(t('Search'), 'projectinfo', 'search', array('project_id' => $project['id'])) ?>
-</li>
-<li>
-    <i class="fa fa-check-square-o fa-fw"></i>
-    <?= $this->url->link(t('Completed tasks'), 'projectinfo', 'tasks', array('project_id' => $project['id'])) ?>
-</li>
-<li>
     <i class="fa fa-dashboard fa-fw"></i>
-    <?= $this->url->link(t('Activity'), 'projectinfo', 'activity', array('project_id' => $project['id'])) ?>
-</li>
-<li>
-    <i class="fa fa-calendar fa-fw"></i>
-    <?= $this->url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'])) ?>
+    <?= $this->url->link(t('Activity'), 'activity', 'project', array('project_id' => $project['id'])) ?>
 </li>
 
 <?php if ($project['is_public']): ?>
diff --git a/app/Template/project/filters.php b/app/Template/project/filters.php
new file mode 100644
index 00000000..402807d7
--- /dev/null
+++ b/app/Template/project/filters.php
@@ -0,0 +1,49 @@
+<div class="page-header">
+    <div class="dropdown">
+        <span>
+            <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Actions') ?></a>
+            <ul>
+                <?php if (isset($is_board)): ?>
+                <li>
+                    <span class="filter-collapse">
+                        <i class="fa fa-compress fa-fw"></i> <a href="#" class="filter-collapse-link"><?= t('Collapse tasks') ?></a>
+                    </span>
+                    <span class="filter-expand" style="display: none">
+                        <i class="fa fa-expand fa-fw"></i> <a href="#" class="filter-expand-link"><?= t('Expand tasks') ?></a>
+                    </span>
+                </li>
+                <li>
+                    <span class="filter-compact">
+                        <i class="fa fa-th fa-fw"></i> <a href="#" class="filter-toggle-scrolling"><?= t('Compact view') ?></a>
+                    </span>
+                    <span class="filter-wide" style="display: none">
+                        <i class="fa fa-arrows-h fa-fw"></i> <a href="#" class="filter-toggle-scrolling"><?= t('Horizontal scrolling') ?></a>
+                    </span>
+                </li>
+                <?php endif ?>
+                <?= $this->render('project/dropdown', array('project' => $project)) ?>
+            </ul>
+        </span>
+    </div>
+    <ul class="views">
+        <li <?= $filters['controller'] === 'board' ? 'class="active"' : '' ?>>
+            <i class="fa fa-th fa-fw"></i>
+            <?= $this->url->link(t('Board'), 'board', 'show', array('project_id' => $project['id'], 'search' => $filters['search'])) ?>
+        </li>
+        <li <?= $filters['controller'] === 'calendar' ? 'class="active"' : '' ?>>
+            <i class="fa fa-calendar fa-fw"></i>
+            <?= $this->url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'], 'search' => $filters['search'])) ?>
+        </li>
+        <li <?= $filters['controller'] === 'listing' ? 'class="active"' : '' ?>>
+            <i class="fa fa-list fa-fw"></i>
+            <?= $this->url->link(t('List'), 'listing', 'show', array('project_id' => $project['id'], 'search' => $filters['search'])) ?>
+        </li>
+    </ul>
+    <form method="get" action="?" class="search">
+        <?= $this->form->hidden('project_id', $filters) ?>
+        <?= $this->form->hidden('controller', $filters) ?>
+        <?= $this->form->hidden('action', $filters) ?>
+        <?= $this->form->text('search', $filters, array(), array('placeholder="'.t('Filter').'"'), 'form-input-large') ?>
+    </form>
+
+</div>
\ No newline at end of file
diff --git a/app/Template/project/index.php b/app/Template/project/index.php
index 1080968e..7a03ec16 100644
--- a/app/Template/project/index.php
+++ b/app/Template/project/index.php
@@ -35,7 +35,7 @@
                         <?= $this->e($project['identifier']) ?>
                     </td>
                     <td>
-                        <?= $this->url->link('<i class="fa fa-table"></i>', 'board', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Board')) ?>&nbsp;
+                        <?= $this->url->link('<i class="fa fa-th"></i>', 'board', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Board')) ?>&nbsp;
 
                         <?php if ($project['is_public']): ?>
                             <i class="fa fa-share-alt fa-fw"></i>
diff --git a/app/Template/project/layout.php b/app/Template/project/layout.php
index 7bb3d478..8ba92ef9 100644
--- a/app/Template/project/layout.php
+++ b/app/Template/project/layout.php
@@ -12,10 +12,14 @@
             </span>
         </li>
             <li>
-                <i class="fa fa-table fa-fw"></i>
+                <i class="fa fa-th fa-fw"></i>
                 <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?>
             </li>
             <li>
+                <i class="fa fa-calendar fa-fw"></i>
+                <?= $this->url->link(t('Back to the calendar'), 'calendar', '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>