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

Use getStreamHTML to include the state html

pull/3477/head
Isaac Connor 2022-04-22 16:00:27 -04:00
parent 8d89639e2f
commit b15b0281be
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/skins/classic/views/zone.php
View File

@ -109,7 +109,6 @@ $selfIntersecting = isSelfIntersecting($newZone['Points']);
$focusWindow = true; $focusWindow = true;
# Have to do this here, because the .js.php references somethings figured out when generating the streamHTML # Have to do this here, because the .js.php references somethings figured out when generating the streamHTML
$monitor->connKey(); $monitor->connKey();
$StreamHTML = getStreamHTML($monitor, array('mode'=>'single'));
# So I'm thinking now that 50% of screen real-estate with a minimum of 640px. # So I'm thinking now that 50% of screen real-estate with a minimum of 640px.
# scale should be floor(whatever that width is/actual width) # scale should be floor(whatever that width is/actual width)
@ -144,7 +143,9 @@ xhtmlHeaders(__FILE__, translate('Zone'));
<div id="definitionPanel"> <div id="definitionPanel">
<div id="imagePanel"> <div id="imagePanel">
<div id="imageFrame"> <div id="imageFrame">
<?php echo $StreamHTML; ?> <?php echo
$monitor->getStreamHTML(array('mode'=>'single', 'zones'=>false, 'state'=>true));
?>
<svg id="zoneSVG" class="zones" viewBox="0 0 <?php echo $monitor->ViewWidth().' '.$monitor->ViewHeight() ?>"> <svg id="zoneSVG" class="zones" viewBox="0 0 <?php echo $monitor->ViewWidth().' '.$monitor->ViewHeight() ?>">
<?php <?php
if ( $zone['Id'] ) { if ( $zone['Id'] ) {
@ -165,7 +166,6 @@ if ( count($other_zones) ) {
Sorry, your browser does not support inline SVG Sorry, your browser does not support inline SVG
</svg> </svg>
</div><?php # imageFrame </div><?php # imageFrame
echo $monitor->getMonitorStateHTML();
?> ?>
<div id="StreamControlButtons"> <div id="StreamControlButtons">