From 76e3756ea666489dbac2cd13e9ca4fb002ce8f5b Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 16 Jan 2023 14:43:29 -0500 Subject: [PATCH] Fixup structure and add styles for sticky header --- .../css/base/views/report_event_audit.css | 5 +++ web/skins/classic/css/base/views/snapshot.css | 6 +++- .../classic/views/report_event_audit.php | 34 +++++++++++-------- web/skins/classic/views/snapshot.php | 12 ++++--- 4 files changed, 36 insertions(+), 21 deletions(-) diff --git a/web/skins/classic/css/base/views/report_event_audit.css b/web/skins/classic/css/base/views/report_event_audit.css index c0f1e799d..cf1b0de3e 100644 --- a/web/skins/classic/css/base/views/report_event_audit.css +++ b/web/skins/classic/css/base/views/report_event_audit.css @@ -10,3 +10,8 @@ .colZeroSize { text-align: left; } + +#results { + height: 100%; + overflow-y: auto; +} diff --git a/web/skins/classic/css/base/views/snapshot.css b/web/skins/classic/css/base/views/snapshot.css index b54036859..ef9b95c06 100644 --- a/web/skins/classic/css/base/views/snapshot.css +++ b/web/skins/classic/css/base/views/snapshot.css @@ -1,5 +1,4 @@ #content { - margin: 0 15px; } .Name { @@ -15,3 +14,8 @@ .Description textarea { width: 100%; } + +#video { + overflow-y: auto; + height: 100%; +} diff --git a/web/skins/classic/views/report_event_audit.php b/web/skins/classic/views/report_event_audit.php index e67f48443..66ff13cef 100644 --- a/web/skins/classic/views/report_event_audit.php +++ b/web/skins/classic/views/report_event_audit.php @@ -24,8 +24,6 @@ include('_monitor_filters.php'); $filterbar = ob_get_contents(); ob_end_clean(); -noCacheHeaders(); -xhtmlHeaders( __FILE__, translate('Console')); if ( isset($_REQUEST['minTime']) ) { $minTime = validHtmlStr($_REQUEST['minTime']); @@ -105,20 +103,25 @@ while ( $event = $result->fetch(PDO::FETCH_ASSOC) ) { $EventsByMonitor[$event['MonitorId']]['Events'][] = $Event; } # end foreach event +noCacheHeaders(); +xhtmlHeaders( __FILE__, translate('Report Event Audit')); +getBodyTopHTML(); +echo $navbar; ?> - - -
-
- -
- - - -
-
+
+
+ +
+ +
+ + + +
+
+ -
+
@@ -205,5 +208,6 @@ for ( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
- +
+
diff --git a/web/skins/classic/views/snapshot.php b/web/skins/classic/views/snapshot.php index ff36689d9..3330dca56 100644 --- a/web/skins/classic/views/snapshot.php +++ b/web/skins/classic/views/snapshot.php @@ -38,10 +38,11 @@ if ( $user['MonitorIds'] ) { $monitor_ids = explode(',', $user['MonitorIds']); } xhtmlHeaders(__FILE__, translate('Snapshot').' '.$snapshot->Id()); +getBodyTopHTML(); +echo getNavBarHTML(); ?> -
- +
Id() ) { echo '
Snapshot was not found.
'; @@ -66,7 +67,7 @@ if ( !$snapshot->Id() ) {

Id() ?>

-
+
@@ -81,9 +82,10 @@ if ( !$snapshot->Id() ) {
+ Id() ) { ?> -
+
Events(); $width = 100 / ( count($events) < 2 ? 1 : ( ( count($events) < 4 ) ? count($events) : 4 ) )-1; @@ -94,7 +96,6 @@ if ( !$snapshot->Id() ) { ?>
Id() ?> -

+