diff --git a/src/css/defaults.css b/src/css/defaults.css index 3fcc895..10a2cc0 100644 --- a/src/css/defaults.css +++ b/src/css/defaults.css @@ -28,6 +28,31 @@ display: inline; } +.borderless +{ + border:0px solid; + background-color: transparent; +} + +.borderlessbuttons +{ + border:0px solid; + background-color: transparent; + width:20px; + padding: 0px; +} + +.inlinebutton +{ + float:left; + position: relative; + + border:0px solid; + background-color: transparent; + padding: 0px; + margin: 0px; +} + .SelectSavedFilter { margin-top: 2px; @@ -64,40 +89,42 @@ } /*the span will display just on :hover state*/ -/* -.syslogdetails:hover span -{ - display:block; - position:absolute; - top:15px; - left:15px; -} -*/ .syslogdetails_popup span { display:block; position:absolute; overflow:auto; z-index:5; + /* top:15px; */ /* left:15px; */ } .gridline { + vertical-align: top; height: 16px; } -.borderless -{ - border:0px solid; - background-color: transparent; +/* +* POPUP Helper Styles +*/ +.popupdetails +{ + position: absolute; + visibility: hidden; + z-index:1 +} +.popupdetails:hover +{ + position: absolute; + visibility: hidden; + z-index: 2; } -.borderlessbuttons +.popupdetails_popup { - border:0px solid; - background-color: transparent; - width:20px; - padding: 0px; + position: absolute; + visibility: visible; + z-index: 2; } diff --git a/src/css/menu.css b/src/css/menu.css index c174ac1..40c6b60 100644 --- a/src/css/menu.css +++ b/src/css/menu.css @@ -1,24 +1,31 @@ #menu { - width: 16px; /* set width of menu */ + z-index: 10; +/* width: 16px; /* set width of menu */ } #menu ul { /* remove bullets and list indents */ - position: absolute; + z-index: 10; + position: relative; +/* position: absolute;*/ + display: block; + list-style: none; + white-space:nowrap; margin: 0; padding: 0; + vertical-align: text-top; } /* style, color and size links and headings to suit */ #menu a, #menu h2 { display: block; - margin: 2px; + margin: 0px; padding: 1px 1px; } #menu h2 { - font-size: 12px; + font-size: 10px; font-weight: bold; text-align: center; } @@ -32,6 +39,7 @@ } #menu li { + text-align: left; /* make the list elements a containing block for the nested lists */ position: relative; } @@ -43,14 +51,16 @@ } #menu ul ul { - z-index:10; - -/* border-color: #44617D #203040 #203040 #44617D; */ - + z-index: 2; + white-space: nowrap; position: absolute; - top: 12px; - left: 4px; /* to position them to the right of their containing block */ - width: 400; /* width is based on the containing block */ + + top: 12px; /*14px; */ + left: 0px; /* to position them to the right of their containing block */ + + width: auto; + min-width: 200px; /* workaround for FF */ + height: 16px; } div#menu ul ul, diff --git a/src/index.php b/src/index.php index aee347d..9be9544 100644 --- a/src/index.php +++ b/src/index.php @@ -54,7 +54,6 @@ InitFilterHelpers(); // Helpers for frontend filtering! // --- Define Extra Stylesheet! $content['EXTRA_STYLESHEET'] = '' . "\r\n"; -$content['EXTRA_STYLESHEET'] .= ''; // --- // --- CONTENT Vars @@ -556,6 +555,8 @@ if ( isset($content['Sources'][$currentSourceID]) ) $content['syslogmessages'][$counter]['values'][$mycolkey]['hasdropdownbutton'] = true; $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( 'ButtonUrl' => '?uid=' . $uID, + 'ButtonTarget' => '_top', + 'ButtonAppendUrl' => true, 'DisplayName' => $content['LN_VIEW_MESSAGECENTERED'], 'IconSource' => $content['MENU_BULLET_GREEN'] ); diff --git a/src/js/common.js b/src/js/common.js index 56e79ff..d9a03fa 100644 --- a/src/js/common.js +++ b/src/js/common.js @@ -1,6 +1,13 @@ -/* -Helper Javascript Constants -*/ +/* Detect Browser Version */ +var szBrowserApp = "MOZILLA"; // Default! +if (/MSIE (\d+\.\d+);/.test(navigator.userAgent)) +{ + if (!/Opera[\/\s](\d+\.\d+)/.test(navigator.userAgent)) + { + // Set browser to Internet Explorer + szBrowserApp = "IEXPLORER"; + } +} /* Helper Javascript functions @@ -30,6 +37,9 @@ function NewWindow(Location, WindowName,X_width,Y_height,Option) { } +// helper array to keep track of the timeouts! +var runningTimeouts = new Array(); + /* * Helper function to show and hide a div area */ @@ -159,9 +169,6 @@ function toggleFormareaVisibility(FormFieldName, FirstHiddenArea, SecondHiddenAr } } -// helper array to keep track of the timeouts! -var runningTimeouts = new Array(); -// MOVED INTO HEADER var defaultMenuTimeout = 3000; /* * Toggle display type from NONE to BLOCK */ @@ -205,11 +212,15 @@ function ToggleDisplayClearTimeout(ObjID) function ToggleDisplayEnhanceTimeOut(ObjID) { - // First clear timeout - ToggleDisplayClearTimeout(ObjID); + // Only perform if timeout exists! + if (runningTimeouts[ObjID] != null) + { + // First clear timeout + ToggleDisplayClearTimeout(ObjID); - // Set new timeout - ToggleDisplaySetTimeout(ObjID); + // Set new timeout + ToggleDisplaySetTimeout(ObjID); + } } /* @@ -295,3 +306,91 @@ function GoToPopupTarget(myTarget, parentObj) FinishPopupWindow(parentObj); } } + + +function FinishPopupWindowMenu() +{ + // Change CSS Class + var obj = document.getElementById('popupdetails'); + if (obj != null) + { + obj.className='popupdetails with_border'; + } +} + +function movePopupWindowMenu(myEvent, ObjName, parentObj) +{ + var obj = document.getElementById(ObjName); + +// var PopupContentWidth = 0; +// var middle = PopupContentWidth / 2; + var middle = -10; + + if (myPopupHovering == false && obj != null && parentObj != null) + { + // Different mouse position capturing in IE! + if (szBrowserApp == "IEXPLORER") + { + obj.style.top = (event.y+document.body.scrollTop + 10) + 'px'; + } + else + { + obj.style.top = (myEvent.pageY + 20) + 'px'; + } + obj.style.left = (myEvent.clientX - middle) + 'px'; + } +} + +function HoverPopup( myObjRef, myPopupTitle, HoverContent, OptionalImage ) +{ + // Change CSS Class + var obj = document.getElementById('popupdetails'); + obj.className='popupdetails_popup with_border'; + + if ( myObjRef != null) + { + myObjRef.src = OptionalImage; + // "{BASEPATH}images/player/" + myTeam + "/hover/" + ImageBaseName + ".png"; + } + + // Set title + var obj = document.getElementById("popuptitle"); + obj.innerHTML = myPopupTitle; + + // Set Content + var obj = document.getElementById("popupcontent"); + obj.innerHTML = HoverContent; +} + + +function HoverPopupMenuHelp( myEvent, parentObj, myPopupTitle, HoverContent ) +{ + if (szBrowserApp !== "IEXPLORER") + { + // Don't need helper here! + return; + } + + // Change CSS Class + var objPopup = document.getElementById('popupdetails'); + objPopup.className='popupdetails_popup with_border'; + + // Set title + var obj = document.getElementById("popuptitle"); + obj.innerHTML = myPopupTitle; + + // Set Content + obj = document.getElementById("popupcontent"); + obj.innerHTML = HoverContent; + +// var PopupContentWidth = 0; +// var middle = PopupContentWidth / 2; + var middle = -5; + + if (myPopupHovering == false && parentObj != null) + { + // Different mouse position capturing in IE! + objPopup.style.top = (event.y+document.body.scrollTop - 50) + 'px'; + objPopup.style.left = (myEvent.clientX - middle) + 'px'; + } +} diff --git a/src/lang/de/main.php b/src/lang/de/main.php index a466c69..4634df6 100644 --- a/src/lang/de/main.php +++ b/src/lang/de/main.php @@ -103,6 +103,10 @@ $content['LN_ERROR_NORECORDS'] = "Es wurden keine syslog-Einträge gefunden. $content['LN_MENU_SEARCH'] = "Suchen"; $content['LN_MENU_SHOWEVENTS'] = "Show Events"; $content['LN_MENU_HELP'] = "Hilfe"; + $content['LN_MENU_DOC'] = "Documentation"; + $content['LN_MENU_FORUM'] = "Support Forum"; + $content['LN_MENU_WIKI'] = "phpLogCon Wiki"; + $content['LN_MENU_PROSERVICES'] = "Professional Services"; $content['LN_MENU_SEARCHINKB'] = "Search in Knowledge Base"; $content['LN_MENU_LOGIN'] = "Login"; $content['LN_MENU_ADMINCENTER'] = "Admin Center"; @@ -111,6 +115,7 @@ $content['LN_MENU_LOGOFF'] = "Logoff"; $content['LN_MENU_MAXVIEW'] = "Maximize View"; $content['LN_MENU_NORMALVIEW'] = "Normalize View"; $content['LN_MENU_STATISTICS'] = "Statistics"; + $content['LN_MENU_CLICKTOEXPANDMENU'] = "Click the icon to show the menu"; // Index Site diff --git a/src/lang/en/main.php b/src/lang/en/main.php index cc5ad57..f0590d4 100644 --- a/src/lang/en/main.php +++ b/src/lang/en/main.php @@ -105,6 +105,10 @@ $content['LN_ERROR_DB_DBFIELDNOTFOUND'] = "Database Field mapping for at least o $content['LN_MENU_SEARCH'] = "Search"; $content['LN_MENU_SHOWEVENTS'] = "Show Events"; $content['LN_MENU_HELP'] = "Help"; + $content['LN_MENU_DOC'] = "Documentation"; + $content['LN_MENU_FORUM'] = "Support Forum"; + $content['LN_MENU_WIKI'] = "phpLogCon Wiki"; + $content['LN_MENU_PROSERVICES'] = "Professional Services"; $content['LN_MENU_SEARCHINKB'] = "Search in Knowledge Base"; $content['LN_MENU_LOGIN'] = "Login"; $content['LN_MENU_ADMINCENTER'] = "Admin Center"; @@ -113,6 +117,8 @@ $content['LN_MENU_LOGGEDINAS'] = "Logged in as"; $content['LN_MENU_MAXVIEW'] = "Maximize View"; $content['LN_MENU_NORMALVIEW'] = "Normalize View"; $content['LN_MENU_STATISTICS'] = "Statistics"; + $content['LN_MENU_CLICKTOEXPANDMENU'] = "Click the icon to show the menu"; + // Main Index Site $content['LN_ERROR_INSTALLFILEREMINDER'] = "Warning! You still have NOT removed the 'install.php' from your phpLogCon main directory!"; diff --git a/src/lang/pt_BR/main.php b/src/lang/pt_BR/main.php index 5e7064e..780b97a 100644 --- a/src/lang/pt_BR/main.php +++ b/src/lang/pt_BR/main.php @@ -107,6 +107,10 @@ $content['LN_ERROR_NORECORDS'] = "Sem mensagens encontradas."; $content['LN_MENU_SEARCH'] = "Search"; $content['LN_MENU_SHOWEVENTS'] = "Show Events"; $content['LN_MENU_HELP'] = "Help"; + $content['LN_MENU_DOC'] = "Documentation"; + $content['LN_MENU_FORUM'] = "Support Forum"; + $content['LN_MENU_WIKI'] = "phpLogCon Wiki"; + $content['LN_MENU_PROSERVICES'] = "Professional Services"; $content['LN_MENU_SEARCHINKB'] = "Search in Knowledge Base"; $content['LN_MENU_LOGIN'] = "Login"; $content['LN_MENU_ADMINCENTER'] = "Admin Center"; @@ -115,6 +119,7 @@ $content['LN_ERROR_NORECORDS'] = "Sem mensagens encontradas."; $content['LN_MENU_MAXVIEW'] = "Maximize View"; $content['LN_MENU_NORMALVIEW'] = "Normalize View"; $content['LN_MENU_STATISTICS'] = "Statistics"; + $content['LN_MENU_CLICKTOEXPANDMENU'] = "Click the icon to show the menu"; // Main Index Site $content['LN_ERROR_INSTALLFILEREMINDER'] = "Atenção! Você ainda NÃO removeu o arquivo 'install.php' do diretório de seu phpLogCon!"; diff --git a/src/templates/include_header.html b/src/templates/include_header.html index d6a5723..a7e9de1 100644 --- a/src/templates/include_header.html +++ b/src/templates/include_header.html @@ -5,6 +5,7 @@ {EXTRA_METATAGS} + {EXTRA_STYLESHEET}