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

Merge branch 'master' into no_decode

This commit is contained in:
Isaac Connor 2020-12-10 15:15:32 -05:00
parent eb00cf405a 2e9f991211
commit 5c1135b2a7
5 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distros/redhat/zoneminder.spec
View File

@ -28,7 +28,7 @@
%global _hardened_build 1 %global _hardened_build 1
Name: zoneminder Name: zoneminder
Version: 1.35.15 Version: 1.35.16
Release: 1%{?dist} Release: 1%{?dist}
Summary: A camera monitoring and analysis tool Summary: A camera monitoring and analysis tool
Group: System Environment/Daemons Group: System Environment/Daemons

2
version
View File

@ -1 +1 @@
1.35.15 1.35.16

3
web/skins/classic/css/base/views/monitor.css
View File

@ -42,3 +42,6 @@ input[name="newMonitor[Height]"] {
select.chosen { select.chosen {
width: 100%; width: 100%;
} }
tr td:first-child {
min-width: 300px;
}

13
web/skins/classic/views/js/monitor.js
View File

@ -146,6 +146,19 @@ function initPage() {
el.oninput = window['update_estimated_ram_use'].bind(el); el.oninput = window['update_estimated_ram_use'].bind(el);
}); });
document.querySelectorAll('select[name="newMonitor[Function]"]').forEach(function(el) {
el.onchange = function() {
$j('#function_help div').hide();
$j('#'+this.value+'Help').show();
if ( this.value == 'Monitor' || this.value == 'None' ) {
$j('#FunctionEnabled').hide();
} else {
$j('#FunctionEnabled').show();
}
};
el.onchange();
});
$j('.chosen').chosen(); $j('.chosen').chosen();
// Don't enable the back button if there is no previous zm page to go back to // Don't enable the back button if there is no previous zm page to go back to

21
web/skins/classic/views/monitor.php
View File

@ -470,7 +470,7 @@ if ( canEdit('Monitors') ) {
<div class="tab-content" id="pills-tabContent"> <div class="tab-content" id="pills-tabContent">
<?php <?php
foreach ( $tabs as $name=>$value ) { foreach ( $tabs as $name=>$value ) {
echo '<div id="pills-'.$name.'" class="tab-pane fade'.($name==$tab ? ' show active' : '').'" role="tabpanel" area-labelledby="'.$name.'-tab">'; echo '<div id="pills-'.$name.'" class="tab-pane fade'.($name==$tab ? ' show active' : '').'" role="tabpanel" aria-labelledby="'.$name.'-tab">';
?> ?>
<table class="major"> <table class="major">
<tbody> <tbody>
@ -515,11 +515,26 @@ switch ( $name ) {
} }
echo htmlSelect('newMonitor[Function]', $function_options, $monitor->Function()); echo htmlSelect('newMonitor[Function]', $function_options, $monitor->Function());
?> ?>
<div id="function_help">
<?php
foreach ( ZM\getMonitorFunctionTypes() as $fn => $translated ) {
if ( isset($OLANG['FUNCTION_'.strtoupper($fn)]) ) {
echo '<div class="form-text" id="'.$fn.'Help">'.$OLANG['FUNCTION_'.strtoupper($fn)]['Help'].'</div>';
}
}
?>
</div>
</td> </td>
</tr> </tr>
<tr> <tr id="FunctionEnabled">
<td class="text-right pr-3"><?php echo translate('Analysis Enabled') ?></td> <td class="text-right pr-3"><?php echo translate('Analysis Enabled') ?></td>
<td><input type="checkbox" name="newMonitor[Enabled]" value="1"<?php echo $monitor->Enabled() ? ' checked="checked"' : '' ?>/></td> <td><input type="checkbox" name="newMonitor[Enabled]" value="1"<?php echo $monitor->Enabled() ? ' checked="checked"' : '' ?>/>
<?php
if ( isset($OLANG['FUNCTION_ANALYSIS_ENABLED']) ) {
echo '<div class="form-text">'.$OLANG['FUNCTION_ANALYSIS_ENABLED']['Help'].'</div>';
}
?>
</td>
</tr> </tr>
<tr id="FunctionDecodingEnabled"> <tr id="FunctionDecodingEnabled">
<td class="text-right pr-3"><?php echo translate('Decoding Enabled') ?></td> <td class="text-right pr-3"><?php echo translate('Decoding Enabled') ?></td>