Merge branch 'master' of github.com:ZoneMinder/zoneminder
This commit is contained in:
Isaac Connor
commit
d658479048
|
|
@ -60,7 +60,7 @@ Add the following to the bottom of the file
|
|||
::
|
||||
|
||||
# ZoneMinder repository
|
||||
deb https://zmrepo.zoneminder.com/debian/release-1.34 stretch/
|
||||
deb https://zmrepo.zoneminder.com/debian/release-1.34 buster/
|
||||
|
||||
CTRL+o and <Enter> to save
|
||||
CTRL+x to exit
|
||||
|
|
|
|||
|
|
@ -662,6 +662,11 @@ margin-left: 0;
|
|||
.nav-pills > li > a {
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
ul.nav.nav-pills.flex-column {
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
|
||||
.chosen-container {
|
||||
text-align: left;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -492,6 +492,10 @@ margin-left: 0px;
|
|||
border-radius: 0;
|
||||
}
|
||||
|
||||
.nav-pills .nav-link.active, .nav-pills .show>.nav-link {
|
||||
background-color: #337ab7;
|
||||
}
|
||||
|
||||
button,
|
||||
input[type=button],
|
||||
input[type=submit],
|
||||
|
|
|
|||
|
|
@ -151,6 +151,19 @@ if ( $css != 'base' )
|
|||
Cookie.write('zmHeaderFlip', 'up', {duration: 10*365} );
|
||||
}
|
||||
});
|
||||
jQuery("#fbflip").click(function() {
|
||||
jQuery("#fbpanel").slideToggle("slow");
|
||||
var fbflip = jQuery("#fbflip");
|
||||
if ( fbflip.html() == 'keyboard_arrow_up' ) {
|
||||
fbflip.html('keyboard_arrow_down');
|
||||
Cookie.write('zmFilterBarFlip', 'down', {duration: 10*365} );
|
||||
} else {
|
||||
fbflip.html('keyboard_arrow_up');
|
||||
Cookie.write('zmFilterBarFlip', 'up', {duration: 10*365} );
|
||||
jQuery('.chosen').chosen("destroy");
|
||||
jQuery('.chosen').chosen();
|
||||
}
|
||||
});
|
||||
});
|
||||
var $j = jQuery.noConflict();
|
||||
// $j is now an alias to the jQuery function; creating the new alias is optional.
|
||||
|
|
@ -267,7 +280,7 @@ function getNavBarHTML($reload = null) {
|
|||
<div class="fixed-top container-fluid p-0 p-0">
|
||||
<nav class="navbar navbar-expand-md navbar-dark bg-dark justify-content-center flex-row">
|
||||
|
||||
<div class="navbar-brand justify-content-start">
|
||||
<div class="navbar-brand justify-content-start align-self-start">
|
||||
<?php echo getNavBrandHTML() ?>
|
||||
</div>
|
||||
|
||||
|
|
@ -298,7 +311,7 @@ function getNavBarHTML($reload = null) {
|
|||
echo getHeaderFlipHTML();
|
||||
echo '</ul>';
|
||||
|
||||
echo '<ul class="nav navbar-nav justify-content-end flex-grow-1">';
|
||||
echo '<ul class="nav navbar-nav justify-content-end align-self-start flex-grow-1">';
|
||||
echo getAcctCircleHTML($user);
|
||||
echo getStatusBtnHTML($status);
|
||||
echo '</ul>';
|
||||
|
|
@ -366,11 +379,11 @@ function getDbConHTML() {
|
|||
$connections = dbFetchOne('SHOW status WHERE variable_name=\'threads_connected\'', 'Value');
|
||||
$max_connections = dbFetchOne('SHOW variables WHERE variable_name=\'max_connections\'', 'Value');
|
||||
$percent_used = $max_connections ? 100 * $connections / $max_connections : 100;
|
||||
$class = $percent_used > 90 ? 'text-warning' : '';
|
||||
$class = ( $percent_used > 90 ) ? 'text-warning' : '';
|
||||
|
||||
echo '<li class="'. $class .' nav-item mx-2">'.PHP_EOL;
|
||||
echo '<li class="nav-item mx-2 ' .$class. '">'.PHP_EOL;
|
||||
echo '<i class="material-icons md-18 mr-1">storage</i>'.PHP_EOL;
|
||||
echo translate('DB').': '.$connections.'/'.$max_connections.PHP_EOL;
|
||||
echo translate('DB'). ': ' .$connections. '/' .$max_connections.PHP_EOL;
|
||||
echo '</li>'.PHP_EOL;
|
||||
}
|
||||
|
||||
|
|
@ -386,7 +399,7 @@ function getStorageHTML() {
|
|||
}
|
||||
$title = human_filesize($S->disk_used_space()) . ' of ' . human_filesize($S->disk_total_space()).
|
||||
( ( $S->disk_used_space() != $S->event_disk_space() ) ? ' ' .human_filesize($S->event_disk_space()) . ' used by events' : '' );
|
||||
return '<span class="ml-1'.$class.'" title="'.$title.'">'.$S->Name() . ': ' . $S->disk_usage_percent().'%' . '</span>';
|
||||
return '<span class="ml-1 '.$class.'" title="'.$title.'">'.$S->Name() . ': ' . $S->disk_usage_percent().'%' . '</span>';
|
||||
};
|
||||
|
||||
$storage_areas = ZM\Storage::find(array('Enabled'=>true));
|
||||
|
|
@ -422,7 +435,7 @@ function getShmHTML() {
|
|||
} else if ( $shm_percent > 90 ) {
|
||||
$class = 'text-warning';
|
||||
}
|
||||
echo ' <li class="'.$class.' nav-item" title="' . human_filesize($shm_used).' of '.human_filesize($shm_total_space).'">'.ZM_PATH_MAP.': '.$shm_percent.'%</li>'.PHP_EOL;
|
||||
echo ' <li class="nav-item ' .$class. '" title="' .human_filesize($shm_used). ' of ' .human_filesize($shm_total_space). '">' .ZM_PATH_MAP. ': '.$shm_percent.'%</li>'.PHP_EOL;
|
||||
}
|
||||
|
||||
// Returns the html representing the optional web console banner text
|
||||
|
|
@ -481,7 +494,7 @@ function getLogHTML() {
|
|||
}
|
||||
}
|
||||
$logstate = logState();
|
||||
$class = ($logstate == 'ok') ? 'text-succss' : ($logstate == 'alert' ? 'text-warning' : (($logstate == 'alarm' ? 'text-danger' : '')));
|
||||
$class = ($logstate == 'ok') ? 'text-success' : ($logstate == 'alert' ? 'text-warning' : (($logstate == 'alarm' ? 'text-danger' : '')));
|
||||
echo '<li class="nav-item">'.makePopupLink('?view=log', 'zmLog', 'log', '<span class="nav-link '.$class.'">'.translate('Log').'</span></li>').PHP_EOL;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -164,8 +164,12 @@ getBodyTopHTML();
|
|||
<input type="hidden" name="view" value="<?php echo $view ?>"/>
|
||||
<input type="hidden" name="action" value=""/>
|
||||
|
||||
<div class="filterBar"><?php echo $filterbar ?></div>
|
||||
<div class="statusBreakdown">
|
||||
<div class="filterBar" id="fbpanel"<?php echo ( isset($_COOKIE['zmFilterBarFlip']) and $_COOKIE['zmFilterBarFlip'] == 'down' ) ? ' style="display:none;"' : '' ?>>
|
||||
<?php echo $filterbar ?>
|
||||
</div>
|
||||
|
||||
<div class="container-fluid pt-2">
|
||||
<div class="statusBreakdown float-left">
|
||||
<?php
|
||||
$html = '';
|
||||
foreach ( array_keys($status_counts) as $status ) {
|
||||
|
|
@ -174,9 +178,8 @@ getBodyTopHTML();
|
|||
}
|
||||
echo $html;
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container-fluid">
|
||||
<button type="button" name="addBtn" data-on-click-this="addMonitor"
|
||||
<?php echo (canEdit('Monitors') && !$user['MonitorIds']) ? '' : ' disabled="disabled" title="'.translate('AddMonitorDisabled').'"' ?>
|
||||
>
|
||||
|
|
@ -202,10 +205,12 @@ getBodyTopHTML();
|
|||
<i class="material-icons md-18">view_list</i>
|
||||
<?php echo translate('Select') ?>
|
||||
</button>
|
||||
|
||||
<a href="#"><i id="fbflip" class="material-icons md-18">keyboard_arrow_<?php echo ( isset($_COOKIE['zmFilterBarFlip']) and $_COOKIE['zmFilterBarFlip'] == 'down') ? 'down' : 'up' ?></i></a>
|
||||
<?php
|
||||
ob_start();
|
||||
?>
|
||||
<div class="table-responsive">
|
||||
<div class="table-responsive pt-2">
|
||||
<table class="table table-striped table-hover table-condensed consoleTable">
|
||||
<thead class="thead-highlight">
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -1146,7 +1146,7 @@ if ( canEdit('Control') ) {
|
|||
</tr>
|
||||
<tr>
|
||||
<td><?php echo translate('ControlAddress') ?></td>
|
||||
<td><input type="text" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($monitor->ControlAddress()) ?>"/></td>
|
||||
<td><input type="text" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($monitor->ControlAddress()) ? : 'user:port@ip' ?>"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?php echo translate('AutoStopTimeout') ?></td>
|
||||
|
|
|
|||
|
|
@ -57,13 +57,13 @@ xhtmlHeaders(__FILE__, translate('Options'));
|
|||
<body>
|
||||
<?php echo getNavBarHTML(); ?>
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<nav id="sidebar" style="background-color:#f5f5f5">
|
||||
<ul class="nav nav-pills flex-sm-column blockquote">
|
||||
<div class="row flex-nowrap">
|
||||
<nav id="sidebar">
|
||||
<ul class="nav nav-pills flex-column">
|
||||
<?php
|
||||
foreach ( $tabs as $name=>$value ) {
|
||||
?>
|
||||
<li class="nav-item"><a class="nav-link<?php echo $tab == $name ? ' active' : '' ?>" href="?view=<?php echo $view ?>&tab=<?php echo $name ?>"><?php echo $value ?></a></li>
|
||||
<li class="nav-item form-control-sm my-1"><a class="nav-link<?php echo $tab == $name ? ' active' : '' ?>" href="?view=<?php echo $view ?>&tab=<?php echo $name ?>"><?php echo $value ?></a></li>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
|
|
@ -456,7 +456,7 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
|
|||
$options = explode('|', $value['Hint']);
|
||||
if ( count($options) > 3 ) {
|
||||
?>
|
||||
<select class="form-control form-control-lg" name="newConfig[<?php echo $name ?>]"<?php echo $canEdit?'':' disabled="disabled"' ?>>
|
||||
<select class="form-control form-control-sm" name="newConfig[<?php echo $name ?>]"<?php echo $canEdit?'':' disabled="disabled"' ?>>
|
||||
<?php
|
||||
foreach ( $options as $option ) {
|
||||
if ( preg_match('/^([^=]+)=(.+)$/', $option, $matches) ) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue