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

cleanup & consolidate events view buttons

This commit is contained in:
Andrew Bauer 2020-08-16 13:44:18 -05:00
parent 9be63f1d99
commit ee31761627
4 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/skins/classic/css/base/skin.css
View File

@ -576,6 +576,13 @@ input[type=submit],
text-align: center; text-align: center;
} }
.btn-normal,
.btn-normal:link {
color: #fff;
background-color: #3498db;
border: 1px solid #3498db;
}
button:hover, button:hover,
input[type=button]:hover, input[type=button]:hover,
input[type=submit]:hover, input[type=submit]:hover,

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

@ -97,22 +97,22 @@ xhtmlHeaders(__FILE__, translate('Events') );
<body> <body>
<div id="page"> <div id="page">
<?php echo getNavBarHTML() ?> <?php echo getNavBarHTML() ?>
<div id="header">
<a id="refreshLink" href="#"><?php echo translate('Refresh') ?></a>
<a id="timelineLink" href="?view=timeline<?php echo $filterQuery ?>"><?php echo translate('ShowTimeline') ?></a>
<a href="#" id="backLink"><?php echo translate('Back') ?></a>
</div>
<!-- Toolbar button placement and styling handled by bootstrap-tables -->
<div id="toolbar"> <div id="toolbar">
<button id="viewBtn" class="btn btn-primary btn-sm" disabled><i class="fa fa-binoculars"></i> View</button> <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" ><i class="fa fa-arrow-left"></i></button>
<button id="archiveBtn" class="btn btn-primary btn-sm" disabled><i class="fa fa-archive"></i> Archive</button> <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
<button id="unarchiveBtn" class="btn btn-primary btn-sm" disabled><i class="fa fa-file-archive-o"></i> Unarchive</button> <button id="tlineBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('ShowTimeline') ?>" ><i class="fa fa-history"></i></button>
<button id="editBtn" class="btn btn-primary btn-sm" disabled><i class="fa fa-pencil"></i> Edit</button> <button id="viewBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('View') ?>" disabled><i class="fa fa-binoculars"></i></button>
<button id="exportBtn" class="btn btn-primary btn-sm" disabled><i class="fa fa-external-link"></i> Export</button> <button id="archiveBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Archive') ?>" disabled><i class="fa fa-archive"></i></button>
<button id="downloadBtn" class="btn btn-primary btn-sm" disabled><i class="fa fa-download"></i> Download Video</button> <button id="unarchiveBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Unarchive') ?>" disabled><i class="fa fa-file-archive-o"></i></button>
<button id="deleteBtn" class="btn btn-danger btn-sm" disabled><i class="fa fa-trash"></i> Delete</button> <button id="editBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Edit') ?>" disabled><i class="fa fa-pencil"></i></button>
<button id="exportBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Export') ?>" disabled><i class="fa fa-external-link"></i></button>
<button id="downloadBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('DownloadVideo') ?>" disabled><i class="fa fa-download"></i></button>
<button id="deleteBtn" class="btn btn-danger" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Delete') ?>" disabled><i class="fa fa-trash"></i></button>
</div> </div>
<!-- Table styling handled by bootstrap-tables -->
<div class="table-responsive-sm p-3"> <div class="table-responsive-sm p-3">
<table <table
id="eventTable" id="eventTable"
@ -120,7 +120,8 @@ xhtmlHeaders(__FILE__, translate('Events') );
data-pagination="true" data-pagination="true"
data-search="true" data-search="true"
data-cookie="true" data-cookie="true"
data-cookie-id-table="zmEventTable" data-cookie-id-table="zmEventsTable"
data-cookie-expire="2y"
data-click-to-select="true" data-click-to-select="true"
data-remember-order="true" data-remember-order="true"
data-show-columns="true" data-show-columns="true"
@ -139,13 +140,10 @@ $disk_space_total = 0;
$results = dbQuery($eventsSql); $results = dbQuery($eventsSql);
while ( $event_row = dbFetchNext($results) ) { while ( $event_row = dbFetchNext($results) ) {
$event = new ZM\Event($event_row); $event = new ZM\Event($event_row);
if ( $event_row['Archived'] )
$archived = true;
else
$unarchived = true;
if ( ($count++%ZM_WEB_EVENTS_PER_PAGE) == 0 ) { if ( ($count++%ZM_WEB_EVENTS_PER_PAGE) == 0 ) {
?> ?>
<!-- Row styling is handled by bootstrap-tables -->
<tr> <tr>
<th data-sortable="false" data-field="toggleCheck" data-field="state" data-checkbox="true" name="toggleCheck" value="1" data-checkbox-name="eids[]" data-on-click-this="updateFormCheckboxesByName"></th> <th data-sortable="false" data-field="toggleCheck" data-field="state" data-checkbox="true" name="toggleCheck" value="1" data-checkbox-name="eids[]" data-on-click-this="updateFormCheckboxesByName"></th>
<th data-sortable="true" data-field="Id"><?php echo translate('Id') ?></th> <th data-sortable="true" data-field="Id"><?php echo translate('Id') ?></th>
@ -297,11 +295,5 @@ while ( $event_row = dbFetchNext($results) ) {
</table> </table>
</div> </div>
</div> </div>
<script nonce="<?php echo $cspNonce;?>">
// These are defined in the .js.php but need to be updated down here.
// This might be better done by selecting through the dom for the archived class
archivedEvents = <?php echo !empty($archived)?'true':'false' ?>;
unarchivedEvents = <?php echo !empty($unarchived)?'true':'false' ?>;
</script>
</body> </body>
</html> </html>

15
web/skins/classic/views/js/events.js
View File

@ -59,15 +59,20 @@ function initPage() {
this.addEventListener('mouseover', thumbnail_onmouseover, false); this.addEventListener('mouseover', thumbnail_onmouseover, false);
this.addEventListener('mouseout', thumbnail_onmouseout, false); this.addEventListener('mouseout', thumbnail_onmouseout, false);
}); });
// Manage the Refresh link // Manage the BACK button
document.getElementById("refreshLink").addEventListener("click", function onRefreshClick(evt) { document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
evt.preventDefault();
window.history.back();
});
// Manage the REFRESH Button
document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
evt.preventDefault(); evt.preventDefault();
window.location.reload(true); window.location.reload(true);
}); });
// Manage the BACK link // Manage the TIMELINE Button
document.getElementById("backLink").addEventListener("click", function onBackClick(evt) { document.getElementById("tlineBtn").addEventListener("click", function onTlineClick(evt) {
evt.preventDefault(); evt.preventDefault();
window.history.back(); window.location.assign('?view=timeline'+filterQuery);
}); });
// Manage the VIEW button // Manage the VIEW button
document.getElementById("viewBtn").addEventListener("click", function onViewClick(evt) { document.getElementById("viewBtn").addEventListener("click", function onViewClick(evt) {

3
web/skins/classic/views/js/events.js.php
View File

@ -1,9 +1,6 @@
//var openFilterWindow = <?php echo $_REQUEST['filter']?'true':'false' ?>; //var openFilterWindow = <?php echo $_REQUEST['filter']?'true':'false' ?>;
var openFilterWindow = false; var openFilterWindow = false;
var archivedEvents = <?php echo !empty($archived)?'true':'false' ?>;
var unarchivedEvents = <?php echo !empty($unarchived)?'true':'false' ?>;
var filterQuery = '<?php echo isset($filterQuery)?validJsStr(htmlspecialchars_decode($filterQuery)):'' ?>'; var filterQuery = '<?php echo isset($filterQuery)?validJsStr(htmlspecialchars_decode($filterQuery)):'' ?>';
var sortQuery = '<?php echo isset($sortQuery)?validJsStr(htmlspecialchars_decode($sortQuery)):'' ?>'; var sortQuery = '<?php echo isset($sortQuery)?validJsStr(htmlspecialchars_decode($sortQuery)):'' ?>';