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

Merge branch 'master' of github.com:ZoneMinder/zoneminder

This commit is contained in:
Isaac Connor 2020-08-17 17:44:21 -04:00
parent 11659249f0 80b92573b8
commit 72f96ed1dd
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/skins/classic/js/bootstrap-table-cookie.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -38,8 +38,21 @@ function initPage() {
var deleteBtn = $j('#deleteBtn'); var deleteBtn = $j('#deleteBtn');
var table = $j('#eventTable'); var table = $j('#eventTable');
// Define the icons used in the bootstrap-table top-right toolbar
var icons = {
paginationSwitchDown: 'fa-caret-square-o-down',
paginationSwitchUp: 'fa-caret-square-o-up',
refresh: 'fa-sync',
toggleOff: 'fa-toggle-off',
toggleOn: 'fa-toggle-on',
columns: 'fa-th-list',
fullscreen: 'fa-arrows-alt',
detailOpen: 'fa-plus',
detailClose: 'fa-minus'
}
// Init the bootstrap-table // Init the bootstrap-table
$j('#eventTable').bootstrapTable(); $j('#eventTable').bootstrapTable('destroy').bootstrapTable({ icons: icons });
// Hide these columns on first run when no cookie is saved // Hide these columns on first run when no cookie is saved
if ( !getCookie("zmEventsTable.bs.table.columns") ) { if ( !getCookie("zmEventsTable.bs.table.columns") ) {