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

fix styles in header, move footer back into header

This commit is contained in:
Isaac Connor 2016-05-06 16:08:32 -04:00
parent 7219e0624b
commit dcdefac48a
4 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/classic/css/classic/skin.css
View File

@ -451,10 +451,10 @@ th.table-th-sort-rev span.table-th-sort-span {
.navbar{
margin-bottom: 0 !important;
border-radius: 0;
color: #03A9F4 !important;
}
.navbar-brand {
color: #03A9F4 !important;
font-weight: bold;
font-size: 20px;
}

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

@ -491,6 +491,16 @@ input[type=submit]:disabled {
background-color: #f2f2f2;
}
.navbar{
margin-bottom: 0 !important;
border-radius: 0;
color: #03A9F4 !important;
}
.navbar-brand {
font-weight: bold;
font-size: 20px;
}
.sidebar {
position: fixed;
top: 51px;

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

@ -185,8 +185,9 @@ function getNavBarHTML() {
global $status;
global $running;
global $user;
global $bwArray;
?>
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar navbar-inverse navbar-static-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main-header-nav" aria-expanded="false">
@ -237,9 +238,21 @@ function getNavBarHTML() {
<p class="navbar-text"> <?php echo $status ?> </p>
<?php } ?>
</div>
</div><!-- End .navbar-collapse -->
</div> <!-- End .container-fluid -->
<div class="container-fluid">
<div class="pull-left">
<?php echo makePopupLink( '?view=bandwidth', 'zmBandwidth', 'bandwidth', $bwArray[$_COOKIE['zmBandwidth']], ($user && $user['MaxBandwidth'] != 'low' ) ) ?> <?php echo translate('BandwidthHead') ?>
</div>
<div class="pull-right">
<?php echo makePopupLink( '?view=version', 'zmVersion', 'version', '<span class="'.$versionClass.'">v'.ZM_VERSION.'</span>', canEdit( 'System' ) ) ?>
</div>
<ul class="list-inline">
<li><?php echo translate('Load') ?>: <?php echo getLoad() ?></li>
<li><?php echo translate('Disk') ?>: <?php echo getDiskPercent() ?>%</li>
</ul>
</div> <!-- End .footer -->
</div> <!-- End .navbar .navbar-default -->
<?php
return( ob_get_clean() );

15
web/skins/classic/views/console.php
View File

@ -281,21 +281,6 @@ echo $Storage->Name();
</table>
</div>
<div id="footer">
<div class="pull-left">
<?php echo makePopupLink( '?view=bandwidth', 'zmBandwidth', 'bandwidth', $bwArray[$_COOKIE['zmBandwidth']], ($user && $user['MaxBandwidth'] != 'low' ) ) ?> <?php echo translate('BandwidthHead') ?>
</div>
<div class="pull-right">
<?php echo makePopupLink( '?view=version', 'zmVersion', 'version', '<span class="'.$versionClass.'">v'.ZM_VERSION.'</span>', canEdit( 'System' ) ) ?>
</div>
<ul class="list-inline">
<li><?php echo translate('Load') ?>: <?php echo getLoad() ?></li>
<li><?php echo translate('Disk') ?>: <?php echo getDiskPercent() ?>%</li>
</ul>
</div> <!-- End .footer -->
</form>
<?php include("skins/$skin/views/state.php") ?>