diff --git a/css/defaults.css b/css/defaults.css index e3c6f2e..c5c0c52 100644 --- a/css/defaults.css +++ b/css/defaults.css @@ -1,8 +1,23 @@ - /* Generic Style defintions */ -#FilterOptions +.ExpansionPlus +{ + background-image: url("../images/icons/navigate_plus.png"); + background-repeat: no-repeat; + background-position: left center; + padding-left: 20px; +} + +.ExpansionMinus +{ + background-image: url("../images/icons/navigate_minus.png"); + background-repeat: no-repeat; + background-position: left center; + padding-left: 20px; +} + +.HiddenContent { visibility: hidden; - position: relative; +/* position: relative; */ display: none; -} \ No newline at end of file +} diff --git a/include/constants_filters.php b/include/constants_filters.php index c71202e..28319ab 100644 --- a/include/constants_filters.php +++ b/include/constants_filters.php @@ -27,5 +27,10 @@ define('DATEMODE_ALL', 1); define('DATEMODE_RANGE', 2); define('DATEMODE_LASTX', 3); +define('DATE_LASTX_HOUR', 1); +define('DATE_LASTX_12HOURS', 2); +define('DATE_LASTX_24HOURS', 3); +define('DATE_LASTX_7DAYS', 4); +define('DATE_LASTX_31DAYS', 5); // --- ?> \ No newline at end of file diff --git a/include/constants_general.php b/include/constants_general.php index 2c2d795..bebe4ec 100644 --- a/include/constants_general.php +++ b/include/constants_general.php @@ -44,5 +44,10 @@ define('STR_DEBUG_ERROR_WTF', "WTF OMFG"); define('SOURCE_DISK', '1'); define('SOURCE_MYSQLDB', '2'); +// --- +define('UID_UNKNOWN', -1); + + + // --- ?> \ No newline at end of file diff --git a/include/functions_config.php b/include/functions_config.php index 702e8ec..6e2ccd9 100644 --- a/include/functions_config.php +++ b/include/functions_config.php @@ -20,8 +20,10 @@ } // --- - require_once('classes/logstreamconfig.class.php'); - require_once('classes/logstreamconfigdisk.class.php'); + // --- Perform necessary includes + require_once($gl_root_path . 'classes/logstreamconfig.class.php'); + require_once($gl_root_path . 'classes/logstreamconfigdisk.class.php'); + // --- function InitSourceConfigs() { diff --git a/include/functions_filters.php b/include/functions_filters.php index f0a11f6..f13a92e 100644 --- a/include/functions_filters.php +++ b/include/functions_filters.php @@ -1,105 +1,134 @@ www.phplogcon.org <- * - * * - * Use this script at your own risk! * - * ----------------------------------------------------------------- * - * Filter Helper functions for the frontend * - * * - ********************************************************************* - */ +/* + ********************************************************************* + * Copyright by Adiscon GmbH | 2008! * + * -> www.phplogcon.org <- * + * * + * Use this script at your own risk! * + * ----------------------------------------------------------------- * + * Filter Helper functions for the frontend * + * * + ********************************************************************* +*/ - // --- Avoid directly accessing this file! - if ( !defined('IN_PHPLOGCON') ) - { - die('Hacking attempt'); - exit; - } - // --- +// --- Avoid directly accessing this file! +if ( !defined('IN_PHPLOGCON') ) +{ + die('Hacking attempt'); + exit; +} +// --- - // --- Perform necessary includes - require_once($gl_root_path . 'include/constants_filters.php'); - // --- +// --- Perform necessary includes +require_once($gl_root_path . 'include/constants_filters.php'); +// --- - function InitFilterHelpers() - { - global $CFG, $content, $filters; +function InitFilterHelpers() +{ + global $CFG, $content, $filters; - // Init Default DateMode from SESSION! - if ( isset($_SESSION['filter_datemode']) ) - $filters['filter_datemode'] = intval($_SESSION['filter_datemode']); - else - $filters['filter_datemode'] = DATEMODE_ALL; + // Init Default DateMode from SESSION! + if ( isset($_SESSION['filter_datemode']) ) + $filters['filter_datemode'] = intval($_SESSION['filter_datemode']); + else + $filters['filter_datemode'] = DATEMODE_ALL; - // Init TimeFilter Helper Array - $content['datemodes'][0]['ID'] = DATEMODE_ALL; - $content['datemodes'][0]['DisplayName'] = $content['LN_DATEMODE_ALL']; - if ( $filters['filter_datemode'] == DATEMODE_ALL ) { $content['datemodes'][0]['selected'] = "selected"; } else { $content['datemodes'][0]['selected'] = ""; } - $content['datemodes'][1]['ID'] = DATEMODE_RANGE; - $content['datemodes'][1]['DisplayName'] = $content['LN_DATEMODE_RANGE']; - if ( $filters['filter_datemode'] == DATEMODE_RANGE ) { $content['datemodes'][1]['selected'] = "selected"; } else { $content['datemodes'][1]['selected'] = ""; } - $content['datemodes'][2]['ID'] = DATEMODE_LASTX; - $content['datemodes'][2]['DisplayName'] = $content['LN_DATEMODE_LASTX']; - if ( $filters['filter_datemode'] == DATEMODE_LASTX ) { $content['datemodes'][2]['selected'] = "selected"; } else { $content['datemodes'][2]['selected'] = ""; } - - // Init Date Range Parameters - $currentTime = time(); - $currentDay = date("d", $currentTime); - $currentMonth = date("m", $currentTime); - $currentYear = date("Y", $currentTime); - - // Init Year, month and day array! - for ( $i = $currentYear-5; $i <= $currentYear+5; $i++ ) - $content['years'][] = $i; - for ( $i = 1; $i <= 12; $i++ ) - $content['months'][] = $i; - for ( $i = 1; $i <= 31; $i++ ) - $content['days'][] = $i; + // Init TimeFilter Helper Array +// $content['datemodes'][0]['ID'] = DATEMODE_ALL; +// $content['datemodes'][0]['DisplayName'] = $content['LN_DATEMODE_ALL']; +// if ( $filters['filter_datemode'] == DATEMODE_ALL ) { $content['datemodes'][0]['selected'] = "selected"; } else { $content['datemodes'][0]['selected'] = ""; } + $content['datemodes'][0]['ID'] = DATEMODE_RANGE; + $content['datemodes'][0]['DisplayName'] = $content['LN_DATEMODE_RANGE']; + if ( $filters['filter_datemode'] == DATEMODE_RANGE ) { $content['datemodes'][0]['selected'] = "selected"; } else { $content['datemodes'][0]['selected'] = ""; } + $content['datemodes'][1]['ID'] = DATEMODE_LASTX; + $content['datemodes'][1]['DisplayName'] = $content['LN_DATEMODE_LASTX']; + if ( $filters['filter_datemode'] == DATEMODE_LASTX ) { $content['datemodes'][1]['selected'] = "selected"; } else { $content['datemodes'][1]['selected'] = ""; } + + // Init Date Range Parameters + $currentTime = time(); + $currentDay = date("d", $currentTime); + $currentMonth = date("m", $currentTime); + $currentYear = date("Y", $currentTime); + + // Init Year, month and day array! + for ( $i = $currentYear-5; $i <= $currentYear+5; $i++ ) + $content['years'][] = $i; + for ( $i = 1; $i <= 12; $i++ ) + $content['months'][] = $i; + for ( $i = 1; $i <= 31; $i++ ) + $content['days'][] = $i; - // Init filter_daterange_from_year - if ( isset($_SESSION['filter_daterange_from_year']) ) - $filters['filter_daterange_from_year'] = intval($_SESSION['filter_daterange_from_year']); - else - $filters['filter_daterange_from_year'] = $currentYear-1; - FillDateRangeArray($content['years'], "filter_daterange_from_year_list", "filter_daterange_from_year"); + // Init filter_daterange_from_year + if ( isset($_SESSION['filter_daterange_from_year']) ) + $filters['filter_daterange_from_year'] = intval($_SESSION['filter_daterange_from_year']); + else + $filters['filter_daterange_from_year'] = $currentYear-1; + FillDateRangeArray($content['years'], "filter_daterange_from_year_list", "filter_daterange_from_year"); - // Init filter_daterange_from_month - if ( isset($_SESSION['filter_daterange_from_month']) ) - $filters['filter_daterange_from_month'] = intval($_SESSION['filter_daterange_from_month']); - else - $filters['filter_daterange_from_month'] = $currentMonth; - FillDateRangeArray($content['months'], "filter_daterange_from_month_list", "filter_daterange_from_month"); + // Init filter_daterange_from_month + if ( isset($_SESSION['filter_daterange_from_month']) ) + $filters['filter_daterange_from_month'] = intval($_SESSION['filter_daterange_from_month']); + else + $filters['filter_daterange_from_month'] = $currentMonth; + FillDateRangeArray($content['months'], "filter_daterange_from_month_list", "filter_daterange_from_month"); - // Init filter_daterange_from_day - if ( isset($_SESSION['filter_daterange_from_day']) ) - $filters['filter_daterange_from_day'] = intval($_SESSION['filter_daterange_from_day']); - else - $filters['filter_daterange_from_day'] = $currentDay; - FillDateRangeArray($content['days'], "filter_daterange_from_day_list", "filter_daterange_from_day"); + // Init filter_daterange_from_day + if ( isset($_SESSION['filter_daterange_from_day']) ) + $filters['filter_daterange_from_day'] = intval($_SESSION['filter_daterange_from_day']); + else + $filters['filter_daterange_from_day'] = $currentDay; + FillDateRangeArray($content['days'], "filter_daterange_from_day_list", "filter_daterange_from_day"); - // Init filter_daterange_to_year - if ( isset($_SESSION['filter_daterange_to_year']) ) - $filters['filter_daterange_to_year'] = intval($_SESSION['filter_daterange_to_year']); - else - $filters['filter_daterange_to_year'] = $currentYear; - FillDateRangeArray($content['years'], "filter_daterange_to_year_list", "filter_daterange_to_year"); + // Init filter_daterange_to_year + if ( isset($_SESSION['filter_daterange_to_year']) ) + $filters['filter_daterange_to_year'] = intval($_SESSION['filter_daterange_to_year']); + else + $filters['filter_daterange_to_year'] = $currentYear; + FillDateRangeArray($content['years'], "filter_daterange_to_year_list", "filter_daterange_to_year"); - // Init filter_daterange_to_month - if ( isset($_SESSION['filter_daterange_to_month']) ) - $filters['filter_daterange_to_month'] = intval($_SESSION['filter_daterange_to_month']); - else - $filters['filter_daterange_to_month'] = $currentMonth; - FillDateRangeArray($content['months'], "filter_daterange_to_month_list", "filter_daterange_to_month"); + // Init filter_daterange_to_month + if ( isset($_SESSION['filter_daterange_to_month']) ) + $filters['filter_daterange_to_month'] = intval($_SESSION['filter_daterange_to_month']); + else + $filters['filter_daterange_to_month'] = $currentMonth; + FillDateRangeArray($content['months'], "filter_daterange_to_month_list", "filter_daterange_to_month"); - // Init filter_daterange_to_day - if ( isset($_SESSION['filter_daterange_to_day']) ) - $filters['filter_daterange_to_day'] = intval($_SESSION['filter_daterange_to_day']); - else - $filters['filter_daterange_to_day'] = $currentDay; - FillDateRangeArray($content['days'], "filter_daterange_to_day_list", "filter_daterange_to_day"); - } + // Init filter_daterange_to_day + if ( isset($_SESSION['filter_daterange_to_day']) ) + $filters['filter_daterange_to_day'] = intval($_SESSION['filter_daterange_to_day']); + else + $filters['filter_daterange_to_day'] = $currentDay; + FillDateRangeArray($content['days'], "filter_daterange_to_day_list", "filter_daterange_to_day"); + + // --- Define LASTX Array + + // Init Default DateMode from SESSION! + if ( isset($_SESSION['filter_lastx_default']) ) + $filters['filter_lastx_default'] = intval($_SESSION['filter_lastx_default']); + else + $filters['filter_lastx_default'] = DATE_LASTX_24HOURS; + + $content['filter_daterange_last_x_list'][0]['ID'] = DATE_LASTX_HOUR; + $content['filter_daterange_last_x_list'][0]['DisplayName'] = $content['LN_DATE_LASTX_HOUR']; + if ( $filters['filter_lastx_default'] == DATE_LASTX_HOUR ) { $content['filter_daterange_last_x_list'][0]['selected'] = "selected"; } else { $content['filter_daterange_last_x_list'][0]['selected'] = ""; } + + $content['filter_daterange_last_x_list'][1]['ID'] = DATE_LASTX_12HOURS; + $content['filter_daterange_last_x_list'][1]['DisplayName'] = $content['LN_DATE_LASTX_12HOURS']; + if ( $filters['filter_lastx_default'] == DATE_LASTX_12HOURS ) { $content['filter_daterange_last_x_list'][1]['selected'] = "selected"; } else { $content['filter_daterange_last_x_list'][1]['selected'] = ""; } + + $content['filter_daterange_last_x_list'][2]['ID'] = DATE_LASTX_24HOURS; + $content['filter_daterange_last_x_list'][2]['DisplayName'] = $content['LN_DATE_LASTX_24HOURS']; + if ( $filters['filter_lastx_default'] == DATE_LASTX_24HOURS ) { $content['filter_daterange_last_x_list'][2]['selected'] = "selected"; } else { $content['filter_daterange_last_x_list'][2]['selected'] = ""; } + + $content['filter_daterange_last_x_list'][3]['ID'] = DATE_LASTX_7DAYS; + $content['filter_daterange_last_x_list'][3]['DisplayName'] = $content['LN_DATE_LASTX_7DAYS']; + if ( $filters['filter_lastx_default'] == DATE_LASTX_7DAYS ) { $content['filter_daterange_last_x_list'][3]['selected'] = "selected"; } else { $content['filter_daterange_last_x_list'][3]['selected'] = ""; } + + $content['filter_daterange_last_x_list'][4]['ID'] = DATE_LASTX_31DAYS; + $content['filter_daterange_last_x_list'][4]['DisplayName'] = $content['LN_DATE_LASTX_31DAYS']; + if ( $filters['filter_lastx_default'] == DATE_LASTX_31DAYS ) { $content['filter_daterange_last_x_list'][4]['selected'] = "selected"; } else { $content['filter_daterange_last_x_list'][4]['selected'] = ""; } + // --- +} function FillDateRangeArray($sourcearray, $szArrayListName, $szFilterName) // $content['years'], "filter_daterange_from_year_list", "filter_daterange_from_year") { diff --git a/include/functions_frontendhelpers.php b/include/functions_frontendhelpers.php index 78ef4dd..ae2ba33 100644 --- a/include/functions_frontendhelpers.php +++ b/include/functions_frontendhelpers.php @@ -74,6 +74,10 @@ function CreateCurrentUrl() } } } + + // May can be removed later + $content['additional_url'] = ""; // "&serverid=" . $content['serverid']; + } diff --git a/index.php b/index.php index 9814d3a..d9d6a9b 100644 --- a/index.php +++ b/index.php @@ -19,13 +19,36 @@ define('IN_PHPLOGCON', true); $gl_root_path = './'; include($gl_root_path . 'include/functions_common.php'); include($gl_root_path . 'include/functions_frontendhelpers.php'); +include($gl_root_path . 'include/functions_filters.php'); InitPhpLogCon(); InitSourceConfigs(); InitFrontEndDefaults(); // Only in WebFrontEnd + +// Init Langauge first! +IncludeLanguageFile( $gl_root_path . '/lang/' . $LANG . '/main.php' ); + +// Helpers for frontend filtering! +InitFilterHelpers(); // *** *** // // --- CONTENT Vars +if ( isset($_GET['uid']) ) +{ + $currentUID = intval($_GET['uid']); +} +else + $currentUID = UID_UNKNOWN; + +// Init Pager variables +$content['uid_previous'] = UID_UNKNOWN; +$content['uid_next'] = UID_UNKNOWN; +$content['uid_first'] = UID_UNKNOWN; +$content['uid_last'] = UID_UNKNOWN; + +// Init Sorting variables +$content['sorting'] = ""; + //if ( isset($content['myserver']) ) // $content['TITLE'] = "PhpLogCon :: Home :: Server '" . $content['myserver']['Name'] . "'"; // Title of the Page //else @@ -48,11 +71,11 @@ if ( isset($content['Sources'][$currentSourceID]) && $content['Sources'][$curren // Create LogStream Object $stream = $stream_config->LogStreamFactory($stream_config); $stream->Open( array ( SYSLOG_DATE, SYSLOG_FACILITY, SYSLOG_FACILITY_TEXT, SYSLOG_SEVERITY, SYSLOG_SEVERITY_TEXT, SYSLOG_HOST, SYSLOG_SYSLOGTAG, SYSLOG_MESSAGE, SYSLOG_MESSAGETYPE ), true); + $stream->SetReadDirection(EnumReadDirection::Backward); - $uID = -1; + $uID = $currentUID; $counter = 0; -// $stream->SetReadDirection(EnumReadDirection::Backward); while ($stream->ReadNext($uID, $logArray) == SUCCESS && $counter <= 30) { @@ -74,6 +97,7 @@ if ( isset($content['Sources'][$currentSourceID]) && $content['Sources'][$curren if ( $stream->ReadNext($uID, $logArray) == SUCCESS ) { + $content['uid_next'] = $uID; // Enable Player Pager $content['main_pagerenabled'] = "true"; } @@ -107,8 +131,6 @@ if ( isset($content['syslogmessages']) && count($content['syslogmessages']) > 0 // --- // --- Parsen and Output -IncludeLanguageFile( $gl_root_path . '/lang/' . $LANG . '/main.php' ); - InitTemplateParser(); $page -> parser($content, "index.html"); $page -> output(); diff --git a/js/common.js b/js/common.js index b9eb2e1..df5b1f5 100644 --- a/js/common.js +++ b/js/common.js @@ -1,7 +1,11 @@ +/* +Helper Javascript Constants +*/ +const DATEMODE_ALL = 1, DATEMODE_RANGE = 2, DATEMODE_LASTX = 3; +const DATE_LASTX_HOUR = 1, DATE_LASTX_12HOURS = 2, DATE_LASTX_24HOURS = 3, DATE_LASTX_7DAYS = 4,DATE_LASTX_31DAYS = 5; + /* - Helper Javascript functions - */ function CheckAlphaPNGImage(ImageName, ImageTrans) @@ -28,18 +32,104 @@ function NewWindow(Location, WindowName,X_width,Y_height,Option) { } - -function togglevisibility(ElementName) +/* +* Helper function to show and hide a div area +*/ +function togglevisibility(ElementNameToggle, ElementNameButton) { - var toggle = document. getElementById(ElementName); + var toggle = document.getElementById(ElementNameToggle); + + // Button is optional + if (ElementNameButton != null) + { + var button = document.getElementById(ElementNameButton); + } + else + var button = null; + if (toggle.style.visibility == "visible") { + if (button != null) + { + button.className = "topmenu2 ExpansionPlus"; + } + toggle.style.visibility = "hidden"; toggle.style.display = "none"; } else { + if (button != null) + { + button.className = "topmenu2 ExpansionMinus"; + } + toggle.style.visibility = "visible"; toggle.style.display = "inline"; } } + +/* +* Helper function to hide a div area +*/ +function hidevisibility(ElementNameToggle, ElementNameButton) +{ + var toggle = document.getElementById(ElementNameToggle); + + // Button is optional + if (ElementNameButton != null) + { + var button = document.getElementById(ElementNameButton); + } + else + var button = null; + + if (button != null) + { + button.className = "topmenu2 ExpansionPlus"; + } + + toggle.style.visibility = "hidden"; + toggle.style.display = "none"; +} + +/* +* Helper function to show and hide areas of the filterview +*/ +function toggleDatefiltervisibility(FormName) +{ + var myform = document.getElementById(FormName); + if (myform.elements['filter_datemode'].value == DATEMODE_RANGE) + { + togglevisibility('HiddenDateFromOptions'); + hidevisibility('HiddenDateLastXOptions'); + } + else if (myform.elements['filter_datemode'].value == DATEMODE_LASTX) + { + togglevisibility('HiddenDateLastXOptions'); + hidevisibility('HiddenDateFromOptions'); + } + +} + +/* +* Helper function to add a date filter into the search field +*/ +function addDatefilterToSearch(DateName, SearchFormName) +{ + var myDateform = document.getElementById(DateName); + var mySearchform = document.getElementById(SearchFormName); + if (myDateform.elements['filter_datemode'].value == DATEMODE_RANGE) + { + mySearchform.elements['filter'].value += "date:from:" + myDateform.elements['filter_daterange_from_year'].value + "-" + + myDateform.elements['filter_daterange_from_month'].value + "-" + + myDateform.elements['filter_daterange_from_day'].value + ":to:" + + myDateform.elements['filter_daterange_to_year'].value + "-" + + myDateform.elements['filter_daterange_to_month'].value + "-" + + myDateform.elements['filter_daterange_to_day'].value + " "; + } + else if (myDateform.elements['filter_datemode'].value == DATEMODE_LASTX) + { + mySearchform.elements['filter'].value += "date:lastx:" + myDateform.elements['filter_daterange_last_x'].value + " "; + } +} \ No newline at end of file diff --git a/lang/en/main.php b/lang/en/main.php index 2cd67dd..2405117 100644 --- a/lang/en/main.php +++ b/lang/en/main.php @@ -24,4 +24,20 @@ $content['LN_GRID_INFOUNIT'] = "InfoUnit"; $content['LN_GRID_HOST'] = "Source"; $content['LN_GRID_MSG'] = "Message"; +// Filter Options +$content['LN_FILTER_DATE'] = "Datetime Range"; +$content['LN_FILTER_DATEMODE'] = "Select mode"; +$content['LN_DATEMODE_ALL'] = "All time"; +$content['LN_DATEMODE_RANGE'] = "Time range"; +$content['LN_DATEMODE_LASTX'] = "Time x since today"; +$content['LN_FILTER_DATEFROM'] = "Date range from"; +$content['LN_FILTER_DATETO'] = "Date range to"; +$content['LN_FILTER_DATELASTX'] = "Time since"; +$content['LN_FILTER_ADD2SEARCH'] = "Add to search"; +$content['LN_DATE_LASTX_HOUR'] = "Last hour"; +$content['LN_DATE_LASTX_12HOURS'] = "Last 12 hours"; +$content['LN_DATE_LASTX_24HOURS'] = "Last 24 hours"; +$content['LN_DATE_LASTX_7DAYS'] = "Last 7 days"; +$content['LN_DATE_LASTX_31DAYS'] = "Last 31 days"; + ?> \ No newline at end of file diff --git a/templates/include_menu.html b/templates/include_menu.html index 6f8afd7..4637adb 100644 --- a/templates/include_menu.html +++ b/templates/include_menu.html @@ -1,7 +1,6 @@ - +
- - + diff --git a/templates/index.html b/templates/index.html index 4c67397..d867868 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,46 +1,159 @@ -
HomeShow EventsShow Events Show SysLogTags User Options Database Options
+
+ - - + + + +
Filter Options  +  Search (filter): + +
+ + + +
+ 		+ Advanced Search +
+ (sample: faciliy:local0 severity:warn) +
-
- + +
+
- - - - +
Filter Options
  + + +
+ + + + + + + + +
+ {LN_FILTER_DATE}
{LN_FILTER_DATEMODE} + +
+ +
+ + + + + + + + + +
{LN_FILTER_DATEFROM} + + - + + - + +
{LN_FILTER_DATETO} + + - + + - + +
+
+ +
+ + + + + +
{LN_FILTER_DATELASTX} + +
+
+ + + + + +
+ +
+
  + +
+
-
+ - +
Recent syslog messages
- + + + - - + + - + - - + + +
 {LN_GEN_MOREPAGES} {LN_GEN_MOREPAGES} Pager:        {mypagenumber} {mypagenumber}      
- @@ -48,13 +161,13 @@ - - - - - - - + + + + + + + diff --git a/themes/dark/main.css b/themes/dark/main.css index 0dfe43b..1b67f53 100644 --- a/themes/dark/main.css +++ b/themes/dark/main.css @@ -203,6 +203,7 @@ font } .topmenu1_link, A.topmenu1_link { + background-color: #38110E; color: #FFDD22; } .topmenu1_link:hover, A.topmenu1_link:hover @@ -217,6 +218,40 @@ font color: #FFFFFF; background-color: #290604; } +.topmenu2 +{ + height: 16px; + border:1px ridge; + border-color: #D79993 #290604 #290604 #D79993; + + font: 10px Verdana, Arial, Helvetica, sans-serif; + color: #FFFFFF; + background-color: #38110E; +} +.topmenu2:hover +{ + color: #FFFF99; + background-color: #492D2B; + text-decoration: none; +} +.topmenu2_link, A.topmenu2_link +{ + color: #FFDD22; +} +.topmenu2_link:hover, A.topmenu2_link:hover +{ + color: #FFFF99; + text-decoration: none; +} +.topmenu2end +{ + height: 16px; + border:1px inset; + border-color: #D79993 #290604 #D79993 #D79993; + font: 10px Verdana, Arial, Helvetica, sans-serif; + color: #FFFFFF; + background-color: #290604; +} /* Cell Columns */ .cellmenu1 @@ -338,7 +373,7 @@ A.cellmenu1_link:hover } /* Form elements */ -select, input, textarea +select, input, button, textarea { background-color: #0B253C; color:#FFFFFF; @@ -347,5 +382,13 @@ select, input, textarea border-color: #233B51 #124A7C #124A7C #233B51; } - - +.SearchFormControl +{ + height: 20px; + margin: 2px; + background-color: #0B253C; + color:#FFFFFF; + font:bold 10px Verdana,Arial,Helvetica,sans-serif; + border: 1px solid; + border-color: #233B51 #124A7C #124A7C #233B51; +} diff --git a/themes/default/main.css b/themes/default/main.css index d8bfbee..c7b69ef 100644 --- a/themes/default/main.css +++ b/themes/default/main.css @@ -187,9 +187,9 @@ font /* TOP Menu Classes */ .topmenu1 { - height: 16px; + height: 20px; border:1px ridge; - border-color: #79AABE #09506C #09506C #79AABE; + border-color: #79AABE #09506C #79AABE #79AABE; font: 10px Verdana, Arial, Helvetica, sans-serif; color: #FFFFFF; @@ -203,6 +203,7 @@ font } .topmenu1_link, A.topmenu1_link { + background-color: #597196; color: #FFDD22; } .topmenu1_link:hover, A.topmenu1_link:hover @@ -212,16 +213,16 @@ font } .topmenuend { - height: 16px; + height: 20px; font: 10px Verdana, Arial, Helvetica, sans-serif; color: #FFFFFF; background-color: #597196; } .topmenu2 { - height: 16px; + height: 20px; border:1px ridge; - border-color: #79AABE #09506C #09506C #79AABE; + border-color: #79AABE #79AABE #09506C #79AABE; font: 10px Verdana, Arial, Helvetica, sans-serif; color: #FFFFFF; @@ -244,10 +245,12 @@ font } .topmenu2end { - height: 16px; + height: 20px; + border:1px inset; + border-color: #09506C #79AABE #09506C #09506C; font: 10px Verdana, Arial, Helvetica, sans-serif; color: #FFFFFF; - background-color: #597196; + background-color: #6A8296; } @@ -372,7 +375,7 @@ A.cellmenu1_link:hover } /* Form elements */ -select, input, textarea +select, input, button, textarea { background-color: #E8E7E2; color:#000000; @@ -381,3 +384,13 @@ select, input, textarea border-color: #233B51 #124A7C #124A7C #233B51; } +.SearchFormControl +{ + height: 20px; + margin: 2px; + background-color: #E8E7E2; + color:#000000; + font:bold 10px Verdana,Arial,Helvetica,sans-serif; + border: 1px solid; + border-color: #233B51 #124A7C #124A7C #233B51; +} \ No newline at end of file
{LN_TOP_UID}{LN_GRID_DATE}{LN_GRID_FACILITY}{LN_GRID_SEVERITY}{LN_GRID_SYSLOGTAG}{LN_GRID_INFOUNIT}{LN_GRID_HOST}{LN_TOP_UID}{LN_GRID_DATE}{LN_GRID_FACILITY}{LN_GRID_SEVERITY}{LN_GRID_SYSLOGTAG}{LN_GRID_INFOUNIT}{LN_GRID_HOST} {LN_GRID_MSG}