Skip to content
Snippets Groups Projects
Commit e3c3ea34 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '394-cashe-busting-fur-css-dateien' into 'development'

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

Closes #394

See merge request !626
parents 62e68840 e4b7367c
No related branches found
No related tags found
2 merge requests!630Development,!626Cashe busting now works for all .cc and .js files in use
Showing
with 35816 additions and 25 deletions
...@@ -14,4 +14,5 @@ elixir(function(mix) { ...@@ -14,4 +14,5 @@ elixir(function(mix) {
mix.less('default.less', 'public/css/themes/default.css'); 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/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.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
This diff is collapsed.
This diff is collapsed.
source diff could not be displayed: it is too large. Options to address this: view the blob.
source diff could not be displayed: it is too large. Options to address this: view the blob.
source diff could not be displayed: it is too large. Options to address this: view the blob.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
{
"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
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. //## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory. //** Load fonts from this directory.
@icon-font-path: "../../fonts/"; @icon-font-path: "/fonts/";
//** File name for all font files. //** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular"; @icon-font-name: "glyphicons-halflings-regular";
//** Element ID within SVG icon file. //** Element ID within SVG icon file.
......
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE" /> <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE" />
<meta HTTP-EQUIV="PRAGMA" 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 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 type="text/css" rel="stylesheet" href="/css/lightslider.css" />
<link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" /> <link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" />
</head> </head>
...@@ -35,6 +36,6 @@ ...@@ -35,6 +36,6 @@
</div> </div>
</footer> </footer>
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" /> <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> </body>
</html> </html>
...@@ -19,8 +19,9 @@ ...@@ -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 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 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 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" /> <link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" />
@if (isset($css)) @if (isset($css))
@if(is_array($css)) @if(is_array($css))
...@@ -136,7 +137,7 @@ ...@@ -136,7 +137,7 @@
</ul> </ul>
</footer> </footer>
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" /> <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> </div>
</body> </body>
</html> </html>
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<html> <html>
<head> <head>
<title>{!! trans('quicktip.title') !!}</title> <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> </head>
<body class="quicktips"> <body class="quicktips">
<div class="quicktip aufruf-winter"> <div class="quicktip aufruf-winter">
...@@ -67,7 +68,7 @@ ...@@ -67,7 +68,7 @@
</summary> </summary>
</details> </details>
</div> </div>
<script src="/js/quicktips.js"> <script src="{{ elixir('js/quicktips.js') }}">
</script> </script>
</body> </body>
</html> </html>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment