From 48a5aaee7f78a4f34264ce60bc1a11f69b3f6682 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Tue, 6 May 2008 16:23:07 +0200 Subject: [PATCH] Added new menu links for Event fields to search in our upcoming global repository. Also fixed minor css issues with the menu.css --- src/css/menu.css | 17 +- src/images/icons/earth_network.png | Bin 0 -> 872 bytes src/include/functions_common.php | 2 + src/index.php | 32 +- src/lang/de/main.php | 7 +- src/lang/en/main.php | 3 +- src/templates/index.html | 13 +- src/themes/dark/main.css | 782 ++++++++++++++--------------- src/themes/default/main.css | 36 +- 9 files changed, 444 insertions(+), 448 deletions(-) create mode 100644 src/images/icons/earth_network.png diff --git a/src/css/menu.css b/src/css/menu.css index 1061fc1..277a3ad 100644 --- a/src/css/menu.css +++ b/src/css/menu.css @@ -12,25 +12,22 @@ /* style, color and size links and headings to suit */ #menu a, #menu h2 { display: block; - border-width: 1px; - border-style: solid; - margin: 0; - padding: 1px 1px; + margin: 2px; + padding: 1px 1px; } #menu h2 { + font-size: 12px; font: bold; text-align: center; } #menu a { text-decoration: none; - border-color: #44617D #203040 #203040 #44617D; } #menu a:hover { text-decoration: none; - border-color: #44617D #203040 #203040 #44617D; } #menu li { @@ -38,9 +35,17 @@ position: relative; } +#menu ul li ul li { + border-width: 1px; + border-style: solid; + border-color: #44617D #203040 #203040 #44617D; +} + #menu ul ul { z-index:10; +/* border-color: #44617D #203040 #203040 #44617D; */ + position: absolute; top: 12px; left: 4px; /* to position them to the right of their containing block */ diff --git a/src/images/icons/earth_network.png b/src/images/icons/earth_network.png new file mode 100644 index 0000000000000000000000000000000000000000..24484aecefcd79d0c482ba008f102b4724792f94 GIT binary patch literal 872 zcmV-u1DE`XP)WdKcSATc)}L3L*!GB7YTATcpIG&MRgF(4~2F)%Pb%&Rv5000McNliru z)&&<0F*|Y-$N>NV010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00O{C zL_t(|+GUeVOcPNQhR)k?V$e-Y>p@;}cmUflTkb@=Fu&-T(-7_7V4_|UL+ zU^lD^I*SL)z4Z+ZhJfq+Qrbj1VKBKO+;Rl2jF(A6#HJsC+M;?8;uqj=ViQC9z1R*F1^`pC6N>VApvW1Jr78$h`=tDGvuN_8+5UZDNgz{`YzYEY!PkJ2Z)6+cA?G-XS!Kng zJAJiQ?skcxr&UNsw0}JN%j=7?Zs};9#r*}uf%tPTRA%UqYNTsyZ0v>AYL)eR{VQBQ zM!M5`I`xOM6Q1V>BasL-I{JE;<4C32RioiRl2ZP`!JE%bCX-N8Q!|dQ-caZ!K{JBV(AP70?lo0efM-a za#oflK@=q*7(oc3Sk^}`E`Iu`)oO#WSZoU=AC%mylW0_Y(*N0%zA)-$QyS '?filter=facility%3A' . $logArray[$mycolkey] . '&search=Search', + 'ButtonUrl' => '?filter=facility%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . GetFacilityDisplayName( $logArray[$mycolkey] ). "'", 'IconSource' => $content['MENU_BULLET_BLUE'] ); @@ -358,7 +358,7 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c // Set OnClick Menu for SYSLOG_FACILITY $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=severity%3A' . $logArray[$mycolkey] . '&search=Search', + 'ButtonUrl' => '?filter=severity%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . GetSeverityDisplayName( $logArray[$mycolkey] ). "'", 'IconSource' => $content['MENU_BULLET_BLUE'] ); @@ -382,7 +382,7 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c // Set OnClick Menu for SYSLOG_MESSAGETYPE $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=messagetype%3A' . $logArray[$mycolkey] . '&search=Search', + 'ButtonUrl' => '?filter=messagetype%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . GetMessageTypeDisplayName( $logArray[$mycolkey] ). "'", 'IconSource' => $content['MENU_BULLET_BLUE'] ); @@ -393,10 +393,15 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c // Set OnClick Menu for SYSLOG_EVENT_ID $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=eventid%3A' . $logArray[$mycolkey] . '&search=Search', + 'ButtonUrl' => '?filter=eventid%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . $logArray[$mycolkey] . "'", 'IconSource' => $content['MENU_BULLET_BLUE'] ); + $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( + 'ButtonUrl' => 'http://global.phplogcon.org/?' . $logArray[$mycolkey] . '+' . str_replace(" ", "+", $content['LN_FIELDS_EVENTID']), + 'DisplayName' => $content['LN_VIEW_SEARCHFOR'] . " " . $content['LN_FIELDS_EVENTID'] . " '" . $logArray[$mycolkey] . "'", + 'IconSource' => $content['MENU_NETWORK'] + ); } } @@ -479,7 +484,7 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c // Set OnClick Menu for SYSLOG_SYSLOGTAG $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=syslogtag%3A' . $logArray[$mycolkey] . '&search=Search', + 'ButtonUrl' => '?filter=syslogtag%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . $logArray[$mycolkey] . "'", 'IconSource' => $content['MENU_BULLET_BLUE'] ); @@ -489,7 +494,7 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c // Set OnClick Menu for SYSLOG_HOST $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=source%3A' . $logArray[$mycolkey] . '&search=Search', + 'ButtonUrl' => '?filter=source%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . $logArray[$mycolkey] . "'", 'IconSource' => $content['MENU_BULLET_BLUE'] ); @@ -500,20 +505,31 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c // Set OnClick Menu for SYSLOG_EVENT_LOGTYPE $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=eventlogtype%3A' . $logArray[$mycolkey] . '&search=Search', + 'ButtonUrl' => '?filter=eventlogtype%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . $logArray[$mycolkey] . "'", 'IconSource' => $content['MENU_BULLET_BLUE'] ); + $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( + 'ButtonUrl' => 'http://global.phplogcon.org/?' . $logArray[$mycolkey] . '+' . str_replace(" ", "+", $content['LN_FIELDS_EVENTLOGTYPE']), + 'DisplayName' => $content['LN_VIEW_SEARCHFOR'] . "'" . $logArray[$mycolkey] . "'", + 'IconSource' => $content['MENU_NETWORK'] + ); + } else if ( $mycolkey == SYSLOG_EVENT_SOURCE ) { // Set OnClick Menu for SYSLOG_EVENT_SOURCE $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=eventlogsource%3A' . $logArray[$mycolkey] . '&search=Search', + 'ButtonUrl' => '?filter=eventlogsource%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . $logArray[$mycolkey] . "'", 'IconSource' => $content['MENU_BULLET_BLUE'] ); + $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( + 'ButtonUrl' => 'http://global.phplogcon.org/?' . $logArray[$mycolkey] . '+' . str_replace(" ", "+", $content['LN_FIELDS_EVENTSOURCE']), + 'DisplayName' => $content['LN_VIEW_SEARCHFOR'] . "'" . $logArray[$mycolkey] . "'", + 'IconSource' => $content['MENU_NETWORK'] + ); } } } diff --git a/src/lang/de/main.php b/src/lang/de/main.php index 9412fca..27cca9a 100644 --- a/src/lang/de/main.php +++ b/src/lang/de/main.php @@ -59,9 +59,10 @@ $content['LN_SEARCH_ADVANCED'] = "Erweiterte Suche"; $content['LN_SEARCH'] = "Suche"; $content['LN_SEARCH_RESET'] = "Suche zurücksetzen"; $content['LN_SEARCH_PERFORMADVANCED'] = "Erweiterte Suche starten"; -$content['LN_VIEW_MESSAGECENTERED'] = "Back to unfiltered view with this message at top"; -$content['LN_VIEW_RELATEDMSG'] = "View related syslog messages"; -$content['LN_VIEW_FILTERFOR'] = "Filter message for "; + $content['LN_VIEW_MESSAGECENTERED'] = "Back to unfiltered view with this message at top"; + $content['LN_VIEW_RELATEDMSG'] = "View related syslog messages"; + $content['LN_VIEW_FILTERFOR'] = "Filter message for "; + $content['LN_VIEW_SEARCHFOR'] = "Search online for "; $content['LN_HIGHLIGHT'] = "Hightlight >>"; $content['LN_HIGHLIGHT_OFF'] = "Hightlight <<"; diff --git a/src/lang/en/main.php b/src/lang/en/main.php index 8d7b77e..7f03319 100644 --- a/src/lang/en/main.php +++ b/src/lang/en/main.php @@ -63,6 +63,7 @@ $content['LN_SEARCH_PERFORMADVANCED'] = "Perform Advanced Search"; $content['LN_VIEW_MESSAGECENTERED'] = "Back to unfiltered view with this message at top"; $content['LN_VIEW_RELATEDMSG'] = "View related syslog messages"; $content['LN_VIEW_FILTERFOR'] = "Filter message for "; +$content['LN_VIEW_SEARCHFOR'] = "Search online for "; $content['LN_HIGHLIGHT'] = "Hightlight >>"; $content['LN_HIGHLIGHT_OFF'] = "Hightlight <<"; @@ -110,7 +111,7 @@ $content['LN_FIELDS_MESSAGETYPE'] = "Messagetype"; $content['LN_FIELDS_UID'] = "uID"; $content['LN_FIELDS_MESSAGE'] = "Message"; $content['LN_FIELDS_EVENTID'] = "Event ID"; -$content['LN_FIELDS_EVENTLOGTYPE'] = "Eventlogtype"; +$content['LN_FIELDS_EVENTLOGTYPE'] = "Eventlog Type"; $content['LN_FIELDS_EVENTSOURCE'] = "Event Source"; $content['LN_FIELDS_EVENTCATEGORY'] = "Event Category"; $content['LN_FIELDS_EVENTUSER'] = "Event User"; diff --git a/src/templates/index.html b/src/templates/index.html index 0327393..573f244 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -15,7 +15,8 @@