From 1aa5401c4be693e7fca9d243ffcfd37423da864d Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Tue, 14 Oct 2014 10:26:53 +0200
Subject: [PATCH] Uodated admin menu to use new jquery ui design

---
 src/css/jquery-ui-structure.css     |  5 +++++
 src/js/common.js                    |  1 -
 src/templates/admin/admin_menu.html | 35 +++++++++++++++++++++++++++++
 src/templates/include_menu.html     | 30 ++++++++++++-------------
 src/templates/index.html            |  6 ++---
 src/themes/default/main.css         | 24 ++++++++++++++++++++
 6 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/src/css/jquery-ui-structure.css b/src/css/jquery-ui-structure.css
index 7abf278..80c6fa6 100644
--- a/src/css/jquery-ui-structure.css
+++ b/src/css/jquery-ui-structure.css
@@ -831,3 +831,8 @@ button.ui-button::-moz-focus-inner {
 body .ui-tooltip {
 	border-width: 2px;
 }
+
+/* Custom CSS added by AL */
+.ui-button img {
+	margin:0px;
+}
diff --git a/src/js/common.js b/src/js/common.js
index 262e6b1..d150170 100644
--- a/src/js/common.js
+++ b/src/js/common.js
@@ -478,7 +478,6 @@ function CreateMenuFunction ( szbuttonobjid, szmenuobjid, bHide )
 			select: function(event, ui){
 				var szHref = $(ui.item).find('a').attr('href'); 
 				if (szHref != null && szHref.length > 0) {
-					alert ( szHref ); 
 					var szTarget = $(ui.item).find('a').attr('target'); 
 					if (szTarget == "_top") {
 						window.location.href = szHref;
diff --git a/src/templates/admin/admin_menu.html b/src/templates/admin/admin_menu.html
index 43564a4..07a89e9 100644
--- a/src/templates/admin/admin_menu.html
+++ b/src/templates/admin/admin_menu.html
@@ -1,3 +1,37 @@
+<br/>
+<button id="button_menu_adminbegin"><img align="left" src="{MENU_BULLET_BLUE}" width="16" height="16"></button>
+<button id="button_menu_pref"><img align="left" src="{MENU_PREFERENCES}" width="16" height="16" vspace="0">&nbsp;{LN_ADMINMENU_GENOPT}</button>
+<button id="button_menu_data"><img align="left" src="{MENU_DATAEDIT}" width="16" height="16" vspace="0">&nbsp;{LN_ADMINMENU_SOURCEOPT}</button>
+<button id="button_menu_fields"><img align="left" src="{MENU_FIELDS}" width="16" height="16" vspace="0">&nbsp;{LN_ADMINMENU_FIELDOPT}</button>
+<button id="button_menu_view"><img align="left" src="{MENU_DOCUMENTVIEW}" width="16" height="16" vspace="0">&nbsp;{LN_ADMINMENU_VIEWSOPT}</button>
+<button id="button_menu_find"><img align="left" src="{MENU_TEXT_FIND}" width="16" height="16" vspace="0">&nbsp;{LN_ADMINMENU_SEARCHOPT}</button>
+<button id="button_menu_charts"><img align="left" src="{MENU_CHARTS}" width="16" height="16" vspace="0">&nbsp;{LN_ADMINMENU_CHARTOPT}</button>
+<button id="button_menu_int"><img align="left" src="{MENU_INTERNAL}" width="16" height="16" vspace="0">&nbsp;{LN_ADMINMENU_MSGPARSERSOPT}</button>
+<button id="button_menu_report"><img align="left" src="{MENU_CHARTPRESENTATION}" width="16" height="16" vspace="0">&nbsp;{LN_ADMINMENU_REEPORTSOPT}</button>
+<script> 
+	CreateLinkFunction( "#button_menu_adminbegin", ""); 
+	CreateLinkFunction( "#button_menu_pref", "{BASEPATH}admin/index.php"); 
+	CreateLinkFunction( "#button_menu_data", "{BASEPATH}admin/sources.php"); 
+	CreateLinkFunction( "#button_menu_fields", "{BASEPATH}admin/fields.php"); 
+	CreateLinkFunction( "#button_menu_view", "{BASEPATH}admin/views.php"); 
+	CreateLinkFunction( "#button_menu_find", "{BASEPATH}admin/searches.php"); 
+	CreateLinkFunction( "#button_menu_charts", "{BASEPATH}admin/charts.php"); 
+	CreateLinkFunction( "#button_menu_int", "{BASEPATH}admin/parsers.php"); 
+	CreateLinkFunction( "#button_menu_report", "{BASEPATH}admin/reports.php"); 
+</script>
+<!-- IF SESSION_ISADMIN="1" -->
+<button id="button_menu_dbmap"><img align="left" src="{MENU_INTERNAL}" width="16" height="16" vspace="0">&nbsp;{LN_ADMINMENU_DBMAPPINGOPT}</button>
+<button id="button_menu_user"><img align="left" src="{MENU_ADMINUSERS}" width="16" height="16" vspace="0">&nbsp;{LN_ADMINMENU_USEROPT}</button>
+<button id="button_menu_group"><img align="left" src="{MENU_ADMINGROUPS}" width="16" height="16" vspace="0">&nbsp;{LN_ADMINMENU_GROUPOPT}</button>
+<script> 
+	CreateLinkFunction( "#button_menu_dbmap", "{BASEPATH}admin/dbmappings.php"); 
+	CreateLinkFunction( "#button_menu_user", "{BASEPATH}admin/users.php"); 
+	CreateLinkFunction( "#button_menu_group", "{BASEPATH}admin/groups.php"); 
+</script>
+<!-- ENDIF SESSION_ISADMIN="1" -->
+
+
+<!-- BEGIN DISABLED -->
 <table width="100%" border="0" cellspacing="0" cellpadding="2">
 <tr> 
 	<td class="topmenu2begin" nowrap align="center" width="16"><img align="left" src="{MENU_BULLET_BLUE}" width="16" height="16" vspace="0"></td>
@@ -28,3 +62,4 @@
 	<!-- ENDIF SESSION_LOGGEDIN!="true" -->
 </tr>
 </table>
+<!-- END DISABLED -->
diff --git a/src/templates/include_menu.html b/src/templates/include_menu.html
index 95cc984..c48e649 100644
--- a/src/templates/include_menu.html
+++ b/src/templates/include_menu.html
@@ -1,28 +1,28 @@
-<button id="button_menu_begin"><img align="left" src="{MENU_BULLET_GREEN}" width="16" height="16" vspace="0"></button>
-<button id="button_menu_search"><img align="left" src="{MENU_SEARCH}" width="16" height="16" vspace="0">{LN_MENU_SEARCH}</button>
-<button id="button_menu_showevt"><img align="left" src="{MENU_HOMEPAGE}" width="16" height="16" vspace="0">{LN_MENU_SHOWEVENTS}</button>
-<button id="button_menu_stats"><img align="left" src="{MENU_CHARTS}" width="16" height="16" vspace="0">{LN_MENU_STATISTICS}</button>
-<button id="button_menu_reports"><img align="left" src="{MENU_CHARTPRESENTATION}" width="16" height="16" vspace="0">{LN_MENU_REPORTS}</button>
-<button id="button_menu_help"><img align="left" src="{MENU_HELP}" width="16" height="16" vspace="0">{LN_MENU_HELP}</button>
+<button id="button_menu_begin"><img align="left" src="{MENU_BULLET_GREEN}" width="16" height="16"></button>
+<button id="button_menu_search"><img align="left" src="{MENU_SEARCH}" width="16" height="16" vspace="0">&nbsp;{LN_MENU_SEARCH}</button>
+<button id="button_menu_showevt"><img align="left" src="{MENU_HOMEPAGE}" width="16" height="16" vspace="0">&nbsp;{LN_MENU_SHOWEVENTS}</button>
+<button id="button_menu_stats"><img align="left" src="{MENU_CHARTS}" width="16" height="16" vspace="0">&nbsp;{LN_MENU_STATISTICS}</button>
+<button id="button_menu_reports"><img align="left" src="{MENU_CHARTPRESENTATION}" width="16" height="16" vspace="0">&nbsp;{LN_MENU_REPORTS}</button>
+<button id="button_menu_help"><img align="left" src="{MENU_HELP}" width="16" height="16" vspace="0">&nbsp;{LN_MENU_HELP}</button>
 <ul id="menu_help" style="position:absolute;z-index:99;">
-	<li><a href="{PHPLOGCON_HELPLINK}" target="phplogcon_help"><img align="left" src="{MENU_BULLET_YELLOW}" width="16" height="16" vspace="0">{LN_MENU_DOC}</a></li>
-	<li><a href="http://kb.monitorware.com/phplogcon-f39.html" target="phplogcon_help"><img align="left" src="{MENU_BULLET_YELLOW}" width="16" height="16" vspace="0">{LN_MENU_FORUM}</a></li>
-	<li><a href="http://wiki.rsyslog.com/index.php/PhpLogCon_FAQ" target="phplogcon_help"><img align="left" src="{MENU_BULLET_YELLOW}" width="16" height="16" vspace="0">{LN_MENU_WIKI}</a></li>
-	<li><a href="http://loganalyzer.adiscon.com/doc-professional_services.html" target="phplogcon_help"><img align="left" src="{MENU_BULLET_YELLOW}" width="16" height="16" vspace="0">{LN_MENU_PROSERVICES}</a></li>
+	<li><a href="{PHPLOGCON_HELPLINK}" target="phplogcon_help"><img align="left" src="{MENU_BULLET_YELLOW}" width="16" height="16" vspace="0">&nbsp;{LN_MENU_DOC}</a></li>
+	<li><a href="http://kb.monitorware.com/phplogcon-f39.html" target="phplogcon_help"><img align="left" src="{MENU_BULLET_YELLOW}" width="16" height="16" vspace="0">&nbsp;{LN_MENU_FORUM}</a></li>
+	<li><a href="http://wiki.rsyslog.com/index.php/PhpLogCon_FAQ" target="phplogcon_help"><img align="left" src="{MENU_BULLET_YELLOW}" width="16" height="16" vspace="0">&nbsp;{LN_MENU_WIKI}</a></li>
+	<li><a href="http://loganalyzer.adiscon.com/doc-professional_services.html" target="phplogcon_help"><img align="left" src="{MENU_BULLET_YELLOW}" width="16" height="16" vspace="0">&nbsp;{LN_MENU_PROSERVICES}</a></li>
 </ul>
-<button id="button_menu_searchkb"><img align="left" src="{MENU_KB}" width="16" height="16" vspace="0">{LN_MENU_SEARCHINKB}</button>
+<button id="button_menu_searchkb"><img align="left" src="{MENU_KB}" width="16" height="16" vspace="0">&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">{LN_MENU_LOGIN}</button><script>CreateLinkFunction( "#button_menu_login", "{BASEPATH}login.php"); </script>
+	<button id="button_menu_login"><img align="left" src="{MENU_ADMINLOGOFF}" width="16" height="16" vspace="0">&nbsp;{LN_MENU_LOGIN}</button><script>CreateLinkFunction( "#button_menu_login", "{BASEPATH}login.php"); </script>
 	<!-- ENDIF SESSION_LOGGEDIN!="true" -->
 	<!-- IF SESSION_LOGGEDIN="true" -->
-	<button id="button_menu_admcnt"><img align="left" src="{MENU_ADMINENTRY}" width="16" height="16" vspace="0">{LN_MENU_ADMINCENTER}</button><script>CreateLinkFunction( "#button_menu_admcnt", "{BASEPATH}admin/index.php"); </script>
-	<button id="button_menu_logoff"><img align="left" src="{MENU_ADMINLOGOFF}" width="16" height="16" vspace="0">{LN_MENU_LOGOFF}</button><script>CreateLinkFunction( "#button_menu_logoff", "{BASEPATH}login.php?op=logoff"); </script>
+	<button id="button_menu_admcnt"><img align="left" src="{MENU_ADMINENTRY}" width="16" height="16" vspace="0">&nbsp;{LN_MENU_ADMINCENTER}</button><script>CreateLinkFunction( "#button_menu_admcnt", "{BASEPATH}admin/index.php"); </script>
+	<button id="button_menu_logoff"><img align="left" src="{MENU_ADMINLOGOFF}" width="16" height="16" vspace="0">&nbsp;{LN_MENU_LOGOFF}</button><script>CreateLinkFunction( "#button_menu_logoff", "{BASEPATH}login.php?op=logoff"); </script>
 	<button id="button_menu_end">{LN_MENU_LOGGEDINAS} "{SESSION_USERNAME}"</button><script>CreateLinkFunction( "#button_menu_end", ""); </script>
 	<!-- ENDIF SESSION_LOGGEDIN="true" -->
 <!-- ENDIF UserDBEnabled="true" -->
 <!-- IF IS_NOLOGINPAGE!="true" -->
-	<button id="button_menu_minmax"><img align="left" src="{MAXIMAGE}" width="16" height="16" vspace="0">{MAXLANGTEXT}</button><script>CreateLinkFunction( "#button_menu_minmax", "{MAXURL}"); </script>
+	<button id="button_menu_minmax"><img align="left" src="{MAXIMAGE}" width="16" height="16" vspace="0">&nbsp;{MAXLANGTEXT}</button><script>CreateLinkFunction( "#button_menu_minmax", "{MAXURL}"); </script>
 <!-- ENDIF IS_NOLOGINPAGE!="true" -->
 
 <script> 
diff --git a/src/templates/index.html b/src/templates/index.html
index 24fde9d..d5730cb 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -47,12 +47,12 @@
 <!-- ENDIF EnablePredefinedSearches="true" -->
 	<td align="center" nowrap valign="top">
 	<td nowrap align="center" nowrap valign="top">
-		<input maxlength="2048" name="filter" size="80" title="Search" value="{searchstr_htmlform}" class="ui-widget-content SearchFormTextbox" style="width:100%; ">
-		<br>
+		<input maxlength="2048" name="filter" size="80" title="Search" value="{searchstr_htmlform}" class="ui-widget-content SearchFormTextbox">
+		</br>
+		<button id="buttonsearch"><span class="ui-icon ui-icon-search" title="{LN_SEARCH}"  style="float:left;"></span><span class="ui-button-text">{LN_SEARCH}</span></button>
 <!-- IF enabledoraclesearchstr="true" -->
 		<button id="buttonmoreinfo"><span class="ui-icon ui-icon-star" title="{LN_GEN_MOREINFORMATION}" style="float:left;"></span><span class="ui-button-text">{LN_GEN_MOREINFORMATION}</span></button><script>CreateLinkFunction( "#buttonmoreinfo", "{oraclesearchlink}");</script>
 <!-- ENDIF enabledoraclesearchstr="true" -->
-		<button id="buttonsearch"><span class="ui-icon ui-icon-search" title="{LN_SEARCH}"  style="float:left;"></span><span class="ui-button-text">{LN_SEARCH}</span></button>
 		<button id="buttonlucky"><span class="ui-icon ui-icon-star" title="{LN_SEARCH}"  style="float:left;"></span><span class="ui-button-text">{SearchCustomButtonCaption}</span></button>
 		<button id="buttonreset"><span class="ui-icon ui-icon-power" title="{LN_SEARCH}"  style="float:left;"></span><span class="ui-button-text">{LN_SEARCH_RESET}</span></button>
 		<button id="buttonhighlight"><span class="ui-button-text">{LN_HIGHLIGHT}</span></button>
diff --git a/src/themes/default/main.css b/src/themes/default/main.css
index b5d0eac..20c5c6f 100644
--- a/src/themes/default/main.css
+++ b/src/themes/default/main.css
@@ -559,6 +559,7 @@ select, input, button, textarea
 .SearchFormTextbox
 {
 	height: 20px;
+	width:100%;
 	margin: 2px;
 	background-color: #E8E7E2; 
 	color:#000000; 
@@ -580,3 +581,26 @@ select, input, button, textarea
 	color: #BB0000 
 }
 
+
+/* Corner radius */
+.title,
+.with_border,
+.with_border_alternate,
+.mainheader,
+.imageborder,
+.topmenu1,
+.topmenu2,
+.topmenu2end,
+.topmenu3,
+.cellmenu1,
+.cellmenu1_naked,
+.cellmenu2,
+.cellmenu2_naked,
+.SearchFormControl,
+.SearchFormTextbox,
+.table_with_border,
+.table_with_border_second,
+.table_with_border_light, 
+select, input, button, textarea {
+	border-radius: 2px;
+}