From 26492aba7ee2bfb8c525ea0aaa580aff47a414ba Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 31 Jan 2016 21:44:49 -0500
Subject: Simplify layout and templates generation

---
 app/Template/analytic/layout.php     | 2 +-
 app/Template/app/layout.php          | 2 +-
 app/Template/config/layout.php       | 4 ++--
 app/Template/config/sidebar.php      | 3 ---
 app/Template/project/layout.php      | 2 +-
 app/Template/project_user/layout.php | 2 +-
 app/Template/task/details.php        | 2 +-
 app/Template/task/layout.php         | 4 ++--
 app/Template/user/layout.php         | 2 +-
 9 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'app/Template')

diff --git a/app/Template/analytic/layout.php b/app/Template/analytic/layout.php
index ff532fc0..4f22db10 100644
--- a/app/Template/analytic/layout.php
+++ b/app/Template/analytic/layout.php
@@ -33,7 +33,7 @@
     </div>
     <section class="sidebar-container" id="analytic-section">
 
-        <?= $this->render('analytic/sidebar', array('project' => $project)) ?>
+        <?= $this->render($sidebar_template, array('project' => $project)) ?>
 
         <div class="sidebar-content">
             <?= $content_for_sublayout ?>
diff --git a/app/Template/app/layout.php b/app/Template/app/layout.php
index d54b1da7..0550cef4 100644
--- a/app/Template/app/layout.php
+++ b/app/Template/app/layout.php
@@ -22,7 +22,7 @@
         </ul>
     </div>
     <section class="sidebar-container" id="dashboard">
-        <?= $this->render('app/sidebar', array('user' => $user)) ?>
+        <?= $this->render($sidebar_template, array('user' => $user)) ?>
         <div class="sidebar-content">
             <?= $content_for_sublayout ?>
         </div>
diff --git a/app/Template/config/layout.php b/app/Template/config/layout.php
index 028f138c..f34caaab 100644
--- a/app/Template/config/layout.php
+++ b/app/Template/config/layout.php
@@ -1,10 +1,10 @@
 <section id="main">
     <section class="sidebar-container" id="config-section">
 
-        <?= $this->render('config/sidebar') ?>
+        <?= $this->render($sidebar_template) ?>
 
         <div class="sidebar-content">
-            <?= $config_content_for_layout ?>
+            <?= $content_for_sublayout ?>
         </div>
     </section>
 </section>
\ No newline at end of file
diff --git a/app/Template/config/sidebar.php b/app/Template/config/sidebar.php
index a8174505..1b42bcc1 100644
--- a/app/Template/config/sidebar.php
+++ b/app/Template/config/sidebar.php
@@ -34,9 +34,6 @@
         <li <?= $this->app->checkMenuSelection('config', 'api') ?>>
             <?= $this->url->link(t('API'), 'config', 'api') ?>
         </li>
-        <li>
-            <?= $this->url->link(t('Documentation'), 'doc', 'show') ?>
-        </li>
         <?= $this->hook->render('template:config:sidebar') ?>
     </ul>
     <div class="sidebar-collapse"><a href="#" title="<?= t('Hide sidebar') ?>"><i class="fa fa-chevron-left"></i></a></div>
diff --git a/app/Template/project/layout.php b/app/Template/project/layout.php
index 8ba92ef9..eb391ae5 100644
--- a/app/Template/project/layout.php
+++ b/app/Template/project/layout.php
@@ -30,7 +30,7 @@
         <?= $this->render($sidebar_template, array('project' => $project)) ?>
 
         <div class="sidebar-content">
-            <?= $project_content_for_layout ?>
+            <?= $content_for_sublayout ?>
         </div>
     </section>
 </section>
\ No newline at end of file
diff --git a/app/Template/project_user/layout.php b/app/Template/project_user/layout.php
index a87efbff..3ced5590 100644
--- a/app/Template/project_user/layout.php
+++ b/app/Template/project_user/layout.php
@@ -15,7 +15,7 @@
     </div>
     <section class="sidebar-container">
 
-        <?= $this->render('project_user/sidebar', array('users' => $users, 'filter' => $filter)) ?>
+        <?= $this->render($sidebar_template, array('users' => $users, 'filter' => $filter)) ?>
 
         <div class="sidebar-content">
             <div class="page-header">
diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index d885ca9c..2e70e561 100644
--- a/app/Template/task/details.php
+++ b/app/Template/task/details.php
@@ -1,5 +1,5 @@
 <div class="color-<?= $task['color_id'] ?> task-show-details">
-    <h2><?= $this->e('#'.$task['id'].' '.$task['title']) ?></h2>
+    <h2><?= $this->e($task['title']) ?></h2>
     <?php if ($task['score']): ?>
         <span class="task-score"><?= $this->e($task['score']) ?></span>
     <?php endif ?>
diff --git a/app/Template/task/layout.php b/app/Template/task/layout.php
index 9fe1a716..09dbb2ea 100644
--- a/app/Template/task/layout.php
+++ b/app/Template/task/layout.php
@@ -19,10 +19,10 @@
     </div>
     <section class="sidebar-container" id="task-section">
 
-        <?= $this->render('task/sidebar', array('task' => $task)) ?>
+        <?= $this->render($sidebar_template, array('task' => $task)) ?>
 
         <div class="sidebar-content">
-            <?= $task_content_for_layout ?>
+            <?= $content_for_sublayout ?>
         </div>
     </section>
 </section>
\ No newline at end of file
diff --git a/app/Template/user/layout.php b/app/Template/user/layout.php
index 1e456348..3a0a5ba6 100644
--- a/app/Template/user/layout.php
+++ b/app/Template/user/layout.php
@@ -13,7 +13,7 @@
         <?= $this->render('user/sidebar', array('user' => $user)) ?>
 
         <div class="sidebar-content">
-            <?= $user_content_for_layout ?>
+            <?= $content_for_sublayout ?>
         </div>
     </section>
 </section>
\ No newline at end of file
-- 
cgit v1.2.3