Cashe busting now works for all .cc and .js files in use

b5297299 · Karl · 62e68840 · b5297299 · b5297299 · b5297299
Commit b5297299 authored 8 years ago by Karl
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -14,4 +14,5 @@ elixir(function(mix) {
    mix.less('default.less', 'public/css/themes/default.css');
    mix.scripts(['lib/jquery.js', 'lib/bootstrap.js', 'widgets.js', 'editLanguage.js', 'kontakt.js', 'lib/lightslider.js', 'lib/masonry.js', 'lib/imagesloaded.js', 'lib/openpgp.min.js', 'scriptResultPage.js', 'scriptStartPage.js', 'settings.js', 'lib/iframeResizer.min.js' /*, 'lib/vue/app.js', 'lib/vue/bootstrap.js'*/ ]);
    mix.scripts(['lib/jquery.js', 'lib/iframeResizer.contentWindow.min.js'], 'public/js/quicktips.js');
+    mix.version(['css/themes/default.css', 'js/all.js', 'js/quicktips.js']);
 });
\ No newline at end of file
--- a/public/build/css/themes/default-a9062cf83c.css
+++ b/public/build/css/themes/default-a9062cf83c.css
--- a/public/build/css/themes/default.css.map
+++ b/public/build/css/themes/default.css.map
--- a/public/build/js/all-a6733fb0ee.js
+++ b/public/build/js/all-a6733fb0ee.js
--- a/public/build/js/all.js.map
+++ b/public/build/js/all.js.map
--- a/public/build/js/quicktips-34d41bc58a.js
+++ b/public/build/js/quicktips-34d41bc58a.js
--- a/public/build/js/quicktips.js.map
+++ b/public/build/js/quicktips.js.map
--- a/public/build/rev-manifest.json
+++ b/public/build/rev-manifest.json
+{
+  "css/themes/default.css": "css/themes/default-a9062cf83c.css",
+  "js/all.js": "js/all-a6733fb0ee.js",
+  "js/quicktips.js": "js/quicktips-34d41bc58a.js"
+}
\ No newline at end of file
--- a/public/css/themes/default.css
+++ b/public/css/themes/default.css
--- a/public/css/themes/default.css.map
+++ b/public/css/themes/default.css.map
--- a/public/js/all.js
+++ b/public/js/all.js
--- a/public/js/quicktips.js
+++ b/public/js/quicktips.js
--- a/resources/assets/less/bootstrap/variables.less
+++ b/resources/assets/less/bootstrap/variables.less
@@ -76,7 +76,7 @@
 //## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.

 //** Load fonts from this directory.
-@icon-font-path:          "../../fonts/";
+@icon-font-path:          "/fonts/";
 //** File name for all font files.
 @icon-font-name:          "glyphicons-halflings-regular";
 //** Element ID within SVG icon file.

--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -12,7 +12,8 @@
 	<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE" />
 	<meta HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE" />
 	<link rel="search" type="application/opensearchdescription+xml" title="{!! trans('resultPage.opensearch') !!}" href="{{  LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
-	<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default-neu') }}.css" />
+	<!--<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default-neu') }}.css" />-->
+	<link type="text/css" rel="stylesheet" href="{{ elixir('css/themes/default.css') }}" />
 	<link type="text/css" rel="stylesheet" href="/css/lightslider.css" />
 	<link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" />
 </head>
@@ -35,6 +36,6 @@
 		</div>
 	</footer>
 	<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
-	<script type="text/javascript" src="/js/all.js"></script>
+	<script type="text/javascript" src="{{ elixir('js/all.js') }}"></script>
 </body>
 </html>
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -19,8 +19,9 @@
 		<link rel="search" type="application/opensearchdescription+xml" title="{{ trans('staticPages.opensearch') }}" href="{{  LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
 		<!--<link href="/css/bootstrap.css" rel="stylesheet" />
 		-->
-		<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default-neu') }}.css" />
+		<!--<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default-neu') }}.css" />-->
 		<!--<link href="/css/style.css" rel="stylesheet" />-->
+		<link type="text/css" rel="stylesheet" href="{{ elixir('css/themes/default.css') }}" />
 		<link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" />
 		@if (isset($css))
 			@if(is_array($css))
@@ -136,7 +137,7 @@
 				</ul>
 			</footer>
 			<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
-			<script type="text/javascript" src="/js/all.js"></script>
+			<script type="text/javascript" src="{{ elixir('js/all.js') }}"></script>
 		</div>
 	</body>
 </html>
--- a/resources/views/quicktip.blade.php
+++ b/resources/views/quicktip.blade.php
@@ -2,7 +2,8 @@
 <html>
 	<head>
 		<title>{!! trans('quicktip.title') !!}</title>
-		<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default-neu') }}.css" />
+		<!--<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default-neu') }}.css" />-->
+		<link type="text/css" rel="stylesheet" href="{{ elixir('css/themes/default.css') }}" />
 	</head>
 	<body class="quicktips">
 		<div class="quicktip aufruf-winter">
@@ -67,7 +68,7 @@
 				</summary>
 			</details>
 		</div>
-		<script src="/js/quicktips.js">
+		<script src="{{ elixir('js/quicktips.js') }}">
        </script>
 	</body>
 </html>