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

Fix Timeline view, add list link

This commit is contained in:
digital-gnome 2017-12-01 09:52:46 -05:00
parent 539172b769
commit 11629076f6
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/classic/includes/timeline_functions.php
View File

@ -366,7 +366,7 @@ function parseTreeToFilter( $tree )
$level = 0; $level = 0;
_parseTreeToFilter( $tree, $terms, $level ); _parseTreeToFilter( $tree, $terms, $level );
} }
return( array( 'terms' => $terms ) ); return( array( 'Query' => array( 'terms' => $terms ) ) );
} }
function parseTreeToQuery( $tree ) function parseTreeToQuery( $tree )

2
web/skins/classic/views/js/timeline.js
View File

@ -151,5 +151,5 @@ function tlZoomRange( midTime, range ) {
} }
function tlPan( midTime, range ) { function tlPan( midTime, range ) {
location('?view='+currentView+filterQuery+'&midTime='+midTime+'&range='+range); location.replace('?view='+currentView+filterQuery+'&midTime='+midTime+'&range='+range);
} }

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

@ -708,6 +708,7 @@ xhtmlHeaders(__FILE__, translate('Timeline') );
</div> </div>
<div id="headerButtons"> <div id="headerButtons">
<a href="#" onclick="window.history.back();"><?php echo translate('Back') ?></a> <a href="#" onclick="window.history.back();"><?php echo translate('Back') ?></a>
<a href="?view=events&amp;page=1<?php echo htmlspecialchars($filterQuery) ?>"><?php echo translate('List') ?></a>
</div> </div>
</div> </div>
<div id="content" class="chartSize"> <div id="content" class="chartSize">