From adc1b924dac4960d815042100568c4b3b7c2b232 Mon Sep 17 00:00:00 2001 From: digital-gnome <31593470+digital-gnome@users.noreply.github.com> Date: Mon, 20 Nov 2017 14:52:21 -0500 Subject: [PATCH] Remove events popup --- web/skins/classic/views/console.php | 9 ++++----- web/skins/classic/views/events.php | 8 ++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index 584fe6c62..d0f29f75f 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -245,8 +245,8 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) { foreach ( array_keys( $eventCounts ) as $i ) { ?> - ' . human_filesize($monitor[$i.'EventDiskSpace']), canView( 'Events' ) ) ?> + ' : '') . + $monitor[$i.'Events'] . '
' . human_filesize($monitor[$i.'EventDiskSpace']) ?>
@@ -281,9 +281,8 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) { parseFilter( $eventCounts[$i]['filter'] ); ?> -'.human_filesize($eventCounts[$i]['totaldiskspace']), canView( 'Events' ) ) ?> - + ' : '') . + $eventCounts[$i]['totalevents'].'
'.human_filesize($eventCounts[$i]['totaldiskspace']) ?>
diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php index 1ca91a709..cd2f865d4 100644 --- a/web/skins/classic/views/events.php +++ b/web/skins/classic/views/events.php @@ -81,10 +81,6 @@ if ( !empty($page) ) { $eventsSql .= ' limit 0, '.$limit; } -$maxWidth = 0; -$maxHeight = 0; -$archived = false; -$unarchived = false; $maxShortcuts = 5; $pagination = getPagination( $pages, $page, $maxShortcuts, $filterQuery.$sortQuery.'&limit='.$limit ); @@ -95,6 +91,7 @@ xhtmlHeaders(__FILE__, translate('Events') ); ?>
+
@@ -132,7 +129,6 @@ if ( $pages > 1 ) {

-