Adapt core themes to new serendipity_getFile fallback mechanism

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

References #419
This commit is contained in:
Matthias Mees 2016-09-08 18:45:07 +02:00
parent 9dfa482a96
commit 0490401f3a
4 changed files with 12 additions and 12 deletions

View File

@ -26,7 +26,7 @@
{else} {else}
<link rel="stylesheet" href="{$serendipityHTTPPath}{$serendipityRewritePrefix}serendipity.css"> <link rel="stylesheet" href="{$serendipityHTTPPath}{$serendipityRewritePrefix}serendipity.css">
{/if} {/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"} {serendipity_hookPlugin hook="backend_header" hookAll="true"}
<script src="{serendipity_getFile file='admin/js/plugins.js'}"></script> <script src="{serendipity_getFile file='admin/js/plugins.js'}"></script>
<script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script> <script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>

View File

@ -8,19 +8,19 @@
<title>{$CONST.SERENDIPITY_ADMIN_SUITE}</title> <title>{$CONST.SERENDIPITY_ADMIN_SUITE}</title>
<meta http-equiv="Content-Type" content="text/html; charset={$head_charset}" /> <meta http-equiv="Content-Type" content="text/html; charset={$head_charset}" />
<meta name="generator" content="Serendipity v.{$serendipityVersion}" /> <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}" /> <link rel="stylesheet" type="text/css" href="{$head_link_stylesheet}" />
{if $head_link_stylesheet_frontend} {if $head_link_stylesheet_frontend}
<link rel="stylesheet" href="{$head_link_stylesheet_frontend}"> <link rel="stylesheet" href="{$head_link_stylesheet_frontend}">
{else} {else}
<link rel="stylesheet" href="{$serendipityHTTPPath}{$serendipityRewritePrefix}serendipity.css"> <link rel="stylesheet" href="{$serendipityHTTPPath}{$serendipityRewritePrefix}serendipity.css">
{/if} {/if}
<!--[if IE 6]> <!--[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]--> <![endif]-->
<!--[if IE 7]> <!--[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]--> <![endif]-->
<!-- additional colorset stylesheet --> <!-- additional colorset stylesheet -->
<link rel="stylesheet" type="text/css" href="{$serendipityHTTPPath}templates/{$template}/{$template_option.colorset}_style.css" /> <link rel="stylesheet" type="text/css" href="{$serendipityHTTPPath}templates/{$template}/{$template_option.colorset}_style.css" />

View File

@ -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> <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> <a href="{$entrylink}" target="_blank">{$CONST.VIEW}</a>
{/if} {/if}
{/if} {/if}
</div> </div>
</div> </div>
</main> </main>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script> <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> </body>
</html> </html>

View File

@ -51,17 +51,17 @@
{/if} {/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> <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} {/if}
</div> </div>
</div> </div>
</main> </main>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script> <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]> <!--[if lt IE 9]>
<script src={serendipity_getFile file="js/respond.js"}></script> <script src={serendipity_getFile file="js/respond.js" frontend=true}></script>
<script src={serendipity_getFile file="js/html5shiv.js"}></script> <script src={serendipity_getFile file="js/html5shiv.js" frontend=true}></script>
<script src={serendipity_getFile file="js/placeholder-IE-fixes.js"}></script> <script src={serendipity_getFile file="js/placeholder-IE-fixes.js" frontend=true}></script>
<![endif]--> <![endif]-->
</body> </body>
</html> </html>