From 948ebb242490092c5a7e187c3b7813134b047d5e Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Tue, 23 Jun 2015 20:47:46 -0400
Subject: Improve assets loading: remove http call to load task colors and
 async load of app.js

---
 app/Template/analytic/layout.php | 8 ++++----
 app/Template/budget/index.php    | 6 +++---
 app/Template/layout.php          | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'app/Template')

diff --git a/app/Template/analytic/layout.php b/app/Template/analytic/layout.php
index 72aab4d8..41c6a2ab 100644
--- a/app/Template/analytic/layout.php
+++ b/app/Template/analytic/layout.php
@@ -1,6 +1,3 @@
-<?= $this->asset->js('assets/js/vendor/d3.v3.min.js') ?>
-<?= $this->asset->js('assets/js/vendor/c3.min.js') ?>
-
 <section id="main">
     <div class="page-header">
         <ul>
@@ -32,4 +29,7 @@
             <?= $content_for_sublayout ?>
         </div>
     </section>
-</section>
\ No newline at end of file
+</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/budget/index.php b/app/Template/budget/index.php
index 3b594017..80153bbd 100644
--- a/app/Template/budget/index.php
+++ b/app/Template/budget/index.php
@@ -1,6 +1,3 @@
-<?= $this->asset->js('assets/js/vendor/d3.v3.min.js') ?>
-<?= $this->asset->js('assets/js/vendor/c3.min.js') ?>
-
 <div class="page-header">
     <h2><?= t('Budget overview') ?></h2>
 </div>
@@ -32,3 +29,6 @@
 <?php else: ?>
     <p class="alert"><?= t('There is not enough data to show something.') ?></p>
 <?php endif ?>
+
+<?= $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 0d9326f4..c630132d 100644
--- a/app/Template/layout.php
+++ b/app/Template/layout.php
@@ -12,12 +12,12 @@
         <?php endif ?>
 
         <?php if (! isset($not_editable)): ?>
-            <?= $this->asset->js('assets/js/app.js') ?>
+            <?= $this->asset->js('assets/js/app.js', true) ?>
         <?php endif ?>
 
-        <?= $this->asset->css($this->url->href('app', 'colors'), false, 'all') ?>
         <?= $this->asset->css('assets/css/app.css') ?>
         <?= $this->asset->css('assets/css/print.css', true, 'print') ?>
+        <?= $this->asset->colorCss() ?>
         <?= $this->asset->customCss() ?>
 
         <link rel="icon" type="image/png" href="assets/img/favicon.png">
-- 
cgit v1.2.3