Simplified Layout

src/css/defaults.css

@@ -1,3 +1,32 @@
+#fullcontenttable {
+font-weight:normal !important;
+text-align:left;
+}
+
+#fullcontenttable .ui-button{
+background:none !important;
+background-image:none !important;
+border-style:none;
+white-space:normal !important;
+font-weight:normal !important;
+text-align:left;
+}
+
+#fullcontenttable .ui-button-text{
+padding:0px !important;
+}
+
+#fullcontenttable *{
+text-indent:0px !important;
+}
+
+
+button[id*="syslogseverity"]{
+	color:white;
+	text-align:left;
+}
+
+
 /* Generic Style definitions */
 .ExpansionPlus
 {

src/include/functions_common.php

@@ -1107,9 +1107,9 @@ function DieWithErrorMsg( $szerrmsg )
 			"<H3>Critical Error occured</H3>" . 
 			"</td></tr>" . 
 			"<tr><td class=\"cellmenu1_naked\" align=\"left\">Errordetails:</td>" . 
-			"<td class=\"tableBackground\" align=\"left\"><br>" . 
+			"<td class=\"tableBackground\" align=\"left\">" . 
 			$szerrmsg . 
-			"<br><br></td></tr></table>");
+			"</td></tr></table>");
 
 		// Print Detail error's if available
 		if ( isset($content['detailederror']) )

src/index.php

@@ -925,6 +925,11 @@ function PrepareStringForSearch($myString)
 function AddOnClickMenu(&$fieldGridItem, $fieldType, $FieldID)
 {
 	global $content, $fields, $myStrCharLimit; 
+
+
+	if ( !isset($fields[$FieldID]['SearchOnline']) )
+		return;
+
 
 	if ( strlen($fieldGridItem['fieldvalue']) <= 0 ) {
 		$fieldGridItem['hasbuttons'] = false;

src/lang/de/main.php

@@ -80,8 +80,8 @@
 $content['LN_ERROR_DB_INVALIDDBDRIVER'] = "Ungültiger Datenbank Treiber ausgewählt";
 $content['LN_ERROR_DB_TABLENOTFOUND'] = "Die angegebene Tabelle konnte nicht gefunden werden, evtl. ist der Eintrag falsch geschrieben oder Gross- und Kleinschreibung wurden nicht beachtet.";
 $content['LN_ERROR_DB_DBFIELDNOTFOUND'] = "Die Datenbankfeldzuordnung ist fehlerhaft, es konnte mindestens ein Feld nicht gefunden werden.";
-$content['LN_GEN_SELECTEXPORT'] = "> Exportformat auswählen <";
-$content['LN_GEN_EXPORT_CVS'] = "CSV (Komma unterteilt)";
+$content['LN_GEN_SELECTEXPORT'] = "Exportformat auswählen";
+$content['LN_GEN_EXPORT_CVS'] = "CSV";
 $content['LN_GEN_EXPORT_XML'] = "XML";
 $content['LN_GEN_EXPORT_PDF'] = "PDF";
 $content['LN_GEN_ERROR_EXPORING'] = "Fehler beim exportieren der Daten";

src/lang/en/main.php

@@ -29,9 +29,9 @@
 
 // Global Stuff
 $content['LN_MAINTITLE'] = "Main LogAnalyzer";
-$content['LN_MAIN_SELECTSTYLE'] = "Select a Style";
-$content['LN_GEN_LANGUAGE'] = "Select Language";
-$content['LN_GEN_SELECTSOURCE'] = "Select Source";
+$content['LN_MAIN_SELECTSTYLE'] = "Style";
+$content['LN_GEN_LANGUAGE'] = "Language";
+$content['LN_GEN_SELECTSOURCE'] = "Source/Project";
 $content['LN_GEN_MOREPAGES'] = "More than one Page available";
 $content['LN_GEN_FIRSTPAGE'] = "First Page";
 $content['LN_GEN_LASTPAGE'] = "Last Page";
@@ -82,8 +82,8 @@
 $content['LN_ERROR_DB_INVALIDDBDRIVER'] = "Invalid database driver selected";
 $content['LN_ERROR_DB_TABLENOTFOUND'] = "Could not find the configured table, maybe misspelled or the tablenames are case sensitive";
 $content['LN_ERROR_DB_DBFIELDNOTFOUND'] = "Database Field mapping for at least one field could not be found.";
-$content['LN_GEN_SELECTEXPORT'] = "> Select Exportformat <";
-$content['LN_GEN_EXPORT_CVS'] = "CSV (Comma separated)";
+$content['LN_GEN_SELECTEXPORT'] = "Select Exportformat";
+$content['LN_GEN_EXPORT_CVS'] = "CSV";
 $content['LN_GEN_EXPORT_XML'] = "XML";
 $content['LN_GEN_EXPORT_PDF'] = "PDF";
 $content['LN_GEN_ERROR_EXPORING'] = "Error exporting data";
@@ -138,10 +138,10 @@
 $content['LN_GRID_POPUPDETAILS'] = "Details for Syslogmessage with ID '%1'";
 
 $content['LN_SEARCH_USETHISBLA'] = "Use the form below and your advanced search will appear here";
-$content['LN_SEARCH_FILTER'] = "Search (filter):";
-$content['LN_SEARCH_ADVANCED'] = "Advanced Search";
+$content['LN_SEARCH_FILTER'] = "Search";
+$content['LN_SEARCH_ADVANCED'] = "Advanced";
 $content['LN_SEARCH'] = "Search";
-$content['LN_SEARCH_RESET'] = "Reset search";
+$content['LN_SEARCH_RESET'] = "Reset";
 $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";
@@ -155,8 +155,8 @@
 	$content['LN_VIEW_SHOWALLBUT'] = "Show all except '%1'";
 	$content['LN_VIEW_VISITLINK'] = "Open Link '%1' in new window";
 
-$content['LN_HIGHLIGHT'] = "Highlight >>";
-$content['LN_HIGHLIGHT_OFF'] = "Highlight <<";
+$content['LN_HIGHLIGHT']       = "Highlight";
+$content['LN_HIGHLIGHT_OFF']   = "Highlight <<";
 $content['LN_HIGHLIGHT_WORDS'] = "Highlight words comma separated";
 
 $content['LN_AUTORELOAD'] = "Set auto reload";

src/templates/admin/admin_parsers.html

@@ -23,8 +23,8 @@
 
 		<table border="0" cellpadding="2" cellspacing="0" bgcolor="#DDDDDD" width="80%" class="with_border_alternate">
 		<tr>
-			<td class="topmenu2" nowrap align="center" width="50%"><a class="topmenu1_link" href="{BASEPATH}admin/parsers.php" target="_top"><img align="left" src="{MENU_DOCUMENTLIST}" width="16" height="16" vspace="0" title="{LN_PARSERSMENU_LIST}">{LN_PARSERSMENU_LIST}</a></td>
-			<td class="topmenu2" nowrap align="center" width="50%"><a class="topmenu1_link" href="http://loganalyzer.adiscon.com/plugins/message-parsers" target="_blank"><img align="left" src="{MENU_NETDOWNLOAD}" width="16" height="16" vspace="0" title="{LN_PARSERS_ONLINELIST}">{LN_PARSERS_ONLINELIST}</a></td>
+			<td class="topmenu2" nowrap align="center" width="50%"><a class="topmenu1_link" href="{BASEPATH}admin/parsers.php" target="_top"><img src="{MENU_DOCUMENTLIST}" width="16" height="16" vspace="0" title="{LN_PARSERSMENU_LIST}">{LN_PARSERSMENU_LIST}</a></td>
+			<td class="topmenu2" nowrap align="center" width="50%"><a class="topmenu1_link" href="http://loganalyzer.adiscon.com/plugins/message-parsers" target="_blank"><img src="{MENU_NETDOWNLOAD}" width="16" height="16" vspace="0" title="{LN_PARSERS_ONLINELIST}">{LN_PARSERS_ONLINELIST}</a></td>
 		</tr>
 		</table>
 

src/templates/admin/admin_reports.html

@@ -23,10 +23,10 @@
 
 		<table border="0" cellpadding="2" cellspacing="0" bgcolor="#DDDDDD" width="80%" class="with_border_alternate">
 		<tr>
-			<td class="topmenu2" nowrap align="center" width="25%"><a class="topmenu1_link" href="{BASEPATH}admin/reports.php" target="_top"><img align="left" src="{MENU_DOCUMENTLIST}" width="16" height="16" vspace="0" title="{LN_REPORTMENU_LIST}">{LN_REPORTMENU_LIST}</a></td>
-			<td class="topmenu2" nowrap align="center" width="25%"><a class="topmenu1_link" href="http://loganalyzer.adiscon.com/plugins/reports" target="_blank"><img align="left" src="{MENU_NETDOWNLOAD}" width="16" height="16" vspace="0" title="{LN_REPORTMENU_ONLINELIST}">{LN_REPORTMENU_ONLINELIST}</a></td>
+			<td class="topmenu2" nowrap align="center" width="25%"><a class="topmenu1_link" href="{BASEPATH}admin/reports.php" target="_top"><img src="{MENU_DOCUMENTLIST}" width="16" height="16" vspace="0" title="{LN_REPORTMENU_LIST}">{LN_REPORTMENU_LIST}</a></td>
+			<td class="topmenu2" nowrap align="center" width="25%"><a class="topmenu1_link" href="http://loganalyzer.adiscon.com/plugins/reports" target="_blank"><img src="{MENU_NETDOWNLOAD}" width="16" height="16" vspace="0" title="{LN_REPORTMENU_ONLINELIST}">{LN_REPORTMENU_ONLINELIST}</a></td>
 			<!-- IF ISADDSAVEDREPORT="true" -->
-			<td class="topmenu2" nowrap align="center" width="50%"><a class="topmenu1_link" href="{BASEPATH}admin/reports.php?op=details&id={ReportID}" target="_top"><img align="left" src="{MENU_VIEW}" width="16" height="16" vspace="0" title="{REPORTS_DETAILSFOR}">{REPORTS_DETAILSFOR}</a></td>
+			<td class="topmenu2" nowrap align="center" width="50%"><a class="topmenu1_link" href="{BASEPATH}admin/reports.php?op=details&id={ReportID}" target="_top"><img src="{MENU_VIEW}" width="16" height="16" vspace="0" title="{REPORTS_DETAILSFOR}">{REPORTS_DETAILSFOR}</a></td>
 			<!-- ENDIF ISADDSAVEDREPORT="true" -->
 			<!-- IF ISADDSAVEDREPORT!="true" -->
 			<td class="topmenu2" nowrap align="center" width="50%">&nbsp;</td>

src/templates/details.html

@@ -72,15 +72,15 @@
 	<td width="100%" valign="top">
 
 	<!-- IF messageenabled="true" -->
-	<table width="100%" cellpadding="0" cellspacing="1" border="0" align="center" class="with_border_alternate">
+	<table id="EventItemDetails" width="100%" cellpadding="0" cellspacing="1" border="0" align="center" class="with_border_alternate">
 	<!-- BEGIN fields -->
 	<!-- IF fieldenabled="true" -->
 	<tr>
 		<td width="200" class="{menucssclass}" align="left" nowrap>
 			<B>{FieldCaption}</B>
 		</td>
 		<td width="100%" align="left" class="{cssclass}" {fieldbgcolor} valign="top">
-			<span class="{cssclassfont}">{fieldvalue}</span>
+			<span>{fieldvalue}</span>
 		</td>
 	</tr>
 	<!-- ENDIF fieldenabled="true" -->

src/templates/include_header.html

@@ -36,7 +36,7 @@
 		Donate and help keep the project alive!
 <!-- ENDIF SHOW_DONATEBUTTON="true" -->
 	</td>
-	<td width="450" align="center" valign="top" height="20">
+	<td width="450" align="center" valign="middle">
 
 	<!-- IF IS_LOGINPAGE!="true" -->
 		<form action="{BASEPATH}userchange.php" method="get" name="langidform">
@@ -55,13 +55,8 @@
 		</table>
 		</form>
 	<!-- ENDIF IS_LOGINPAGE!="true" -->
-
-	</td>
-	<td rowspan="4" width="10" align="center" nowrap>&nbsp;</td>
-</tr>
-<tr> 
-	<td width="100%" align="center" valign="top" height="20">
-
+
+
 	<!-- IF IS_LOGINPAGE!="true" -->
 		<form action="{BASEPATH}userchange.php" method="get" name="styleidform">
 		<table width="450" border="0" cellspacing="0" cellpadding="0" class="with_border" align="right">
@@ -81,78 +76,33 @@
 	<!-- ENDIF IS_LOGINPAGE!="true" -->
 
 	</td>
+	<td rowspan="4" width="10" align="center" nowrap>&nbsp;</td>
 </tr>
-<tr> 
-	<td width="100%" align="center" valign="top" height="20">
-
-	<!-- IF IS_LOGINPAGE!="true" -->
-		<!-- IF IS_ADMINPAGE!="true" -->
-		<form action="{CURRENTURL}" method="get" name="sourceidform">
-		<table width="450" border="0" cellspacing="0" cellpadding="0" class="with_border" align="right">
-		<tr> 
-			<td class="cellmenu1" width="250" nowrap><B>&nbsp;{LN_GEN_SELECTSOURCE}&nbsp;</B></td>
-			<td align="right">
-				<select name="sourceid" size="1" OnChange="document.sourceidform.submit();$('#loading_dialog').loading();" STYLE="width: 190px">
-					<!-- BEGIN Sources -->
-					<option {selected} value="{ID}">{Name}</option>
-					<!-- END Sources -->
-				</select>
-			</td>
-		</tr>
-		</table>
-		</form>
-		<!-- ENDIF IS_ADMINPAGE!="true" -->
-	<!-- ENDIF IS_LOGINPAGE!="true" -->
-
-	</td>
-</tr>
-<tr> 
-	<td width="100%" align="center" valign="top" height="100%">
+</table>
+<!-- ENDIF MAXIMIZED!="true" -->
 
-	<!-- IF IS_LOGINPAGE!="true" -->
+<div id="MainMenuPanel">
+	<table>
+	<tr> 
+		<td>
 		<!-- IF IS_ADMINPAGE!="true" -->
-		<form action="{BASEPATH}userchange.php" method="get" name="viewidform">
-		<table width="450" border="0" cellspacing="0" cellpadding="0" class="with_border" align="right">
-		<tr> 
-			<td class="cellmenu1" width="250" nowrap><B>&nbsp;{LN_GEN_SELECTVIEW}&nbsp;</B></td>
-			<td align="right">
-				<input type="hidden" name="op" value="changeview">
-				<select name="viewid" size="1" OnChange="document.viewidform.submit();$('#loading_dialog').loading();" STYLE="width: 190px">
-					<!-- BEGIN Views -->
-					<option {selected} value="{ID}">{DisplayName}</option>
-					<!-- END Views -->
-				</select>
-			</td>
-		</tr>
-		</table>
-		</form>
+			<!-- INCLUDE include_menu.html -->
 		<!-- ENDIF IS_ADMINPAGE!="true" -->
-	<!-- ENDIF IS_LOGINPAGE!="true" -->
-
-	</td>
-</tr>
-</table>
-<!-- ENDIF MAXIMIZED!="true" -->
+		<!-- IF IS_ADMINPAGE="true" -->
+			<!-- INCLUDE include_menu.html -->
+		</td>
+	</tr>
+	<tr> 
+		<td>
+			<!-- INCLUDE admin/admin_menu.html -->
+		<!-- ENDIF IS_ADMINPAGE="true" -->
+		</td>
+	</tr>
+	</table>
+</div>
 
-<table width="100%" border="0" cellspacing="3" cellpadding="0" class="table_with_border">
-<tr> 
-	<td>
-	<!-- IF IS_ADMINPAGE!="true" -->
-		<!-- INCLUDE include_menu.html -->
-	<!-- ENDIF IS_ADMINPAGE!="true" -->
-	<!-- IF IS_ADMINPAGE="true" -->
-		<!-- INCLUDE include_menu.html -->
-	</td>
-</tr>
-<tr> 
-	<td>
-		<!-- INCLUDE admin/admin_menu.html -->
-	<!-- ENDIF IS_ADMINPAGE="true" -->
-	</td>
-</tr>
-</table>
 
-<table class="popupdetails with_border" id="popupdetails" OnMouseOver="HoveringPopup(event,this);" OnMouseOut="FinishHoveringPopup(event,this);" OnMouseMove="disableEventPropagation();" cellpadding="2" cellspacing="0" border="0">
+<table id="popupdetails" class="popupdetails with_border" OnMouseOver="HoveringPopup(event,this);" OnMouseOut="FinishHoveringPopup(event,this);" OnMouseMove="disableEventPropagation();" cellpadding="2" cellspacing="0" border="0">
 <tr><td width="100%" class="cellmenu1" id="popuptitle" align="center" nowrap>&nbsp;</td></tr>
 <tr>
 	<td width="100%" class="popupcontent" id="popupcontent">&nbsp;</td>
@@ -173,3 +123,5 @@
 	</center>
 	<br>
 	<!-- ENDIF dbupgrade_warning="false" -->
+</tr>
+</table>

src/templates/include_menu.html

@@ -3,12 +3,7 @@
 <button id="button_menu_showevt"><img align="left" src="{MENU_HOMEPAGE}" width="16" height="16" vspace="0" title="{LN_MENU_SHOWEVENTS}">&nbsp;{LN_MENU_SHOWEVENTS}</button>
 <button id="button_menu_stats"><img align="left" src="{MENU_CHARTS}" width="16" height="16" vspace="0" title="{LN_MENU_STATISTICS}">&nbsp;{LN_MENU_STATISTICS}</button>
 <button id="button_menu_reports"><img align="left" src="{MENU_CHARTPRESENTATION}" width="16" height="16" vspace="0" title="{LN_MENU_REPORTS}">&nbsp;{LN_MENU_REPORTS}</button>
-<button id="button_menu_help"><img align="left" src="{MENU_HELP}" width="16" height="16" vspace="0" title="{LN_MENU_HELP}">&nbsp;{LN_MENU_HELP}</button>
-<ul id="menu_help" style="position:absolute;z-index:99;display:none;">
-	<li><a href="{PHPLOGCON_HELPLINK}" target="phplogcon_help"><img align="left" src="{MENU_BULLET_YELLOW}" width="16" height="16" vspace="0" title="{LN_MENU_DOC}">&nbsp;{LN_MENU_DOC}</a></li>
-	<li><a href="https://loganalyzer.adiscon.com/support/" target="phplogcon_help"><img align="left" src="{MENU_BULLET_YELLOW}" width="16" height="16" vspace="0" title="{LN_MENU_PROSERVICES}">&nbsp;{LN_MENU_PROSERVICES}</a></li>
-</ul>
-<button id="button_menu_searchkb"><img align="left" src="{MENU_KB}" width="16" height="16" vspace="0" title="{LN_MENU_SEARCHINKB}">&nbsp;{LN_MENU_SEARCHINKB}</button>
+
 <!-- IF UserDBEnabled="true" -->
 	<!-- IF SESSION_LOGGEDIN!="true" -->
 	<button id="button_menu_login"><img align="left" src="{MENU_ADMINLOGOFF}" width="16" height="16" vspace="0" title="{LN_MENU_LOGIN}">&nbsp;{LN_MENU_LOGIN}</button><script>CreateLinkFunction( "#button_menu_login", "{BASEPATH}login.php"); </script>
@@ -21,6 +16,14 @@
 	<button id="button_menu_end"><img align="left" src="{MENU_ADMINUSERS}" width="16" height="16" vspace="0" title="{LN_MENU_LOGGEDINAS} {SESSION_USERNAME}">&nbsp;{LN_MENU_LOGGEDINAS} "{SESSION_USERNAME}"</button><script>CreateLinkFunction( "#button_menu_end", ""); </script>
 	<!-- ENDIF SESSION_LOGGEDIN="true" -->
 <!-- ENDIF UserDBEnabled="true" -->
+
+<button id="button_menu_help"><img align="left" src="{MENU_HELP}" width="16" height="16" vspace="0" title="{LN_MENU_HELP}">&nbsp;{LN_MENU_HELP}</button>
+<ul id="menu_help" style="position:absolute;z-index:99;display:none;">
+	<li><a href="{PHPLOGCON_HELPLINK}" target="phplogcon_help"><img align="left" src="{MENU_BULLET_YELLOW}" width="16" height="16" vspace="0" title="{LN_MENU_DOC}">&nbsp;{LN_MENU_DOC}</a></li>
+	<li><a href="https://loganalyzer.adiscon.com/support/" target="phplogcon_help"><img align="left" src="{MENU_BULLET_YELLOW}" width="16" height="16" vspace="0" title="{LN_MENU_PROSERVICES}">&nbsp;{LN_MENU_PROSERVICES}</a></li>
+</ul>
+<button id="button_menu_searchkb"><img align="left" src="{MENU_KB}" width="16" height="16" vspace="0" title="{LN_MENU_SEARCHINKB}">&nbsp;{LN_MENU_SEARCHINKB}</button>
+
 <!-- IF IS_NOLOGINPAGE!="true" -->
 	<button id="button_menu_minmax"><img align="left" src="{MAXIMAGE}" width="16" height="16" vspace="0" title="{MAXLANGTEXT}">&nbsp;{MAXLANGTEXT}</button><script>CreateLinkFunction( "#button_menu_minmax", "{MAXURL}"); </script>
 <!-- ENDIF IS_NOLOGINPAGE!="true" -->