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

hide the video, let's stick with jpeg's, which will be auto-generated

This commit is contained in:
Isaac Connor 2017-04-07 13:20:28 -04:00
parent 8f51331472
commit 92a2d6f4f2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@
//
if ( !canView( 'Events' ) ) {
$view = "error";
$view = 'error';
return;
}
@ -33,8 +33,8 @@ foreach ( getSkinIncludes( 'includes/timeline_functions.php' ) as $includeFile )
//
// When the chart range is years
define( "STRF_TL_AXIS_RANGE_YEAR1", "%b %Y" );
define( "STRF_TL_AXIS_RANGE_YEAR2", STRF_TL_AXIS_RANGE_YEAR1 );
define( 'STRF_TL_AXIS_RANGE_YEAR1', '%b %Y' );
define( 'STRF_TL_AXIS_RANGE_YEAR2', STRF_TL_AXIS_RANGE_YEAR1 );
// When the chart range is months
define( "STRF_TL_AXIS_RANGE_MONTH1", "%b" );
@ -140,8 +140,8 @@ foreach( dbFetchAll( $monitorsSql ) as $row ) {
$monitors[$row['Id']] = $row;
}
$rangeSql = "select min(E.StartTime) as MinTime, max(E.EndTime) as MaxTime from Events as E inner join Monitors as M on (E.MonitorId = M.Id) where not isnull(E.StartTime) and not isnull(E.EndTime)";
$eventsSql = "select E.Id,E.Name,E.StartTime,E.EndTime,E.Length,E.Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId from Events as E inner join Monitors as M on (E.MonitorId = M.Id) where not isnull(StartTime)";
$rangeSql = 'select min(E.StartTime) as MinTime, max(E.EndTime) as MaxTime from Events as E inner join Monitors as M on (E.MonitorId = M.Id) where not isnull(E.StartTime) and not isnull(E.EndTime)';
$eventsSql = 'select E.* from Events as E inner join Monitors as M on (E.MonitorId = M.Id) where not isnull(StartTime)';
if ( !empty($user['MonitorIds']) ) {
$monFilterSql = ' AND M.Id IN ('.$user['MonitorIds'].')';
@ -706,10 +706,12 @@ xhtmlHeaders(__FILE__, translate('Timeline') );
//due to chrome bug, has to enable https://code.google.com/p/chromium/issues/detail?id=472300
//crossorigin has to be added below to make caption work in chrome
?>
<!--
<video id="preview" width="100%" controls crossorigin="anonymous">
<source src="" type="video/mp4">
Your browser does not support the video tag.
</video>
o-->
</div>
</div>