summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2016-05-15 12:33:44 -0400
committerFrederic Guillot <fred@kanboard.net>2016-05-15 12:33:44 -0400
commitc15c4ba0f40926a3320ddf4567692f339b7e45ef (patch)
tree40a688fd3c1c16901a070a1540c1377ad6d3c46c /app
parent68c087e85cb1678172478d67d106c239ccb2d878 (diff)
Use latest hipster tools to manage assets
Diffstat (limited to 'app')
-rw-r--r--app/Template/analytic/layout.php3
-rw-r--r--app/Template/layout.php15
-rw-r--r--app/Template/task/analytics.php3
3 files changed, 8 insertions, 13 deletions
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