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

Continue altering monitor view to do Capturing, Analysing, Recording

This commit is contained in:
Isaac Connor 2021-10-25 16:54:53 -04:00
parent fb67c6a3e7
commit 7f573b147f
1 changed files with 76 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,11 +109,10 @@ if ( !empty($_REQUEST['probe']) ) {
$probe = json_decode(base64_decode($_REQUEST['probe']));
foreach ($probe as $name=>$value) {
if (isset($value)) {
# Does isset handle NULL's? I don't think this code is correct.
$monitor->$name = urldecode($value);
}
}
if ( ZM_HAS_V4L2 && $monitor->Type() == 'Local' ) {
if (ZM_HAS_V4L2 && ($monitor->Type() == 'Local')) {
$monitor->Palette(fourCC(substr($monitor->Palette,0,1), substr($monitor->Palette,1,1), substr($monitor->Palette,2,1), substr($monitor->Palette,3,1)));
if ($monitor->Format() == 'PAL')
$monitor->Format(0x000000ff);
@ -363,7 +362,6 @@ getBodyTopHTML();
echo getNavBarHTML();
?>
<div id="page" class="container-fluid">
<div class="row flex-nowrap">
<nav> <!-- BEGIN PILL LIST -->
<ul class="nav nav-pills flex-column h-100" id="pills-tab" role="tablist" aria-orientation="vertical">
@ -415,7 +413,7 @@ foreach ( $tabs as $name=>$value ) {
<button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
</div>
<h2><?php echo translate('Monitor') ?> - <?php echo validHtmlStr($monitor->Name()) ?><?php if ( $monitor->Id() ) { ?> (<?php echo $monitor->Id()?>)<?php } ?></h2>
<h2><?php echo translate('Monitor').' - '.validHtmlStr($monitor->Name()) .($monitor->Id()? $monitor->Id() : '') ?></h2>
<?php
if (canEdit('Monitors')) {
if (isset($_REQUEST['dupId'])) {
@ -477,25 +475,32 @@ switch ( $name ) {
<td class="text-right pr-3"><?php echo translate('Notes') ?></td>
<td><textarea name="newMonitor[Notes]" rows="4"><?php echo validHtmlStr($monitor->Notes()) ?></textarea></td>
</tr>
<tr>
<?php
$Servers = ZM\Server::find(NULL, array('order'=>'lower(Name)'));
if (count($Servers)) {
?>
<tr class="Server">
<td class="text-right pr-3"><?php echo translate('Server') ?></td><td>
<?php
$servers = array(''=>'None','auto'=>'Auto');
foreach (ZM\Server::find(NULL, array('order'=>'lower(Name)')) as $Server) {
foreach ($Servers as $Server) {
$servers[$Server->Id()] = $Server->Name();
}
echo htmlSelect('newMonitor[ServerId]', $servers, $monitor->ServerId());
?>
</td>
</tr>
<tr>
<?php
} # end if count($Servers)
?>
<tr class="Type">
<td class="text-right pr-3"><?php echo translate('SourceType') ?></td>
<td><?php echo htmlSelect('newMonitor[Type]', $sourceTypes, $monitor->Type()); ?></td>
</tr>
<?php
if ($monitor->Type() != 'WebSite') {
?>
<tr>
<tr class="Capturing">
<td class="text-right pr-3"><?php echo translate('Capturing') ?></td>
<td>
<?php
@ -522,7 +527,7 @@ switch ( $name ) {
?>
</td>
</tr>
<tr>
<tr class="LinkedMonitors">
<td class="text-right pr-3"><?php echo translate('LinkedMonitors'); echo makeHelpLink('OPTIONS_LINKED_MONITORS') ?></td>
<td>
<?php
@ -542,13 +547,13 @@ switch ( $name ) {
?>
</td>
</tr>
<tr>
<tr class="Groups">
<td class="text-right pr-3"><?php echo translate('Groups'); ?></td>
<td><select name="newMonitor[GroupIds][]" multiple="multiple" class="chosen"><?php
echo htmlOptions(ZM\Group::get_dropdown_options(), $monitor->GroupIds());
?></select></td>
</tr>
<tr>
<tr class="Analysing">
<td class="text-right pr-3"><?php echo translate('Analysing') ?></td>
<td>
<?php