Adapt additional themes to new serendipity_getFile fallback mechanism

Using frontend=true attribute to properly load frontend theme's CSS + JS assets. References s9y/Serendipity#419
s9y · Sep 8, 2016 · 91b316c · 91b316c
1 parent 23ca5ed
commit 91b316c
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 19 deletions.
diff --git a/Sagittarius-A/preview_iframe.tpl b/Sagittarius-A/preview_iframe.tpl
@@ -4,11 +4,11 @@
         <meta name="generator" content="Serendipity v.{$serendipityVersion}" />
         <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}
-        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="s9y.css"}" />
+        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="s9y.css" frontend=true}" />
         <script type="text/javascript">
            window.onload = function() {ldelim}
              parent.document.getElementById('serendipity_iframe').style.height = document.getElementById('content').offsetHeight

diff --git a/hemingway/preview_iframe.tpl b/hemingway/preview_iframe.tpl
@@ -4,7 +4,7 @@
         <meta name="generator" content="Serendipity v.{$serendipityVersion}" />
         <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}
@@ -19,7 +19,7 @@
            {rdelim}
         </script>
 {if $template_option.colorset == 'white'}
-<link rel="stylesheet" type="text/css" href="{serendipity_getFile file="white.css"}" />
+<link rel="stylesheet" type="text/css" href="{serendipity_getFile file="white.css" frontend=true}" />
 {/if}
     </head>
 

diff --git a/i3theme/preview_iframe.tpl b/i3theme/preview_iframe.tpl
@@ -4,15 +4,14 @@
         <meta name="generator" content="Serendipity v.{$serendipityVersion}" />
         <link rel="stylesheet" type="text/css" href="{$head_link_stylesheet}" media="all" />
 {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}
-        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="print.css"}" media="print" />
-        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="s9y.css"}" media="all" />
+        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="s9y.css" frontend=true}" media="all" />
 <!--[if lt IE 7]>
-        <link rel="stylesheet" href="{serendipity_getFile file="ie-gif.css"}" type="text/css" />
-        <link rel="stylesheet" href="{serendipity_getFile file="s9y-ie-gif.css"}" type="text/css" />
+        <link rel="stylesheet" href="{serendipity_getFile file="ie-gif.css" frontend=true}" type="text/css" />
+        <link rel="stylesheet" href="{serendipity_getFile file="s9y-ie-gif.css" frontend=true}" type="text/css" />
 <![endif]-->
         <script type="text/javascript">
            window.onload = function() {ldelim}

diff --git a/mimbo/preview_iframe.tpl b/mimbo/preview_iframe.tpl
@@ -4,11 +4,11 @@
         <meta name="generator" content="Serendipity v.{$serendipityVersion}" />
         <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}
-        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="s9y.css"}" />
+        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="s9y.css" frontend=true}" />
         <script type="text/javascript">
            window.onload = function() {ldelim}
              parent.document.getElementById('serendipity_iframe').style.height = document.getElementById('content').offsetHeight

diff --git a/mo3/preview_iframe.tpl b/mo3/preview_iframe.tpl
@@ -4,11 +4,11 @@
         <meta name="generator" content="Serendipity v.{$serendipityVersion}" />
         <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}
-        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="s9y.css"}" />
+        <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="s9y.css" frontend=true}" />
         <script type="text/javascript">
            window.onload = function() {ldelim}
              parent.document.getElementById('serendipity_iframe').style.height = document.getElementById('content').offsetHeight

diff --git a/pixel/preview_iframe.tpl b/pixel/preview_iframe.tpl
@@ -12,16 +12,16 @@
     <meta name="generator" content="Serendipity v.{$serendipityVersion}" />
     <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}
-    <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="s9y.css"}" />
+    <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="s9y.css" frontend=true}" />
 <!--[if lt IE 8]>
-    <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie.css"}" />
+    <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie.css" frontend=true}" />
 <![endif]-->
 <!--[if lt IE 7]>
-    <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}" />
     <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE7.js" type="text/javascript"></script>
 <![endif]-->
 <script type="text/javascript">

diff --git a/plus9/preview_iframe.tpl b/plus9/preview_iframe.tpl
@@ -4,11 +4,11 @@
         <meta name="generator" content="Serendipity v.{$serendipityVersion}" />
         <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}
-        <link rel="stylesheet" href="{serendipity_getFile file="s9y.css"}" type="text/css" />
+        <link rel="stylesheet" href="{serendipity_getFile file="s9y.css" frontend=true}" type="text/css" />
         <script type="text/javascript">
            window.onload = function() {ldelim}
              parent.document.getElementById('serendipity_iframe').style.height = document.getElementById('container').offsetHeight