ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add onchange to scale

pull/2725/head
Isaac Connor 2019-09-19 14:57:17 -04:00
parent 14e625b775
commit 2da9edf0ff
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/skins/classic/views/js/watch.js
View File

@ -792,6 +792,9 @@ function initPage() {
if ( window.history.length == 1 ) { if ( window.history.length == 1 ) {
$j('#closeControl').html(''); $j('#closeControl').html('');
} }
document.querySelectorAll('select[name="scale"]').forEach(function (el) {
el.onchange = window['changeScale'];
});
} else if ( monitorRefresh > 0 ) { } else if ( monitorRefresh > 0 ) {
setInterval(reloadWebSite, monitorRefresh*1000); setInterval(reloadWebSite, monitorRefresh*1000);
} }

30
web/skins/classic/views/watch.php
View File

@ -25,7 +25,7 @@ if ( !canView('Stream') ) {
return; return;
} }
if ( ! isset($_REQUEST['mid']) ) { if ( !isset($_REQUEST['mid']) ) {
$view = 'error'; $view = 'error';
return; return;
} }
@ -58,7 +58,7 @@ noCacheHeaders();
$popup = ((isset($_REQUEST['popup'])) && ($_REQUEST['popup'] == 1)); $popup = ((isset($_REQUEST['popup'])) && ($_REQUEST['popup'] == 1));
xhtmlHeaders( __FILE__, $monitor->Name().' - '.translate('Feed') ); xhtmlHeaders(__FILE__, $monitor->Name().' - '.translate('Feed'));
?> ?>
<body> <body>
<div id="page"> <div id="page">
@ -69,11 +69,11 @@ xhtmlHeaders( __FILE__, $monitor->Name().' - '.translate('Feed') );
<?php <?php
if ( canView('Control') && $monitor->Type() == 'Local' ) { if ( canView('Control') && $monitor->Type() == 'Local' ) {
?> ?>
<div id="settingsControl"><?php echo makePopupLink( '?view=settings&amp;mid='.$monitor->Id(), 'zmSettings'.$monitor->Id(), 'settings', translate('Settings'), true, 'id="settingsLink"' ) ?></div> <div id="settingsControl"><?php echo makePopupLink('?view=settings&amp;mid='.$monitor->Id(), 'zmSettings'.$monitor->Id(), 'settings', translate('Settings'), true, 'id="settingsLink"') ?></div>
<?php <?php
} }
?> ?>
<div id="scaleControl"><?php echo translate('Scale') ?>: <?php echo buildSelect('scale', $scales, 'changeScale(this);'); ?></div> <div id="scaleControl"><?php echo translate('Scale') ?>: <?php echo htmlSelect('scale', $scales, $scale); ?></div>
</div> </div>
<div id="closeControl"><a href="#" onclick="<?php echo $popup ? 'window.close()' : 'history.go(-1);return false;' ?>"><?php echo $popup ? translate('Close') : translate('Back') ?></a></div> <div id="closeControl"><a href="#" onclick="<?php echo $popup ? 'window.close()' : 'history.go(-1);return false;' ?>"><?php echo $popup ? translate('Close') : translate('Back') ?></a></div>
</div> </div>
@ -89,25 +89,21 @@ if ( $streamMode == 'jpeg' ) {
echo 'title="Click to zoom, shift click to pan, ctrl click to zoom out"'; echo 'title="Click to zoom, shift click to pan, ctrl click to zoom out"';
} }
?> ?>
><?php echo getStreamHTML( $monitor, array('scale'=>$scale) ); ?></div> ><?php echo getStreamHTML($monitor, array('scale'=>$scale)); ?></div>
<?php if ( $monitor->Type() != 'WebSite' ) { ?> <?php if ( $monitor->Type() != 'WebSite' ) { ?>
<div id="monitorStatus"> <div id="monitorStatus">
<?php if ( canEdit('Monitors') ) { ?> <?php if ( canEdit('Monitors') ) { ?>
<div id="enableDisableAlarms"> <div id="enableDisableAlarms">
<a id="enableAlarmsLink" href="#" onclick="cmdEnableAlarms();return false;" class="hidden"> <button type="button" id="enableAlarmsLink" data-on-click="cmdEnableAlarms" class="hidden">
<?php echo translate('EnableAlarms') ?></a> <?php echo translate('EnableAlarms') ?></button>
<a id="disableAlarmsLink" href="#" onclick="cmdDisableAlarms();return false;" class="hidden"> <button type="button" id="disableAlarmsLink" data-on-click="cmdDisableAlarms" class="hidden">
<?php echo translate('DisableAlarms') ?></a> <?php echo translate('DisableAlarms') ?></button>
</div> </div>
<?php
}
if ( canEdit('Monitors') ) {
?>
<div id="forceCancelAlarm"> <div id="forceCancelAlarm">
<a id="forceAlarmLink" href="#" data-on-click="cmdForceAlarm"><?php echo translate('ForceAlarm') ?></a> <button type="button" id="forceAlarmLink" data-on-click="cmdForceAlarm"><?php echo translate('ForceAlarm') ?></button>
<a id="cancelAlarmLink" href="#" data-on-click="cmdCancelForcedAlarm" class="hidden"><?php echo translate('CancelForcedAlarm') ?></a> <button type="button" id="cancelAlarmLink" data-on-click="cmdCancelForcedAlarm" class="hidden"><?php echo translate('CancelForcedAlarm') ?></button>
</div> </div>
<?php <?php
} }
@ -150,11 +146,11 @@ if ( $streamMode == 'jpeg' ) {
<?php } // end if $monitor->Type() != 'WebSite' ?> <?php } // end if $monitor->Type() != 'WebSite' ?>
<?php <?php
if ( $showPtzControls ) { if ( $showPtzControls ) {
foreach ( getSkinIncludes( 'includes/control_functions.php' ) as $includeFile ) foreach ( getSkinIncludes('includes/control_functions.php') as $includeFile )
require_once $includeFile; require_once $includeFile;
?> ?>
<div id="ptzControls" class="ptzControls"> <div id="ptzControls" class="ptzControls">
<?php echo ptzControls( $monitor ) ?> <?php echo ptzControls($monitor) ?>
</div> </div>
<?php <?php
} }