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

put an mid in imageFeed id so we can use MOnitorStream.js. Use Monitor->getStatusHTML to generate status html

This commit is contained in:
Isaac Connor 2022-01-20 11:52:54 -05:00
parent e73659843a
commit 9c3509a620
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,7 +247,7 @@ echo htmlSelect('cyclePeriod', $cyclePeriodOptions, $period, array('id'=>'cycleP
</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 id="imageFeed" <div id="imageFeed<?php echo $monitor->Id() ?>"
<?php <?php
if ($streamMode == 'jpeg') { 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"';
@ -255,24 +255,9 @@ if ($streamMode == 'jpeg') {
?> ?>
><?php echo getStreamHTML($monitor, $options); ?> ><?php echo getStreamHTML($monitor, $options); ?>
</div> </div>
<?php if ($monitor->Type() != 'WebSite') { ?> <?php if ($monitor->Type() != 'WebSite') {
<div id="monitorStatus"> echo $monitor->getMonitorStateHTML();
<div id="monitorState"> ?>
<span><?php echo translate('State') ?>:<span id="stateValue"></span></span>
<span id="viewingFPS" title="<?php echo translate('Viewing FPS')?>"><span id="viewingFPSValue"></span> fps</span>
<span id="captureFPS" title="<?php echo translate('Capturing FPS')?>"><span id="captureFPSValue"></span> fps</span>
<?php if ( $monitor->Function() == 'Modect' or $monitor->Function() == 'Mocord' ) { ?>
<span id="analysisFPS" title="<?php echo translate('Analysis FPS')?>"><span id="analysisFPSValue"></span> fps</span>
<?php } ?>
</div>
</div>
<div id="replayStatus"<?php echo $streamMode=="single" ? ' class="hidden"' : '' ?>>
<span id="mode"><?php echo translate('Mode') ?>: <span id="modeValue"></span></span>
<span id="rate"><?php echo translate('Rate') ?>: <span id="rateValue"></span>x</span>
<span id="delay"><?php echo translate('Delay') ?>: <span id="delayValue"></span>s</span>
<span id="level"><?php echo translate('Buffer') ?>: <span id="levelValue"></span>%</span>
<span id="zoom"><?php echo translate('Zoom') ?>: <span id="zoomValue"></span>x</span>
</div>
<div class="buttons" id="dvrControls"> <div class="buttons" id="dvrControls">
<?php <?php
if ($streamMode == 'jpeg') { if ($streamMode == 'jpeg') {
@ -413,4 +398,5 @@ if ( ZM_WEB_SOUND_ON_ALARM ) {
</div> </div>
<script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script> <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
<script src="/javascript/janus/janus.js"></script> <script src="/javascript/janus/janus.js"></script>
<script src="<?php echo cache_bust('js/MonitorStream.js') ?>"></script>
<?php xhtmlFooter() ?> <?php xhtmlFooter() ?>