mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-07-13 06:32:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix the use of when specifying a skin

Browse Source
This commit is contained in:
Isaac Connor
2016-05-06 15:24:20 -04:00
parent 5d8eeb5b56
commit fb1b8000ec
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web/skins/classic/includes/functions.php
View File

@@ -24,7 +24,8 @@ $bad_views = array('monitor', 'log');
function xhtmlHeaders( $file, $title )
{
global $css;
global $css;
global $skin;
$skinCssFile = getSkinFile( 'css/'.$css.'/skin.css' );
$skinCssPhpFile = getSkinFile( 'css/'.$css.'/skin.css.php' );
@@ -79,16 +80,16 @@ function xhtmlHeaders( $file, $title )
<?php if ( !in_array($basename, $bad_views) ) { ?>
<script type="text/javascript" src="js/logger.js"></script>
<script type="text/javascript" src="js/overlay.js"></script>
<script type="text/javascript" src="/skins/<?php echo $css; ?>/js/jquery-1.11.3.js"></script>
<script type="text/javascript" src="/skins/<?php echo $css; ?>/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/skins/<?php echo $skin; ?>/js/jquery-1.11.3.js"></script>
<script type="text/javascript" src="/skins/<?php echo $skin; ?>/js/bootstrap.min.js"></script>
<script type="text/javascript">
//<![CDATA[
<!--
<?php include("skins/$css/views/js/state.js.php")?>
<?php include("skins/$skin/views/js/state.js.php")?>
//-->
//]]>
</script>
<script type="text/javascript" src="/skins/<?php echo $css; ?>/views/js/state.js"></script>
<script type="text/javascript" src="/skins/<?php echo $skin; ?>/views/js/state.js"></script>
<?php } ?>
<?php if ( $title == 'Login' && (defined('ZM_OPT_USE_GOOG_RECAPTCHA') && ZM_OPT_USE_GOOG_RECAPTCHA) ) { ?>
<script src='https://www.google.com/recaptcha/api.js'></script>