ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'iconnor-updated-console' into storageareas

This commit is contained in:
Isaac Connor 2016-05-06 15:30:25 -04:00
parent 02b5cd6b6c f4df9e053d
commit 2ccefdb23c
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/skins/classic/css/flat/skin.css
View File

@ -491,5 +491,26 @@ input[type=submit]:disabled {
background-color: #f2f2f2;
}
.sidebar {
position: fixed;
top: 51px;
bottom: 0;
left: 0;
z-index: 1000;
display: block;
padding: 20px;
overflow-x: hidden;
overflow-y: auto;
background-color: #f5f5f5;
border-right: 1px solid #eeeeee;
}
.sidebar ul {
margin-right: -21px;
margin-bottom: 20px;
margin-left: -20px;
}

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

@ -25,6 +25,7 @@ $bad_views = array('monitor', 'log');
function xhtmlHeaders( $file, $title )
{
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>