mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Add plugin-hook "js"

Browse Source 
Use $link_head_script in a smarty-template to emit the path to the generated virtual javascript file
This commit is contained in:
onli 2013-06-15 16:14:14 +02:00
parent 33ff9c1f7c
commit be3d4d1d74
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/functions_permalinks.inc.php
View File

@ -264,6 +264,7 @@ function serendipity_initPermalinks() {
@define('PAT_FILENAME_MATCH', '[' . PAT_FILENAME . ']+'); @define('PAT_FILENAME_MATCH', '[' . PAT_FILENAME . ']+');
@define('PAT_DIRNAME_MATCH', '[' . PAT_FILENAME . '/]*'); @define('PAT_DIRNAME_MATCH', '[' . PAT_FILENAME . '/]*');
@define('PAT_CSS', '@/(serendipity\.css|serendipity_admin\.css)@'); @define('PAT_CSS', '@/(serendipity\.css|serendipity_admin\.css)@');
@define('PAT_JS', '@/(serendipity\.js|serendipity_admin\.js)@');
@define('PAT_FEED', '@/(index|atom[0-9]*|rss|b2rss|b2rdf).(rss|rdf|rss2|xml)@'); @define('PAT_FEED', '@/(index|atom[0-9]*|rss|b2rss|b2rdf).(rss|rdf|rss2|xml)@');
@define('PAT_COMMENTSUB', '@/([0-9]+)[_\-][' . PAT_FILENAME . ']*\.html@i'); @define('PAT_COMMENTSUB', '@/([0-9]+)[_\-][' . PAT_FILENAME . ']*\.html@i');

11
include/functions_smarty.inc.php
View File

@ -970,7 +970,17 @@ function serendipity_smarty_init($vars = array()) {
} else { } else {
$serendipity['smarty_vars']['head_link_stylesheet'] .= '?v=' . $serendipity['last_template_change']; $serendipity['smarty_vars']['head_link_stylesheet'] .= '?v=' . $serendipity['last_template_change'];
} }
}
if (!isset($serendipity['smarty_vars']['head_link_script'])) {
$serendipity['smarty_vars']['head_link_script'] = serendipity_rewriteURL('serendipity.js');
// When templates are switched, append a specific version string to make sure the browser does not cache the CSS
if (strstr($serendipity['smarty_vars']['head_link_stylesheet'], '?')) {
$serendipity['smarty_vars']['head_link_script'] .= '&v=' . $serendipity['last_template_change'];
} else {
$serendipity['smarty_vars']['head_link_script'] .= '?v=' . $serendipity['last_template_change'];
}
} }
$serendipity['smarty']->assign( $serendipity['smarty']->assign(
@ -980,6 +990,7 @@ function serendipity_smarty_init($vars = array()) {
'head_title' => $serendipity['head_title'], 'head_title' => $serendipity['head_title'],
'head_subtitle' => $serendipity['head_subtitle'], 'head_subtitle' => $serendipity['head_subtitle'],
'head_link_stylesheet' => $serendipity['smarty_vars']['head_link_stylesheet'], 'head_link_stylesheet' => $serendipity['smarty_vars']['head_link_stylesheet'],
'head_link_script' => $serendipity['smarty_vars']['head_link_script'],
'is_xhtml' => true, 'is_xhtml' => true,
'use_popups' => $serendipity['enablePopup'], 'use_popups' => $serendipity['enablePopup'],

1
templates/2k11/admin/index.tpl
View File

@ -8,6 +8,7 @@
<link rel="stylesheet" href="{$head_link_stylesheet}"> <link rel="stylesheet" href="{$head_link_stylesheet}">
<script src="{serendipity_getFile file='admin/js/modernizr-2.6.2.min.js'}"></script> <script src="{serendipity_getFile file='admin/js/modernizr-2.6.2.min.js'}"></script>
{if $admin_vars.admin_installed}{serendipity_hookPlugin hook="backend_header" hookAll="true"}{/if} {if $admin_vars.admin_installed}{serendipity_hookPlugin hook="backend_header" hookAll="true"}{/if}
<script src="{$head_link_script}"></script>
</head> </head>
<body id="serendipity_admin_page"> <body id="serendipity_admin_page">
{if NOT $admin_vars.no_banner} {if NOT $admin_vars.no_banner}

1
templates/2k11/index.tpl
View File

@ -33,6 +33,7 @@
<link rel="pingback" href="{$serendipityBaseURL}comment.php?type=pingback&amp;entry_id={$entry_id}"> <link rel="pingback" href="{$serendipityBaseURL}comment.php?type=pingback&amp;entry_id={$entry_id}">
{/if} {/if}
{serendipity_hookPlugin hook="frontend_header"} {serendipity_hookPlugin hook="frontend_header"}
<script src="{$head_link_script}"></script>
</head> </head>
<body{if $template_option.webfonts != 'none'} class="{$template_option.webfonts}"{/if}> <body{if $template_option.webfonts != 'none'} class="{$template_option.webfonts}"{/if}>
{else} {else}