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

Split the data by monitor and display a monitor image/info for each monitor.

pull/3434/head
Isaac Connor 2020-01-05 17:33:36 -05:00
parent 2854f8e002
commit b788c432d4
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
web/skins/classic/views/timeline.php
View File

@ -494,7 +494,7 @@ for ( $i = 0; $i < $chart['graph']['width']; $i++ ) {
} # end foreach MonitorId } # end foreach MonitorId
} # end foreach x } # end foreach x
ZM\Logger::Debug(print_r( $monEventSlots,true )); #ZM\Logger::Debug(print_r( $monEventSlots,true ));
//print_r( $monFrameSlots ); //print_r( $monFrameSlots );
//print_r( $chart ); //print_r( $chart );
@ -683,23 +683,32 @@ xhtmlHeaders(__FILE__, translate('Timeline'));
</div> </div>
</div> </div>
<div id="content" class="chartSize"> <div id="content" class="chartSize">
<div id="instruction">
<p><?php echo translate('TimelineTip1') ?></p>
<p><?php echo translate('TimelineTip2') ?></p>
<p><?php echo translate('TimelineTip3') ?></p>
<p><?php echo translate('TimelineTip4') ?></p>
</div>
<div id="topPanel" class="graphWidth"> <div id="topPanel" class="graphWidth">
<div id="imagePanel"> <?php
<div id="image" class="imageHeight"> foreach ( $monitors as $monitor ) {
<img id="imageSrc" class="imageWidth" src="graphics/transparent.png" alt="<?php echo translate('ViewEvent') ?>" title="<?php echo translate('ViewEvent') ?>"/> ?>
</div> <div class="monitorPanel" style="width:<?php echo 100/count($monitors); ?>%;float:left;">
</div> <div class="imagePanel">
<div id="dataPanel"> <div class="imageHeight image">
<div id="textPanel"> <img id="imageSrc<?php echo $monitor->Id() ?>" class="imageWidth" src="graphics/transparent.png" alt="<?php echo translate('ViewEvent') ?>" title="<?php echo translate('ViewEvent') ?>"/>
<div id="instruction">
<p><?php echo translate('TimelineTip1') ?></p>
<p><?php echo translate('TimelineTip2') ?></p>
<p><?php echo translate('TimelineTip3') ?></p>
<p><?php echo translate('TimelineTip4') ?></p>
</div>
<div id="eventData">
</div> </div>
</div> </div>
<div id="dataPanel<?php echo $monitor->Id() ?>">
<div id="textPanel<?php echo $monitor->Id() ?>">
<div id="eventData<?php echo $monitor->Id() ?>">
</div>
</div>
</div>
</div>
<?php
} # end foreach monitor
?>
<div id="navPanel"> <div id="navPanel">
<button type="button" title="<?php echo translate('PanLeft') ?>" data-on-click="tlPanLeft"> <button type="button" title="<?php echo translate('PanLeft') ?>" data-on-click="tlPanLeft">
<i class="material-icons md-18">fast_rewind</i> <i class="material-icons md-18">fast_rewind</i>
@ -711,7 +720,6 @@ xhtmlHeaders(__FILE__, translate('Timeline'));
<i class="material-icons md-18">fast_forward</i> <i class="material-icons md-18">fast_forward</i>
</button> </button>
</div> </div>
</div>
</div> </div>
<div id="chartPanel"> <div id="chartPanel">
<div id="chart" class="graphSize"> <div id="chart" class="graphSize">