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

Start stream with single jpeg. Add monitor div around imagefeed

pull/4202/head
Isaac Connor 2022-05-31 13:58:13 -04:00
parent cb11ce100f
commit afbf5ebe60
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
web/skins/classic/views/cycle.php
View File

@ -29,14 +29,15 @@ $filterbar = ob_get_contents();
ob_end_clean(); ob_end_clean();
$options = array(); $options = array();
$options['mode'] = 'single';
if ( empty($_REQUEST['mode']) ) { if ( empty($_REQUEST['mode']) ) {
if ( canStream() ) if ( canStream() )
$options['mode'] = 'stream'; $mode = 'stream';
else else
$options['mode'] = 'still'; $mode = 'still';
} else { } else {
$options['mode'] = validHtmlStr($_REQUEST['mode']); $mode = validHtmlStr($_REQUEST['mode']);
} }
$widths = array( $widths = array(
@ -89,7 +90,6 @@ if ( $monitors ) {
if ( !$monitor ) { if ( !$monitor ) {
ZM\Error('There was no monitor to display.'); ZM\Error('There was no monitor to display.');
} }
$options['connkey'] = generateConnKey();
zm_session_start(); zm_session_start();
@ -122,8 +122,6 @@ if ( isset($_COOKIE['zmCycleHeight']) and $_COOKIE['zmCycleHeight'] ) {
session_write_close(); session_write_close();
ZM\Debug(print_r($options,true));
noCacheHeaders(); noCacheHeaders();
xhtmlHeaders(__FILE__, translate('CycleWatch')); xhtmlHeaders(__FILE__, translate('CycleWatch'));
?> ?>
@ -132,7 +130,7 @@ xhtmlHeaders(__FILE__, translate('CycleWatch'));
<?php echo $navbar = getNavBarHTML(); ?> <?php echo $navbar = getNavBarHTML(); ?>
<div id="header"> <div id="header">
<div id="headerButtons"> <div id="headerButtons">
<?php if ( $options['mode'] == 'stream' ) { ?> <?php if ( $mode == 'stream' ) { ?>
<a href="?view=<?php echo $view ?>&amp;mode=still&amp;mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stills') ?></a> <a href="?view=<?php echo $view ?>&amp;mode=still&amp;mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stills') ?></a>
<?php } else { ?> <?php } else { ?>
<a href="?view=<?php echo $view ?>&amp;mode=stream&amp;mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stream') ?></a> <a href="?view=<?php echo $view ?>&amp;mode=stream&amp;mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stream') ?></a>
@ -171,8 +169,8 @@ xhtmlHeaders(__FILE__, translate('CycleWatch'));
</ul> </ul>
</nav> </nav>
<div class="container-fluid col-sm-offset-2 h-100 pr-0"> <div class="container-fluid col-sm-offset-2 h-100 pr-0">
<div class="monitor" id="monitor<?php echo $monitor->Id() ?>">
<div id="imageFeed<?php echo $monitor->Id() ?>" class="imageFeed"> <div id="imageFeed<?php echo $monitor->Id() ?>" class="imageFeed">
<?php <?php
if ( $monitor ) { if ( $monitor ) {
echo getStreamHTML($monitor, $options); echo getStreamHTML($monitor, $options);
@ -180,6 +178,7 @@ xhtmlHeaders(__FILE__, translate('CycleWatch'));
echo 'There are no monitors to view.'; echo 'There are no monitors to view.';
} }
?> ?>
</div>
</div> </div>
<div id="buttons" class="buttons"> <div id="buttons" class="buttons">