diff --git a/web/skins/classic/css/base/views/console.css b/web/skins/classic/css/base/views/console.css index 1e2ac7162..50c821002 100644 --- a/web/skins/classic/css/base/views/console.css +++ b/web/skins/classic/css/base/views/console.css @@ -120,9 +120,11 @@ form[name="monitorForm"] { flex: 1 1 auto; overflow-y: auto; } +#toolbar, #contentButtons { float: none; display: flex; + flex-wrap: wrap; align-items: flex-start; justify-content: space-between; } diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index 621afa45d..1f10271a5 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -169,7 +169,7 @@ echo $navbar ?> -
+
-
- +
+
- + - - + + - + - + - + ' : '') .$eventCounts[$i]['title'] .''.PHP_EOL; } // end foreach eventCounts ?> - + diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js index 8155a359a..f33ad6857 100644 --- a/web/skins/classic/views/js/console.js +++ b/web/skins/classic/views/js/console.js @@ -204,16 +204,18 @@ function initPage() { } - // Setup the thumbnail video animation - if (!isMobile()) initThumbAnimation(); - $j('.functionLnk').click(manageFunctionModal); + $j('#consoleTable').bootstrapTable({icons: icons}).show(); + // Makes table sortable $j('#consoleTableBody').sortable({ disabled: true, update: applySort, axis: 'Y'} ); + + // Setup the thumbnail video animation + if (!isMobile()) initThumbAnimation(); } // end function initPage function sortMonitors(button) {