From 20cdea101fbd75e232b929d2f3e1cb788a0afb2c Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Mon, 29 Aug 2016 10:40:03 +0800
Subject: [PATCH] use helper function to generate absolute assets url

---
 resources/views/admin/master.tpl         | 10 +++++-----
 resources/views/auth/master.tpl          | 11 ++++++-----
 resources/views/index.tpl                |  8 ++++----
 resources/views/setup/updates/master.tpl |  2 +-
 resources/views/skinlib/master.tpl       | 10 +++++-----
 resources/views/user/master.tpl          | 10 +++++-----
 resources/views/vendor/.gitkeep          |  0
 7 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 resources/views/vendor/.gitkeep

diff --git a/resources/views/admin/master.tpl b/resources/views/admin/master.tpl
index 2240dd26..af55fb70 100644
--- a/resources/views/admin/master.tpl
+++ b/resources/views/admin/master.tpl
@@ -8,11 +8,11 @@
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
     <!-- App Styles -->
-    <link rel="stylesheet" href="../assets/css/app.min.css">
+    <link rel="stylesheet" href="{{ url('assets/css/app.min.css') }}?v={{ config('app.version') }}">
     <!-- AdminLTE Skins -->
-    <link rel="stylesheet" href="../assets/libs/skins/{{ Option::get('color_scheme') }}.min.css">
+    <link rel="stylesheet" href="{{ url('assets/libs/skins/'.Option::get('color_scheme').'.min.css') }}?v={{ config('app.version') }}">
 
-    <link rel="stylesheet" href="../assets/css/admin.css">
+    <link rel="stylesheet" href="{{ url('assets/css/admin.css') }}?v={{ config('app.version') }}">
 
     @yield('style')
 
@@ -127,9 +127,9 @@
     </div><!-- ./wrapper -->
 
     <!-- App Scripts -->
-    <script type="text/javascript" src="../assets/js/app.min.js"></script>
+    <script type="text/javascript" src="{{ url('assets/js/app.min.js') }}?v={{ config('app.version') }}"></script>
 
-    <script type="text/javascript" src="../assets/js/admin.js"></script>
+    <script type="text/javascript" src="{{ url('assets/js/admin.js') }}?v={{ config('app.version') }}"></script>
 
     @if (Option::get('check_update') == '1')
     <script>
diff --git a/resources/views/auth/master.tpl b/resources/views/auth/master.tpl
index 235b0a9f..6e8bb258 100644
--- a/resources/views/auth/master.tpl
+++ b/resources/views/auth/master.tpl
@@ -7,10 +7,11 @@
     <link rel="shortcut icon" href="../assets/images/favicon.ico">
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
     <!-- App Styles -->
-    <link rel="stylesheet" href="../assets/css/app.min.css">
-    <link rel="stylesheet" href="../assets/libs/skins/{{ Option::get('color_scheme') }}.min.css">
+    <link rel="stylesheet" href="{{ url('assets/css/app.min.css') }}?v={{ config('app.version') }}">
 
-    <link rel="stylesheet" href="../assets/css/auth.css">
+    <link rel="stylesheet" href="{{ url('assets/libs/skins/'.Option::get('color_scheme').'.min.css') }}?v={{ config('app.version') }}">
+
+    <link rel="stylesheet" href="{{ url('assets/css/auth.css') }}?v={{ config('app.version') }}">
 
     <style>{{ Option::get('custom_css')  }}</style>
 </head>
@@ -20,9 +21,9 @@
     @yield('content')
 
     <!-- App Scripts -->
-    <script type="text/javascript" src="../assets/js/app.min.js"></script>
+    <script type="text/javascript" src="{{ url('assets/js/app.min.js') }}?v={{ config('app.version') }}"></script>
 
-    <script type="text/javascript" src="../assets/js/auth.js"></script>
+    <script type="text/javascript" src="{{ url('assets/js/auth.js') }}?v={{ config('app.version') }}"></script>
 
     @if (Session::has('msg'))
     <script>
diff --git a/resources/views/index.tpl b/resources/views/index.tpl
index f96c1f2d..27148c2b 100644
--- a/resources/views/index.tpl
+++ b/resources/views/index.tpl
@@ -8,11 +8,11 @@
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
     <!-- App Styles -->
-    <link rel="stylesheet" href="./assets/css/app.min.css">
+    <link rel="stylesheet" href="{{ url('assets/css/app.min.css') }}?v={{ config('app.version') }}">
     <!-- AdminLTE Skins -->
-    <link rel="stylesheet" href="./assets/libs/skins/{{ Option::get('color_scheme') }}.min.css">
+    <link rel="stylesheet" href="{{ url('assets/libs/skins/'.Option::get('color_scheme').'.min.css') }}?v={{ config('app.version') }}">
 
-    <link rel="stylesheet" href="./assets/css/index.css">
+    <link rel="stylesheet" href="{{ url('assets/css/index.css') }}?v={{ config('app.version') }}">
 
     <style>
         .wrapper {
@@ -112,7 +112,7 @@
     </div><!-- ./wrapper -->
 
     <!-- App Scripts -->
-    <script type="text/javascript" src="./assets/js/app.min.js"></script>
+    <script type="text/javascript" src="{{ url('assets/js/app.min.js') }}?v={{ config('app.version') }}"></script>
 
     <script>{!! Option::get('custom_js') !!}</script>
 </body>
diff --git a/resources/views/setup/updates/master.tpl b/resources/views/setup/updates/master.tpl
index eb7d3557..281e3ca7 100644
--- a/resources/views/setup/updates/master.tpl
+++ b/resources/views/setup/updates/master.tpl
@@ -6,7 +6,7 @@
     <meta name="robots" content="noindex,nofollow" />
     <title>Blessing Skin Server 升级程序</title>
     <link rel="shortcut icon" href="../../assets/images/favicon.ico">
-    <link rel="stylesheet" type="text/css" href="../../assets/css/install.css">
+    <link rel="stylesheet" type="text/css" href="{{ url('assets/css/install.css') }}?v={{ config('app.version') }}">
 </head>
 
 <body class="container">
diff --git a/resources/views/skinlib/master.tpl b/resources/views/skinlib/master.tpl
index dc893a02..f424a0bb 100644
--- a/resources/views/skinlib/master.tpl
+++ b/resources/views/skinlib/master.tpl
@@ -8,11 +8,11 @@
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
     <!-- App Styles -->
-    <link rel="stylesheet" href="../assets/css/app.min.css">
+    <link rel="stylesheet" href="{{ url('assets/css/app.min.css') }}?v={{ config('app.version') }}">
     <!-- AdminLTE Skins -->
-    <link rel="stylesheet" href="../assets/libs/skins/{{ Option::get('color_scheme') }}.min.css">
+    <link rel="stylesheet" href="{{ url('assets/libs/skins/'.Option::get('color_scheme').'.min.css') }}">
 
-    <link rel="stylesheet" href="../assets/css/skinlib.css">
+    <link rel="stylesheet" href="{{ url('assets/css/skinlib.css') }}?v={{ config('app.version') }}">
 
     @yield('style')
 
@@ -139,9 +139,9 @@
     </div><!-- ./wrapper -->
 
     <!-- App Scripts -->
-    <script type="text/javascript" src="../assets/js/app.min.js"></script>
+    <script type="text/javascript" src="{{ url('assets/js/app.min.js') }}?v={{ config('app.version') }}"></script>
 
-    <script type="text/javascript" src="../assets/js/skinlib.js"></script>
+    <script type="text/javascript" src="{{ url('assets/js/skinlib.js') }}?v={{ config('app.version') }}"></script>
 
     @yield('script')
 
diff --git a/resources/views/user/master.tpl b/resources/views/user/master.tpl
index 855abb94..2f811c23 100644
--- a/resources/views/user/master.tpl
+++ b/resources/views/user/master.tpl
@@ -8,11 +8,11 @@
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
     <!-- App Styles -->
-    <link rel="stylesheet" href="../assets/css/app.min.css">
+    <link rel="stylesheet" href="{{ url('assets/css/app.min.css') }}?v={{ config('app.version') }}">
     <!-- AdminLTE Skins -->
-    <link rel="stylesheet" href="../assets/libs/skins/{{ Option::get('color_scheme') }}.min.css">
+    <link rel="stylesheet" href="{{ url('assets/libs/skins/'.Option::get('color_scheme').'.min.css') }}?v={{ config('app.version') }}">
 
-    <link rel="stylesheet" href="../assets/css/user.css">
+    <link rel="stylesheet" href="{{ url('assets/css/user.css') }}?v={{ config('app.version') }}">
 
     @yield('style')
 
@@ -128,9 +128,9 @@
     </div><!-- ./wrapper -->
 
     <!-- App Scripts -->
-    <script type="text/javascript" src="../assets/js/app.min.js"></script>
+    <script type="text/javascript" src="{{ url('assets/js/app.min.js') }}?v={{ config('app.version') }}"></script>
 
-    <script type="text/javascript" src="../assets/js/user.js"></script>
+    <script type="text/javascript" src="{{ url('assets/js/user.js') }}?v={{ config('app.version') }}"></script>
 
     @yield('script')
 
diff --git a/resources/views/vendor/.gitkeep b/resources/views/vendor/.gitkeep
deleted file mode 100644
index e69de29b..00000000