From 4f0989b02e906a24ac77c3da41b7bad0396360fa Mon Sep 17 00:00:00 2001
From: megan_w <megan_w@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Mon, 7 Jul 2008 06:21:09 +0000
Subject: [PATCH] KTS-3481 "Adjust the search bar to be compatible with ExtJS 2.1" Fixed. Used CSS to make the search bar fit into the KnowledgeTree look and feel.

---
 resources/css/kt-framing.css       | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 resources/js/search2widget.js      | 37 +++++++++++++++++--------------------
 templates/kt3/standard_page.smarty | 11 ++++++-----
 3 files changed, 81 insertions(+), 28 deletions(-)

diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css
index 3150971..1d727be 100644
--- a/resources/css/kt-framing.css
+++ b/resources/css/kt-framing.css
@@ -2136,8 +2136,8 @@ body #content #add_dashlet
 
 .role_allocation
 {
-	overflow:auto; 
-	
+	overflow:auto;
+
 }
 
 .kt_config
@@ -2158,4 +2158,59 @@ body #content #add_dashlet
 	padding: 0.5em 0.5em;
     overflow: hidden;
     vertical-align: top;
-}
\ No newline at end of file
+}
+
+/* Search widget - override ExtJS CSS */
+
+.x-toolbar{
+    border: none;
+    display: block;
+	padding: 2px;
+    background: transparent;
+    position: relative;
+    zoom: 1;
+}
+
+.x-btn {
+	padding: 2px;
+}
+
+.x-toolbar .x-btn-left{
+	background: url(../graphics/tb_search_btn.gif) no-repeat 0 0;
+}
+
+.x-toolbar .x-btn-right{
+	background: url(../graphics/tb_search_btn.gif) no-repeat 0 -21px;
+}
+.x-toolbar .x-btn-center{
+	background: url(../graphics/tb_search_btn.gif) repeat-x 0 -42px;
+}
+
+.x-toolbar .x-btn-over .x-btn-left{
+	background: url(../graphics/tb_search_btn.gif) no-repeat 0 0;
+}
+.x-toolbar .x-btn-over .x-btn-right{
+	background: url(../graphics/tb_search_btn.gif) no-repeat 0 -21px;
+}
+.x-toolbar .x-btn-over .x-btn-center{
+	background: url(../graphics/tb_search_btn.gif) repeat-x 0 -42px;
+}
+
+.x-toolbar .x-btn-click .x-btn-left, .x-toolbar .x-btn-pressed .x-btn-left, .x-toolbar .x-btn-menu-active .x-btn-left{
+	background: url(../graphics/tb_search_btn.gif) no-repeat 0 -63px;
+}
+.x-toolbar .x-btn-click .x-btn-right, .x-toolbar .x-btn-pressed .x-btn-right, .x-toolbar .x-btn-menu-active .x-btn-right{
+	background: url(../graphics/tb_search_btn.gif) no-repeat 0 -84px;
+}
+
+.x-toolbar .x-btn-click .x-btn-center, .x-toolbar .x-btn-pressed .x-btn-center, .x-toolbar .x-btn-menu-active .x-btn-center{
+	background: url(../graphics/tb_search_btn.gif) repeat-x 0 -105px;
+}
+
+.x-menu {
+	border: 1px solid #718bb7;
+	z-index: 15000;
+	zoom: 1;
+	background: #FDFDFD;
+	padding: 2px;
+}
diff --git a/resources/js/search2widget.js b/resources/js/search2widget.js
index 6c304f3..a1020e4 100644
--- a/resources/js/search2widget.js
+++ b/resources/js/search2widget.js
@@ -1,9 +1,9 @@
 Ext.onReady(function(){
 
-var bSearchOptionMetadataAndContent = true;
-
 Ext.BLANK_IMAGE_URL = '../../thirdpartyjs/extjs/resources/images/default/s.gif';
 
+var bSearchOptionMetadataAndContent = true;
+
 function doAdvancedSearch()
 {
 	document.location=rootURL + "/search2.php?action=guiBuilder";
@@ -17,13 +17,13 @@ function doViewPreviousSearchResults()
 function onMetadataAndContentClick()
 {
 	bSearchOptionMetadataAndContent = true;
-	Ext.example.msg(sSearchTranslations[0], sSearchTranslations[1]); /* Quick Search Options, Searches will now search both content and metadata   */
+	//Ext.example.msg(sSearchTranslations[0], sSearchTranslations[1]); /* Quick Search Options, Searches will now search both content and metadata   */
 }
 
 function onMetadataClick()
 {
 	bSearchOptionMetadataAndContent = false;
-	Ext.example.msg(sSearchTranslations[0], sSearchTranslations[2]); /* Quick Search Options, Searches will now only search metadata */
+	//Ext.example.msg(sSearchTranslations[0], sSearchTranslations[2]); /* Quick Search Options, Searches will now only search metadata */
 }
 
 function onSearchEngineFormatClick()
@@ -53,7 +53,7 @@ function onSearchClick(sender)
 
 	if (text == sSearchTranslations[12] || text == '')
 	{
-		Ext.example.msg(sSearchTranslations[3], sSearchTranslations[4]); /* Hint, Please enter some search criteria!  */
+//		Ext.example.msg(sSearchTranslations[3], sSearchTranslations[4]); /* Hint, Please enter some search criteria!  */
 		return;
 	}
 
@@ -90,7 +90,7 @@ function populateSavedSearch(menu)
 		}
 	});
 
-	for(i=0;i<aSavedSearches.length;i++)
+	for(i = 0; i < aSavedSearches.length; i++)
 	{
 		var search = aSavedSearches[i];
 		var name = search.name;
@@ -103,8 +103,6 @@ function populateSavedSearch(menu)
 	}
 }
 
-
-
 function createSearchBar(div, suffix)
 {
 	var x = Ext.get(div);
@@ -118,6 +116,7 @@ function createSearchBar(div, suffix)
 	if (suffix == 1)
 	{
 		var menu = new Ext.menu.Menu({
+		    shadow: false,
 			items: [
 				{
 					text: sSearchTranslations[6], /* Advanced Search */
@@ -130,6 +129,7 @@ function createSearchBar(div, suffix)
 				{
 					text: sSearchTranslations[8] , /*Quick Search Options*/
 					menu: {
+					    shadow: false,
 						items: [
 							new Ext.menu.CheckItem({
 								text: sSearchTranslations[9], /* content and metadata */
@@ -151,19 +151,20 @@ function createSearchBar(div, suffix)
 				{
 					text: sSearchTranslations[13] , /*Toggle results format*/
 					menu: {
+					    shadow: false,
 						items: [
 							new Ext.menu.CheckItem({
 								text: sSearchTranslations[14], /* search engine format */
 								id: 'cbResultsFormatSearchEngine' + suffix,
 								checked: bResultsFormatSearchEngine,
-								group: 'options',
+								group: 'format',
 								handler: onSearchEngineFormatClick
 							}),
 							new Ext.menu.CheckItem({
 								text: sSearchTranslations[15], /* browse view format */
 								id: 'cbBrowseSearchEngine' +  suffix,
 								checked: !bResultsFormatSearchEngine,
-								group: 'options',
+								group: 'format',
 								handler: onBrowseFormatClick
 							})
 						]
@@ -172,7 +173,6 @@ function createSearchBar(div, suffix)
 			]
 		});
 
-
 		button = new Ext.Toolbar.MenuButton({
 			text: sSearchTranslations[11], /* search */
 			handler: onSearchClick,
@@ -183,9 +183,6 @@ function createSearchBar(div, suffix)
 
 		populateSavedSearch(menu);
 
-
-
-
 	}
 	else
 	{
@@ -202,15 +199,15 @@ function createSearchBar(div, suffix)
 
 	var tb = new Ext.Toolbar(div);
 
-
-
-	tb.add(new Ext.form.TextField({
+	tb.add(
+	new Ext.form.TextField({
 			emptyText: sSearchTranslations[12], /* Enter search criteria... */
 			value: quickQuery,
 			selectOnFocus:true,
 			id:'txtSearchBar' + suffix,
-			width: (suffix == 1)?180:110
-		}), button);
+			width: (suffix == 1) ? 180 : 110
+		}),
+		button);
 
 	var map = new Ext.KeyMap("txtSearchBar" + suffix,
 				{
@@ -227,7 +224,7 @@ function createSearchBar(div, suffix)
 	}
 	else
 	{
-		el.applyStyles('position:relative; left: 20px; top: 10px');
+		el.applyStyles('position:relative; left: 20px; top: 0px;');
 	}
 
 	return menu;
diff --git a/templates/kt3/standard_page.smarty b/templates/kt3/standard_page.smarty
index b9879e4..a784710 100644
--- a/templates/kt3/standard_page.smarty
+++ b/templates/kt3/standard_page.smarty
@@ -128,7 +128,7 @@
 	                            	{/foreach}
 	                            ];
 
-	                            {if $smarty.session.search2resultFormat != 'searchengine'}
+	                            {if $smarty.session.search2resultFormat == 'browseview'}
 	                                var bResultsFormatSearchEngine = false;
 	                            {else}
 	                                var bResultsFormatSearchEngine = true;
@@ -219,7 +219,8 @@
                     </td>
                     <td width="5px">&nbsp;</td>
                     <td valign=top align=right width="100">
-                	<div id="newSearchQuery"  /></td>
+                	   <div id="newSearchQuery"></div>
+                	</td>
                 	<td id="add-dashlet"></td>
                 	</tr>
                 	</table>
@@ -329,7 +330,7 @@
 						<td valign="top">
 							{i18n arg_version="$versionname" arg_appname="$appname"}#appname# Version: #version#{/i18n}
 							{if ($smallVersion == 'Community Edition')}
-								{i18n}is licensed free of charge and supplied with 
+								{i18n}is licensed free of charge and supplied with
 									<a href="http://www.knowledgetree.com/commercial_support" target="_blank">no support</a>
 									, <a href="http://www.knowledgetree.com/commercial_support" target="_blank">no maintenance</a>
 									, and <a href="http://www.knowledgetree.com/commercial_support" target="_blank">no warranty</a>.
@@ -363,10 +364,10 @@
 						-->
 					</tr>
 				</table>
-			</td>					
+			</td>
 			</tr>
 			</table>
-			
+
         <div class="floatClear"></div>
     </div>
 </div>
--
libgit2 0.21.4