From 73944ae3687525eb7fafa0a0de2b919b51974542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= <fred@kanboard.net>
Date: Tue, 27 May 2014 10:07:59 -0400
Subject: [PATCH] Improve assets loading (add helpers)

---
 app/Templates/board_index.php |  2 +-
 app/Templates/layout.php      | 10 +++++-----
 app/Templates/task_layout.php |  3 ++-
 app/helpers.php               | 10 ++++++++++
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/Templates/board_index.php b/app/Templates/board_index.php
index 8e6642198..38fb985c1 100644
--- a/app/Templates/board_index.php
+++ b/app/Templates/board_index.php
@@ -39,4 +39,4 @@
 
 </section>
 
-<script type="text/javascript" src="assets/js/board.js"></script>
+<?= Helper\js('assets/js/board.js') ?>
diff --git a/app/Templates/layout.php b/app/Templates/layout.php
index 0bb8446de..3e3b2e89f 100644
--- a/app/Templates/layout.php
+++ b/app/Templates/layout.php
@@ -6,12 +6,12 @@
         <meta name="viewport" content="width=device-width">
         <meta name="mobile-web-app-capable" content="yes">
 
-        <script src="assets/js/jquery-1.11.1.min.js"></script>
-        <script src="assets/js/jquery-ui-1.10.4.custom.min.js"></script>
-        <script src="assets/js/jquery.ui.touch-punch.min.js"></script>
+        <?= Helper\js('assets/js/jquery-1.11.1.min.js') ?>
+        <?= Helper\js('assets/js/jquery-ui-1.10.4.custom.min.js') ?>
+        <?= Helper\js('assets/js/jquery.ui.touch-punch.min.js') ?>
 
-        <link rel="stylesheet" href="assets/css/app.css" media="screen">
-        <link rel="stylesheet" href="assets/css/font-awesome.min.css" media="screen">
+        <?= Helper\css('assets/css/app.css') ?>
+        <?= Helper\css('assets/css/font-awesome.min.css') ?>
 
         <link rel="icon" type="image/png" href="assets/img/favicon.png">
         <link rel="apple-touch-icon" href="assets/img/touch-icon-iphone.png">
diff --git a/app/Templates/task_layout.php b/app/Templates/task_layout.php
index ce5f36c57..cc711b78f 100644
--- a/app/Templates/task_layout.php
+++ b/app/Templates/task_layout.php
@@ -14,4 +14,5 @@
         </div>
     </section>
 </section>
-<script type="text/javascript" src="assets/js/task.js"></script>
\ No newline at end of file
+
+<?= Helper\js('assets/js/task.js') ?>
diff --git a/app/helpers.php b/app/helpers.php
index 2dcb38e87..d22a48693 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -2,6 +2,16 @@
 
 namespace Helper;
 
+function js($filename)
+{
+    return '<script type="text/javascript" src="'.$filename.'?'.filemtime($filename).'"></script>';
+}
+
+function css($filename)
+{
+    return '<link rel="stylesheet" href="'.$filename.'?'.filemtime($filename).'" media="screen">';
+}
+
 function template($name, array $args = array())
 {
     $tpl = new \Core\Template;