Peter M. Groen / knowledgetree

Commit 4f0989b02e906a24ac77c3da41b7bad0396360fa

Authored by megan_w
1 parent 0b019696

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.

Committed by: Megan Watson
Reviewed by: Conrad Vermeulen



git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@8756 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 81 additions and 28 deletions
resources/css/kt-framing.css
  View file @4f0989b
... ... @@ -2136,8 +2136,8 @@ body #content #add_dashlet
2136 2136  
2137 2137 .role_allocation
2138 2138 {
2139   - overflow:auto;
2140   -
  2139 + overflow:auto;
  2140 +
2141 2141 }
2142 2142  
2143 2143 .kt_config
... ... @@ -2158,4 +2158,59 @@ body #content #add_dashlet
2158 2158 padding: 0.5em 0.5em;
2159 2159 overflow: hidden;
2160 2160 vertical-align: top;
2161   -}
2162 2161 \ No newline at end of file
  2162 +}
  2163 +
  2164 +/* Search widget - override ExtJS CSS */
  2165 +
  2166 +.x-toolbar{
  2167 + border: none;
  2168 + display: block;
  2169 + padding: 2px;
  2170 + background: transparent;
  2171 + position: relative;
  2172 + zoom: 1;
  2173 +}
  2174 +
  2175 +.x-btn {
  2176 + padding: 2px;
  2177 +}
  2178 +
  2179 +.x-toolbar .x-btn-left{
  2180 + background: url(../graphics/tb_search_btn.gif) no-repeat 0 0;
  2181 +}
  2182 +
  2183 +.x-toolbar .x-btn-right{
  2184 + background: url(../graphics/tb_search_btn.gif) no-repeat 0 -21px;
  2185 +}
  2186 +.x-toolbar .x-btn-center{
  2187 + background: url(../graphics/tb_search_btn.gif) repeat-x 0 -42px;
  2188 +}
  2189 +
  2190 +.x-toolbar .x-btn-over .x-btn-left{
  2191 + background: url(../graphics/tb_search_btn.gif) no-repeat 0 0;
  2192 +}
  2193 +.x-toolbar .x-btn-over .x-btn-right{
  2194 + background: url(../graphics/tb_search_btn.gif) no-repeat 0 -21px;
  2195 +}
  2196 +.x-toolbar .x-btn-over .x-btn-center{
  2197 + background: url(../graphics/tb_search_btn.gif) repeat-x 0 -42px;
  2198 +}
  2199 +
  2200 +.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{
  2201 + background: url(../graphics/tb_search_btn.gif) no-repeat 0 -63px;
  2202 +}
  2203 +.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{
  2204 + background: url(../graphics/tb_search_btn.gif) no-repeat 0 -84px;
  2205 +}
  2206 +
  2207 +.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{
  2208 + background: url(../graphics/tb_search_btn.gif) repeat-x 0 -105px;
  2209 +}
  2210 +
  2211 +.x-menu {
  2212 + border: 1px solid #718bb7;
  2213 + z-index: 15000;
  2214 + zoom: 1;
  2215 + background: #FDFDFD;
  2216 + padding: 2px;
  2217 +}
... ...
resources/js/search2widget.js
  View file @4f0989b
1 1 Ext.onReady(function(){
2 2  
3   -var bSearchOptionMetadataAndContent = true;
4   -
5 3 Ext.BLANK_IMAGE_URL = '../../thirdpartyjs/extjs/resources/images/default/s.gif';
6 4  
  5 +var bSearchOptionMetadataAndContent = true;
  6 +
7 7 function doAdvancedSearch()
8 8 {
9 9 document.location=rootURL + "/search2.php?action=guiBuilder";
... ... @@ -17,13 +17,13 @@ function doViewPreviousSearchResults()
17 17 function onMetadataAndContentClick()
18 18 {
19 19 bSearchOptionMetadataAndContent = true;
20   - Ext.example.msg(sSearchTranslations[0], sSearchTranslations[1]); /* Quick Search Options, Searches will now search both content and metadata */
  20 + //Ext.example.msg(sSearchTranslations[0], sSearchTranslations[1]); /* Quick Search Options, Searches will now search both content and metadata */
21 21 }
22 22  
23 23 function onMetadataClick()
24 24 {
25 25 bSearchOptionMetadataAndContent = false;
26   - Ext.example.msg(sSearchTranslations[0], sSearchTranslations[2]); /* Quick Search Options, Searches will now only search metadata */
  26 + //Ext.example.msg(sSearchTranslations[0], sSearchTranslations[2]); /* Quick Search Options, Searches will now only search metadata */
27 27 }
28 28  
29 29 function onSearchEngineFormatClick()
... ... @@ -53,7 +53,7 @@ function onSearchClick(sender)
53 53  
54 54 if (text == sSearchTranslations[12] || text == '')
55 55 {
56   - Ext.example.msg(sSearchTranslations[3], sSearchTranslations[4]); /* Hint, Please enter some search criteria! */
  56 +// Ext.example.msg(sSearchTranslations[3], sSearchTranslations[4]); /* Hint, Please enter some search criteria! */
57 57 return;
58 58 }
59 59  
... ... @@ -90,7 +90,7 @@ function populateSavedSearch(menu)
90 90 }
91 91 });
92 92  
93   - for(i=0;i<aSavedSearches.length;i++)
  93 + for(i = 0; i < aSavedSearches.length; i++)
94 94 {
95 95 var search = aSavedSearches[i];
96 96 var name = search.name;
... ... @@ -103,8 +103,6 @@ function populateSavedSearch(menu)
103 103 }
104 104 }
105 105  
106   -
107   -
108 106 function createSearchBar(div, suffix)
109 107 {
110 108 var x = Ext.get(div);
... ... @@ -118,6 +116,7 @@ function createSearchBar(div, suffix)
118 116 if (suffix == 1)
119 117 {
120 118 var menu = new Ext.menu.Menu({
  119 + shadow: false,
121 120 items: [
122 121 {
123 122 text: sSearchTranslations[6], /* Advanced Search */
... ... @@ -130,6 +129,7 @@ function createSearchBar(div, suffix)
130 129 {
131 130 text: sSearchTranslations[8] , /*Quick Search Options*/
132 131 menu: {
  132 + shadow: false,
133 133 items: [
134 134 new Ext.menu.CheckItem({
135 135 text: sSearchTranslations[9], /* content and metadata */
... ... @@ -151,19 +151,20 @@ function createSearchBar(div, suffix)
151 151 {
152 152 text: sSearchTranslations[13] , /*Toggle results format*/
153 153 menu: {
  154 + shadow: false,
154 155 items: [
155 156 new Ext.menu.CheckItem({
156 157 text: sSearchTranslations[14], /* search engine format */
157 158 id: 'cbResultsFormatSearchEngine' + suffix,
158 159 checked: bResultsFormatSearchEngine,
159   - group: 'options',
  160 + group: 'format',
160 161 handler: onSearchEngineFormatClick
161 162 }),
162 163 new Ext.menu.CheckItem({
163 164 text: sSearchTranslations[15], /* browse view format */
164 165 id: 'cbBrowseSearchEngine' + suffix,
165 166 checked: !bResultsFormatSearchEngine,
166   - group: 'options',
  167 + group: 'format',
167 168 handler: onBrowseFormatClick
168 169 })
169 170 ]
... ... @@ -172,7 +173,6 @@ function createSearchBar(div, suffix)
172 173 ]
173 174 });
174 175  
175   -
176 176 button = new Ext.Toolbar.MenuButton({
177 177 text: sSearchTranslations[11], /* search */
178 178 handler: onSearchClick,
... ... @@ -183,9 +183,6 @@ function createSearchBar(div, suffix)
183 183  
184 184 populateSavedSearch(menu);
185 185  
186   -
187   -
188   -
189 186 }
190 187 else
191 188 {
... ... @@ -202,15 +199,15 @@ function createSearchBar(div, suffix)
202 199  
203 200 var tb = new Ext.Toolbar(div);
204 201  
205   -
206   -
207   - tb.add(new Ext.form.TextField({
  202 + tb.add(
  203 + new Ext.form.TextField({
208 204 emptyText: sSearchTranslations[12], /* Enter search criteria... */
209 205 value: quickQuery,
210 206 selectOnFocus:true,
211 207 id:'txtSearchBar' + suffix,
212   - width: (suffix == 1)?180:110
213   - }), button);
  208 + width: (suffix == 1) ? 180 : 110
  209 + }),
  210 + button);
214 211  
215 212 var map = new Ext.KeyMap("txtSearchBar" + suffix,
216 213 {
... ... @@ -227,7 +224,7 @@ function createSearchBar(div, suffix)
227 224 }
228 225 else
229 226 {
230   - el.applyStyles('position:relative; left: 20px; top: 10px');
  227 + el.applyStyles('position:relative; left: 20px; top: 0px;');
231 228 }
232 229  
233 230 return menu;
... ...
templates/kt3/standard_page.smarty
  View file @4f0989b
... ... @@ -128,7 +128,7 @@
128 128 {/foreach}
129 129 ];
130 130  
131   - {if $smarty.session.search2resultFormat != 'searchengine'}
  131 + {if $smarty.session.search2resultFormat == 'browseview'}
132 132 var bResultsFormatSearchEngine = false;
133 133 {else}
134 134 var bResultsFormatSearchEngine = true;
... ... @@ -219,7 +219,8 @@
219 219 </td>
220 220 <td width="5px">&nbsp;</td>
221 221 <td valign=top align=right width="100">
222   - <div id="newSearchQuery" /></td>
  222 + <div id="newSearchQuery"></div>
  223 + </td>
223 224 <td id="add-dashlet"></td>
224 225 </tr>
225 226 </table>
... ... @@ -329,7 +330,7 @@
329 330 <td valign="top">
330 331 {i18n arg_version="$versionname" arg_appname="$appname"}#appname# Version: #version#{/i18n}
331 332 {if ($smallVersion == 'Community Edition')}
332   - {i18n}is licensed free of charge and supplied with
  333 + {i18n}is licensed free of charge and supplied with
333 334 <a href="http://www.knowledgetree.com/commercial_support" target="_blank">no support</a>
334 335 , <a href="http://www.knowledgetree.com/commercial_support" target="_blank">no maintenance</a>
335 336 , and <a href="http://www.knowledgetree.com/commercial_support" target="_blank">no warranty</a>.
... ... @@ -363,10 +364,10 @@
363 364 -->
364 365 </tr>
365 366 </table>
366   - </td>
  367 + </td>
367 368 </tr>
368 369 </table>
369   -
  370 +
370 371 <div class="floatClear"></div>
371 372 </div>
372 373 </div>
... ...