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

Remove timeline popup

This commit is contained in:
digital-gnome 2017-11-27 13:43:15 -05:00
parent 9d1bbfab42
commit e6568d01a3
6 changed files with 6 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/skins/classic/css/classic/views/timeline.css
View File

@ -15,20 +15,6 @@
line-height: 20px; line-height: 20px;
} }
#listLink {
position: absolute;
top: 5px;
left: 20px;
height: 15px;
}
#closeLink {
position: absolute;
top: 5px;
right: 20px;
height: 15px;
}
#topPanel { #topPanel {
position: relative; position: relative;
height: 220px; height: 220px;

14
web/skins/classic/css/dark/views/timeline.css
View File

@ -15,20 +15,6 @@
line-height: 20px; line-height: 20px;
} }
#listLink {
position: absolute;
top: 5px;
left: 20px;
height: 15px;
}
#closeLink {
position: absolute;
top: 5px;
right: 20px;
height: 15px;
}
#topPanel { #topPanel {
position: relative; position: relative;
height: 220px; height: 220px;

14
web/skins/classic/css/flat/views/timeline.css
View File

@ -15,20 +15,6 @@
line-height: 20px; line-height: 20px;
} }
#listLink {
position: absolute;
top: 5px;
left: 20px;
height: 15px;
}
#closeLink {
position: absolute;
top: 5px;
right: 20px;
height: 15px;
}
#topPanel { #topPanel {
position: relative; position: relative;
height: 220px; height: 220px;

2
web/skins/classic/views/events.php
View File

@ -129,7 +129,7 @@ if ( $pages > 1 ) {
<input type="hidden" name="limit" value="<?php echo $limit ?>"/> <input type="hidden" name="limit" value="<?php echo $limit ?>"/>
<p id="controls"> <p id="controls">
<a id="refreshLink" href="#" onclick="location.reload(true);"><?php echo translate('Refresh') ?></a> <a id="refreshLink" href="#" onclick="location.reload(true);"><?php echo translate('Refresh') ?></a>
<a id="timelineLink" href="#" onclick="createPopup( '?view=timeline<?php echo $filterQuery ?>', 'zmTimeline', 'timeline' );"><?php echo translate('ShowTimeline') ?></a> <a id="timelineLink" href="?view=timeline<?php echo $filterQuery ?>"><?php echo translate('ShowTimeline') ?></a>
</p> </p>
<table id="contentTable" class="major"> <table id="contentTable" class="major">
<tbody> <tbody>

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

@ -3,8 +3,7 @@ var events = {};
function showEvent( eid, fid, width, height ) { function showEvent( eid, fid, width, height ) {
var url = '?view=event&eid='+eid+'&fid='+fid; var url = '?view=event&eid='+eid+'&fid='+fid;
url += filterQuery; url += filterQuery;
var pop=createPopup( url, 'zmEvent', 'event', width, height ); window.location.href = url;
pop.vid=$('preview');
//video element is blocking video elements elsewhere in chrome possible interaction with mouseover event? //video element is blocking video elements elsewhere in chrome possible interaction with mouseover event?
//FIXME unless an exact cause can be determined should store all video controls and do something to the other controls when we want to load a new video seek etc or whatever may block //FIXME unless an exact cause can be determined should store all video controls and do something to the other controls when we want to load a new video seek etc or whatever may block

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

@ -700,12 +700,12 @@ xhtmlHeaders(__FILE__, translate('Timeline') );
?> ?>
<body> <body>
<div id="page"> <div id="page">
<?php echo getNavBarHTML() ?>
<div id="header"> <div id="header">
<div id="headerButtons">
<?php echo makePopupLink( '?view=events&amp;page=1'.htmlspecialchars($filterQuery), 'zmEvents', 'events', translate('List'), canView( 'Events' ) ) ?>
<a href="#" onclick="closeWindow();"><?php echo translate('Close') ?></a>
</div>
<h2><?php echo translate('Timeline') ?></h2> <h2><?php echo translate('Timeline') ?></h2>
<div id="headerButtons">
<a href="#" onclick="window.history.back();"><?php echo translate('Back') ?></a>
</div>
</div> </div>
<div id="content" class="chartSize"> <div id="content" class="chartSize">
<div id="topPanel" class="graphWidth"> <div id="topPanel" class="graphWidth">