From 0490401f3a22ce9f22ff21431838b9ec4b79b0f8 Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Thu, 8 Sep 2016 18:45:07 +0200
Subject: [PATCH] Adapt core themes to new serendipity_getFile fallback
 mechanism

Using frontend=true attribute to properly load frontend theme's
CSS + JS assets.

References #419
---
 templates/2k11/preview_iframe.tpl        |  2 +-
 templates/bulletproof/preview_iframe.tpl |  8 ++++----
 templates/clean-blog/preview_iframe.tpl  |  4 ++--
 templates/timeline/preview_iframe.tpl    | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/templates/2k11/preview_iframe.tpl b/templates/2k11/preview_iframe.tpl
index e4787711..91afbf2d 100644
--- a/templates/2k11/preview_iframe.tpl
+++ b/templates/2k11/preview_iframe.tpl
@@ -26,7 +26,7 @@
 {else}
     <link rel="stylesheet" href="{$serendipityHTTPPath}{$serendipityRewritePrefix}serendipity.css">
 {/if}
-    <script src="{serendipity_getFile file="admin/js/modernizr.min.js"}"></script>
+    <script src="{serendipity_getFile file="admin/js/modernizr.min.js" frontend=true}"></script>
 {serendipity_hookPlugin hook="backend_header" hookAll="true"}
     <script src="{serendipity_getFile file='admin/js/plugins.js'}"></script>
     <script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>
diff --git a/templates/bulletproof/preview_iframe.tpl b/templates/bulletproof/preview_iframe.tpl
index 4623dae8..7a81d46a 100644
--- a/templates/bulletproof/preview_iframe.tpl
+++ b/templates/bulletproof/preview_iframe.tpl
@@ -8,19 +8,19 @@
         <title>{$CONST.SERENDIPITY_ADMIN_SUITE}</title>
         <meta http-equiv="Content-Type" content="text/html; charset={$head_charset}" />
         <meta name="generator" content="Serendipity v.{$serendipityVersion}" />
-        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="base.css"}" />
+        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="base.css" frontend=true}" />
         <link rel="stylesheet" type="text/css" href="{$head_link_stylesheet}" />
         {if $head_link_stylesheet_frontend}
-        <link rel="stylesheet" href="{$head_link_stylesheet_frontend}">                                
+        <link rel="stylesheet" href="{$head_link_stylesheet_frontend}">
         {else}
         <link rel="stylesheet" href="{$serendipityHTTPPath}{$serendipityRewritePrefix}serendipity.css">
         {/if}
 
         <!--[if IE 6]>
-        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie6.css"}" />
+        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie6.css" frontend=true}" />
         <![endif]-->
         <!--[if IE 7]>
-        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie7.css"}" />
+        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie7.css" frontend=true}" />
         <![endif]-->
         <!-- additional colorset stylesheet -->
         <link rel="stylesheet" type="text/css" href="{$serendipityHTTPPath}templates/{$template}/{$template_option.colorset}_style.css" />
diff --git a/templates/clean-blog/preview_iframe.tpl b/templates/clean-blog/preview_iframe.tpl
index 8c6f0ad6..8468b610 100644
--- a/templates/clean-blog/preview_iframe.tpl
+++ b/templates/clean-blog/preview_iframe.tpl
@@ -57,11 +57,11 @@
                         <span class="alert alert-success"><span class="fa-stack" aria-hidden="true"><i class="fa fa-circle-thin fa-stack-2x"></i><i class="fa fa-check fa-stack-1x"></i></span> {$CONST.ENTRY_SAVED}</span>
                         <a href="{$entrylink}" target="_blank">{$CONST.VIEW}</a>
                     {/if}
-                {/if}                
+                {/if}
             </div>
         </div>
     </main>
     <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
-    <script src={serendipity_getFile file="js/clean-blog.js"}></script>
+    <script src={serendipity_getFile file="js/clean-blog.js" frontend=true}></script>
 </body>
 </html>
diff --git a/templates/timeline/preview_iframe.tpl b/templates/timeline/preview_iframe.tpl
index 58526e7b..9af1a110 100644
--- a/templates/timeline/preview_iframe.tpl
+++ b/templates/timeline/preview_iframe.tpl
@@ -51,17 +51,17 @@
                         {/if}
                         <span class="alert alert-success"><span class="fa-stack text-success" aria-hidden="true"></i><i class="fa fa-smile-o fa-2x"></i></span> {$CONST.ENTRY_SAVED}. &nbsp;&nbsp; <a class="btn btn-md btn-default btn-theme" href="{$entrylink}" target="_blank">{$CONST.VIEW_ENTRY}</a></span>
                     {/if}
-                {/if}                
+                {/if}
             </div>
         </div>
     </main>
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
-<script src={serendipity_getFile file="js/timeline.js"}></script>
+<script src={serendipity_getFile file="js/timeline.js" frontend=true}></script>
 
 <!--[if lt IE 9]>
-    <script src={serendipity_getFile file="js/respond.js"}></script>
-    <script src={serendipity_getFile file="js/html5shiv.js"}></script>
-    <script src={serendipity_getFile file="js/placeholder-IE-fixes.js"}></script>
+    <script src={serendipity_getFile file="js/respond.js" frontend=true}></script>
+    <script src={serendipity_getFile file="js/html5shiv.js" frontend=true}></script>
+    <script src={serendipity_getFile file="js/placeholder-IE-fixes.js" frontend=true}></script>
 <![endif]-->
 </body>
 </html>