From c15c4ba0f40926a3320ddf4567692f339b7e45ef Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 15 May 2016 12:33:44 -0400
Subject: Use latest hipster tools to manage assets

---
 app/Template/analytic/layout.php |  3 ---
 app/Template/layout.php          | 15 ++++++++-------
 app/Template/task/analytics.php  |  3 ---
 3 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'app')

diff --git a/app/Template/analytic/layout.php b/app/Template/analytic/layout.php
index 35793cbb..e9b9db61 100644
--- a/app/Template/analytic/layout.php
+++ b/app/Template/analytic/layout.php
@@ -8,6 +8,3 @@
         </div>
     </section>
 </section>
-
-<?= $this->asset->js('assets/js/vendor/d3.v3.min.js') ?>
-<?= $this->asset->js('assets/js/vendor/c3.min.js') ?>
\ No newline at end of file
diff --git a/app/Template/layout.php b/app/Template/layout.php
index 56bbe147..811da9db 100644
--- a/app/Template/layout.php
+++ b/app/Template/layout.php
@@ -12,13 +12,10 @@
             <meta http-equiv="refresh" content="<?= $board_public_refresh_interval ?>">
         <?php endif ?>
 
-        <?php if (! isset($not_editable)): ?>
-            <?= $this->asset->js('assets/js/app.js') ?>
-        <?php endif ?>
-
         <?= $this->asset->colorCss() ?>
-        <?= $this->asset->css('assets/css/app.css') ?>
-        <?= $this->asset->css('assets/css/print.css', true, 'print') ?>
+        <?= $this->asset->css('assets/css/vendor.min.css') ?>
+        <?= $this->asset->css('assets/css/app.min.css') ?>
+        <?= $this->asset->css('assets/css/print.min.css', true, 'print') ?>
         <?= $this->asset->customCss() ?>
 
         <?= $this->hook->asset('css', 'template:layout:css') ?>
@@ -62,6 +59,10 @@
             <?= $content_for_layout ?>
         </section>
         <?= $this->hook->render('template:layout:bottom') ?>
-     <?php endif ?>
+    <?php endif ?>
+    <?php if (! isset($not_editable)): ?>
+        <?= $this->asset->js('assets/js/vendor.min.js') ?>
+        <?= $this->asset->js('assets/js/app.min.js') ?>
+    <?php endif ?>
     </body>
 </html>
diff --git a/app/Template/task/analytics.php b/app/Template/task/analytics.php
index 54eac2b7..db2d0cef 100644
--- a/app/Template/task/analytics.php
+++ b/app/Template/task/analytics.php
@@ -34,6 +34,3 @@
         <li><?= t('If the task is not closed the current time is used instead of the completion date.') ?></li>
     </ul>
 </div>
-
-<?= $this->asset->js('assets/js/vendor/d3.v3.min.js') ?>
-<?= $this->asset->js('assets/js/vendor/c3.min.js') ?>
\ No newline at end of file
-- 
cgit v1.2.3