KTS-2456

"Dropdown in search bar and search portlet needs to be aligned correctly" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7895 c91229c3-7414-0410-bfa2-8a42b809f60b

KTS-2456
"Dropdown in search bar and search portlet needs to be aligned correctly" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7895 c91229c3-7414-0410-bfa2-8a42b809f60b
Conrad Vermeulen
1 parent 76e1fe17
Showing 6 changed files with 278 additions and 158 deletions
lib/templating/kt3template.inc.php
lib/templating/smartytemplate.inc.php
resources/js/search2widget.js
templates/kt3/standard_page.smarty
templates/ktcore/search2/search_portlet.smarty
thirdpartyjs/extjs/ext-all.js
@@ -104,7 +104,13 @@ class KTPage {
         $aCSS = Array(
            "resources/css/kt-framing.css",
            "resources/css/kt-contenttypes.css",
-           "resources/css/kt-headings.css"
+           "resources/css/kt-headings.css",
+//           "thirdpartyjs/extjs/resources/css/xtheme-kt.css",
+           "thirdpartyjs/extjs/resources/css/ext-all.css",
+           "thirdpartyjs/extjs/examples/examples.css",
+ //          "thirdpartyjs/extjs/examples/menu/menu.css",
+           "thirdpartyjs/extjs/examples/lib.css",
+//           "skins/kt-toolbar.css"
         );
         $this->requireCSSResources($aCSS);
@@ -134,9 +140,12 @@ class KTPage {
         $aJS[] = 'thirdpartyjs/curvycorners/rounded_corners.inc.js';
         $aJS[] = 'resources/js/loader.js';
         $aJS[] = 'thirdpartyjs/yui/tools/tools.js';
-        $aJS[] = 'thirdpartyjs/yui/connection/connection.js';
-
+        $aJS[] = 'thirdpartyjs/yui/connection/connection-min.js';
+        $aJS[] = 'thirdpartyjs/extjs/adapter/ext/ext-base.js';
+        $aJS[] = 'thirdpartyjs/extjs/ext-all.js';
+        $aJS[] = 'thirdpartyjs/extjs/examples/examples.js';
+        $aJS[] = 'resources/js/search2widget.js';
         //$aJS[] = 'thirdpartyjs/MochiKit/.js';
         //$aJS[] = 'resources/js/translate.js';
@@ -90,14 +90,14 @@ class KTSmartyTemplate extends KTTemplate {
         	$search2_quickQuery = trim($_SESSION['search2_quickQuery']);
         	if ($search2_quickQuery == '')
         	{
-        		$search2_quickQuery = _kt('Enter search criteria');
+        		$search2_quickQuery = '';
         	}
         }
         else
         {
 			$search2_quick=0;
 			$search2_general=1;
-			$search2_quickQuery = _kt('Enter search criteria');
+			$search2_quickQuery = '';
 			$_SESSION['search2_quick'] = $search2_quick;
 			$_SESSION['search2_general'] = $search2_general;
 			$_SESSION['search2_quickQuery'] = '';
+Ext.onReady(function(){
+
+var bSearchOptionMetadataAndContent = true;
+
+Ext.BLANK_IMAGE_URL = '../../thirdpartyjs/extjs/resources/images/default/s.gif';
+
+function doAdvancedSearch()
+{
+	document.location=rootURL + "/search2.php?action=guiBuilder";
+}
+
+function doViewPreviousSearchResults()
+{
+	document.location=rootURL + "/search2.php?action=searchResults";
+}
+
+function onMetadataAndContentClick()
+{
+	bSearchOptionMetadataAndContent = true;
+	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 */
+}
+
+function onSavedSearchClick(item)
+{
+	id = item.id.substr(11);
+	document.location=rootURL + "/search2.php?action=processSaved&fSavedSearchId=" + id;
+}
+
+function onSearchClick(sender)
+{
+
+	var suffix = sender.id.substring(12);
+
+	var text = Ext.get('txtSearchBar' + suffix).getValue(false);
+
+	if (text == sSearchTranslations[12] || text == '')
+	{
+		Ext.example.msg(sSearchTranslations[3], sSearchTranslations[4]); /* Hint, Please enter some search criteria!  */
+		return;
+	}
+
+	var sq = document.getElementById('txtQuery');
+	var qg = document.getElementById('cbQuickGeneral');
+
+	text = text.replace(/\"/g, "'");
+
+	if (bSearchOptionMetadataAndContent)
+	{
+		sq.value = '(GeneralText contains "' + text + '")';
+	}
+	else
+	{
+		sq.value = '(Metadata contains "' + text + '")';
+	}
+	qg.value = bSearchOptionMetadataAndContent?1:0;
+
+	var frm = document.getElementById('frmQuickSearch');
+	frm.submit();
+
+}
+
+function populateSavedSearch(menu)
+{
+	if (aSavedSearches.length == 0)
+	{
+		return;
+	}
+	item = menu.addMenuItem({
+		text: sSearchTranslations[5], /*Saved Searches*/
+		menu:	{
+			items: []
+		}
+	});
+
+	for(i=0;i<aSavedSearches.length;i++)
+	{
+		var search = aSavedSearches[i];
+		var name = search.name;
+
+		item.menu.addMenuItem({
+								text: name,
+								id: 'miSavedItem' + search.id,
+								handler: onSavedSearchClick
+		});
+	}
+}
+
+
+
+function createSearchBar(div, suffix)
+{
+	x = Ext.get(div);
+	if (x == null)
+	{
+		return;
+	}
+
+	if (suffix == 1)
+	{
+		menu = new Ext.menu.Menu({
+			items: [
+				{
+					text: sSearchTranslations[6], /* Advanced Search */
+					handler: doAdvancedSearch
+				},
+				{
+					text: sSearchTranslations[7], /* Previous Search Results */
+					handler: doViewPreviousSearchResults
+				},
+				{
+					text: sSearchTranslations[8] , /*Quick Search Options*/
+					menu: {
+						items: [
+							new Ext.menu.CheckItem({
+								text: sSearchTranslations[9], /* content and metadata */
+								id: 'cbSearchOptionContentMetadata' + suffix,
+								checked: bSearchOptionMetadataAndContent,
+								group: 'options',
+								handler: onMetadataAndContentClick
+							}),
+							new Ext.menu.CheckItem({
+								text: sSearchTranslations[10], /* metadata */
+								checked: !bSearchOptionMetadataAndContent,
+								id: 'cbSearchOptionMetadata' +  suffix,
+								group: 'options',
+								handler: onMetadataClick
+							})
+						]
+					}
+				}
+			]
+		});
+
+		button = new Ext.Toolbar.MenuButton({
+			text: sSearchTranslations[11], /* search */
+			handler: onSearchClick,
+			id: 'searchButton' + suffix,
+			//cls: 'x-btn-text-icon blist',
+			menu : menu
+		});
+
+
+	}
+	else
+	{
+		menu = null;
+		button = new Ext.Toolbar.Button({
+			text: sSearchTranslations[11], /* search */
+			pressed: true,
+			handler: onSearchClick,
+			id: 'searchButton' + suffix,
+			//cls: 'x-btn-text-icon blist',
+
+		});
+	}
+
+	var tb = new Ext.Toolbar(div);
+	var el = Ext.get(div);
+
+	text_width = suffix==1?160:140;
+
+	txtField = new Ext.form.TextField({
+			emptyText: sSearchTranslations[12], /* Enter search criteria... */
+			value: quickQuery,
+			selectOnFocus:true,
+			id:'txtSearchBar' + suffix,
+			width: text_width
+		});
+
+	tb.add(txtField, '-',button);
+
+	var map = new Ext.KeyMap("txtSearchBar" + suffix,
+				{
+					key: 13,
+					fn: function() {
+						onSearchClick(Ext.get('txtSearchBar' + suffix));
+					}
+				});
+
+	if (suffix == 1)
+	{
+		populateSavedSearch(menu);
+
+		el.applyStyles('position:relative; top: -3px');
+	}
+
+	return menu;
+}
+
+/* create the top search widget */
+var menu = createSearchBar('newSearchQuery',1);
+
+/* create the search portlet if possible */
+createSearchBar('searchPortletCriteria',2);
+
+});
 \ No newline at end of file
@@ -53,6 +53,8 @@
     <!-- Standalone Javascript. -->
     {foreach item=sJavascript from=$page->getJSStandalone()}
        <script type="text/javascript">
+       var rootURL = "{$absoluteRootUrl}";
+       var quickQuery = "{$search2_quickQuery}";
 {$sJavascript}
        </script>
     {/foreach}
@@ -90,123 +92,47 @@
 	                                    <li><div id="menu_divider"></div></li>
 	                            {/foreach}
-	                            {literal}
+
 	                            <script language="javascript">
-	                            function search(elname)
-	                            {
-									var sc = document.getElementById(elname);
-	                            	var val = sc.value;
-
-	                            	if (val == "{/literal}{i18n}Enter search criteria{/i18n}{literal}" || val == "")
-	                            	{
-	                            		alert('{/literal}{i18n}Please enter some search criteria{/i18n}{literal}');
-	                            		return;
-	                            	}
-	                            	var sq = document.getElementById('txtQuery');
-
-									var so = document.getElementById('searchOptions');
-
-									val = val.replace(/\"/g, "'");
-
-									if (so.value == 's')
-									{
-	                            		sq.value = '(GeneralText contains "' + val + '")';
-									}
-									else
-									{
-	                            		sq.value = '(Metadata contains "' + val + '")';
-									}
-
-									var frm = document.getElementById('frmQuickSearch');
-	                            	frm.submit();
-	                            }
-	                            function processSearchEnter(event, elname)
-	                            {
-									var sc = document.getElementById(elname);
-									if(event && event.which)
-									{
-										characterCode = event.which;
-									}
-									else
-									{
-										characterCode = event.keyCode;
-									}
-
-									if (characterCode.toString() == '13')
-										search(elname);
-
-	                            	if (sc.value == "{/literal}{i18n}Enter search criteria{/i18n}{literal}")
-	                            	{
-	                            		sc.value = '';
-	                            	}
-
-									return true;
-	                            }
-	                            function searchGotFocus(elname)
-	                            {
-									var sc = document.getElementById(elname);
-									if (sc.value == "{/literal}{i18n}Enter search criteria{/i18n}{literal}")
-	                            	{
-	                            		sc.value = "";
-	                            	}
-	                            }
-	                            function searchLostFocus(elname)
-	                            {
-									var sc = document.getElementById(elname);
-									if (sc.value == "")
-	                            	{
-	                            		sc.value = "{/literal}{i18n}Enter search criteria{/i18n}{literal}";
-	                            	}
-	                            }
-
-
-	                            function updateSelect(el, idx, value, name)
-	                            {
-	                            	var elOptNew = new Option(name, value);
-
-	                            	var elOptOld = el.options[idx];
-	                            	try
-	                            	{
-	                            		el.add(elOptNew, elOptOld); // standards compliant; doesn't work in IE
-	                            	}
-	                            	catch(ex)
-	                            	{
-	                            		el.add(elOptNew, idx); // IE only
-	                            	}
-	                            	el.remove(idx+1);
-	                            }
-
-	                            function searchOptionSelect(elname)
-	                            {
-									var so = document.getElementById(elname);
-									switch(so.value)
-									{
-										case '':
-											break
-										case 's':
-											updateSelect(so, 1, 's', "{/literal}{i18n}content and metadata{/i18n}{literal} *");
-											updateSelect(so, 2, 'm', "{/literal}{i18n}metadata{/i18n}{literal}");
-											$('cbQuickGeneral').value = 1;
-											break
-										case 'm':
-											updateSelect(so, 1, 's', "{/literal}{i18n}content and metadata{/i18n}{literal}");
-											updateSelect(so, 2, 'm', "{/literal}{i18n}metadata{/i18n}{literal} *");
-											$('cbQuickGeneral').value = 0;
-											break;
-										case 'A':
-											document.location="{/literal}{$rootUrl}{literal}/search2.php?action=guiBuilder";
-											break;
-										case 'R':
-											document.location="{/literal}{$rootUrl}{literal}/search2.php?action=searchResults";
-											break;
-										default:
-											document.location="{/literal}{$rootUrl}{literal}/search2.php?action=processSaved&fSavedSearchId=" + so.value + "";
-											break;
-									}
-	                            }
+	                            var sSearchTranslations =
+	                            	[
+
+	                            	/* 0  */	"{i18n}Quick Search Options{/i18n}",
+	                            	/* 1  */	"{i18n}Searches will now search both content and metadata{/i18n}",
+	                            	/* 2  */	"{i18n}Searches will now only search metadata{/i18n}",
+	                            	/* 3  */	"{i18n}Hint{/i18n}",
+	                            	/* 4  */	"{i18n}Please enter some search criteria!{/i18n}",
+	                            	/* 5  */	"{i18n}Saved Searches{/i18n}",
+	                            	/* 6  */	"{i18n}Advanced Search{/i18n}",
+	                            	/* 7  */	"{i18n}Previous Search Results{/i18n}",
+	                            	/* 8  */	"{i18n}Quick Search Options{/i18n}",
+	                            	/* 9  */	"{i18n}content and metadata{/i18n}",
+	                            	/* 10  */	"{i18n}metadata{/i18n}",
+	                            	/* 11  */	"{i18n}search{/i18n}",
+	                            	/* 12  */	"{i18n}Enter search criteria...{/i18n}",
+
+	                            	];
+
+	                            var aSavedSearches = [
+
+	                            {assign var=count value=0}
+									{foreach item=searchitem from=$savedSearches}
+									{if $count>0},{/if}
+	                            	{literal}{{/literal}id:{$searchitem.id},name:'{$searchitem.name|sanitize}'{literal}}{/literal}
+	                            	{assign var=count value=$count+1}
+	                            	{/foreach}
+
+
+
+
+	                            ];
+
+
 	                            </script>
-								{/literal}
+	                            {literal}
+
+ {/literal}
 	                            <!-- user menu -->
 	                            <li class="pref">
 	                                {if ($page->user)}
@@ -231,28 +157,18 @@
 	                            <li class="pref">
 	                            	<div style="position: absolute;">
-	                            	<input id=searchCriteria value="{$search2_quickQuery|sanitize}" style="width:129px; font-size:12px; position:relative; top: -2px; left: -180px; z-index: 11"
-	                            		onfocus="searchGotFocus('searchCriteria')" onblur="searchLostFocus('searchCriteria')"  onkeypress="return processSearchEnter(event,'searchCriteria')" >
-	                            	<img onclick="search('searchCriteria')" src="resources/tango-icons/system-search.png" border="0" style="position: relative; left: -183px; top: 4px;  z-index: 11" />
-	                            	<select id=searchOptions style="width:170px; font-size:12px; position:absolute; left: -180px; z-index: 10" onchange="searchOptionSelect('searchOptions')">
-	                            		<option value="">--- {i18n}quick search{/i18n} ---
-	                            		<option value="s" {if $search2_general==1}selected{/if}>{i18n}content and metadata{/i18n} {if $search2_general==1}*{/if}
-	                            		<option value="m" {if $search2_general==0}selected{/if}>{i18n}metadata{/i18n} {if $search2_general==0}*{/if}
-	                            		<option value="">--- {i18n}search{/i18n} ---
-	                            		<option value="A">{i18n}Advanced Search{/i18n}
-	                            		<option value="R">{i18n}Previous Results{/i18n}
-	                            		{if count($savedSearches) > 0}
-	                            			<option value="">--- {i18n}saved searches{/i18n} ---
-	                            			{foreach item=searchitem from=$savedSearches}
-	                            			<option value="{$searchitem.id}">{$searchitem.name|sanitize}
-	                            			{/foreach}
-	                            		{/if}
-	                            	</select>
+
+
 	                            	<form id=frmQuickSearch method=post action="{$rootUrl}/search2.php?action=process">
 	                            	<input id=txtQuery name=txtQuery type=hidden>
 	                            	<input type=hidden name="cbQuickQuery" id="cbQuickQuery" value="1">
 	                            	<input type=hidden name="cbQuickGeneral" id="cbQuickGeneral" value="1"></form>
 	                            	</div>
+
+	                            	<div id="newSearchQuery"/>
+
+
+
 	                            	</li>
 	                        </ul>
@@ -332,13 +248,13 @@
 				    	<div class="error_dashlet_rightrepeat_bottom"></div>
 				    	<div class="error_dashlet_leftrepeat_bottom"></div>
                         {foreach item=sError from=$page->errStack}
-                          
+
                           {if ($page->booleanLink == '0')}
                             <p>{$sError|sanitize}</p>
                           {else}
                             <p>{$sError}</p>
-                          {/if}  
-                                                                                                          
+                          {/if}
+
                         {/foreach}
                         <div class="error_dashlet_topleft_small"></div>
 			            <div class="error_dashlet_toprepeat_small"></div>
-<div style="position: absolute; left: 10px">
-<input id=searchPortletCriteria value="{$search2_quickQuery|sanitize}" style="width:150px; font-size:12px; position:relative; top: -2px;  z-index: 11"
-	onfocus="searchGotFocus('searchPortletCriteria')" onblur="searchLostFocus('searchPortletCriteria')"  onkeypress="return processSearchEnter(event,'searchPortletCriteria')" >
-<img onclick="search('searchPortletCriteria')" src="resources/tango-icons/system-search.png" border="0" style="position: relative; left: -25px; top: 4px;  z-index: 11" />
-<select id=searchPortletOptions style="width:170px; font-size:12px; position:absolute; left: -0px; z-index: 10" onchange="searchOptionSelect('searchPortletOptions')">
-	                            		<option value="s">--- {i18n}quick search{/i18n} ---
-	                            		<option value="s" {if $search2_general==1}selected{/if}>{i18n}content and metadata{/i18n} {if $search2_general==1}*{/if}
-	                            		<option value="m" {if $search2_general==0}selected{/if}>{i18n}metadata{/i18n} {if $search2_general==0}*{/if}
-	                            	</select>
-</div>
+
+<div id=searchPortletCriteria></div>
+
 <ul class="actionlist">
 <li><a href="{$rootUrl}/search2.php?action=guiBuilder">{i18n}Advanced Search{/i18n}</a></li>
 <li><a href="{$rootUrl}/search2.php?action=queryBuilder">{i18n}Search Criteria Editor{/i18n}</a></li>
-/*
- * Ext JS Library 1.1 Beta 1
- * Copyright(c) 2006-2007, Ext JS, LLC.
- * licensing@extjs.com
- * 
- * http://www.extjs.com/license
- */
-
+/*
+ * Ext JS Library 1.1 Beta 1
+ * Copyright(c) 2006-2007, Ext JS, LLC.
+ * licensing@extjs.com
+ *
+ * http://www.extjs.com/license
+ */
+
 Ext.DomHelper=function(){var _1=null;var _2=/^(?:br|frame|hr|img|input|link|meta|range|spacer|wbr|area|param|col)$/i;var _3=function(o){if(typeof o=="string"){return o;}var b="";if(!o.tag){o.tag="div";}b+="<"+o.tag;for(var _6 in o){if(_6=="tag"||_6=="children"||_6=="cn"||_6=="html"||typeof o[_6]=="function"){continue;}if(_6=="style"){var s=o["style"];if(typeof s=="function"){s=s.call();}if(typeof s=="string"){b+=" style=\""+s+"\"";}else{if(typeof s=="object"){b+=" style=\"";for(var _8 in s){if(typeof s[_8]!="function"){b+=_8+":"+s[_8]+";";}}b+="\"";}}}else{if(_6=="cls"){b+=" class=\""+o["cls"]+"\"";}else{if(_6=="htmlFor"){b+=" for=\""+o["htmlFor"]+"\"";}else{b+=" "+_6+"=\""+o[_6]+"\"";}}}}if(_2.test(o.tag)){b+="/>";}else{b+=">";var cn=o.children||o.cn;if(cn){if(cn instanceof Array){for(var i=0,_b=cn.length;i<_b;i++){b+=_3(cn[i],b);}}else{b+=_3(cn,b);}}if(o.html){b+=o.html;}b+="</"+o.tag+">";}return b;};var _c=function(o,_e){var el=document.createElement(o.tag);var _10=el.setAttribute?true:false;for(var _11 in o){if(_11=="tag"||_11=="children"||_11=="cn"||_11=="html"||_11=="style"||typeof o[_11]=="function"){continue;}if(_11=="cls"){el.className=o["cls"];}else{if(_10){el.setAttribute(_11,o[_11]);}else{el[_11]=o[_11];}}}Ext.DomHelper.applyStyles(el,o.style);var cn=o.children||o.cn;if(cn){if(cn instanceof Array){for(var i=0,len=cn.length;i<len;i++){_c(cn[i],el);}}else{_c(cn,el);}}if(o.html){el.innerHTML=o.html;}if(_e){_e.appendChild(el);}return el;};var _15=function(_16,s,h,e){_1.innerHTML=[s,h,e].join("");var i=-1,el=_1;while(++i<_16){el=el.firstChild;}return el;};var ts="<table>",te="</table>",tbs=ts+"<tbody>",tbe="</tbody>"+te,trs=tbs+"<tr>",tre="</tr>"+tbe;var _22=function(tag,_24,el,_26){if(!_1){_1=document.createElement("div");}var _27;var _28=null;if(tag=="td"){if(_24=="afterbegin"||_24=="beforeend"){return;}if(_24=="beforebegin"){_28=el;el=el.parentNode;}else{_28=el.nextSibling;el=el.parentNode;}_27=_15(4,trs,_26,tre);}else{if(tag=="tr"){if(_24=="beforebegin"){_28=el;el=el.parentNode;_27=_15(3,tbs,_26,tbe);}else{if(_24=="afterend"){_28=el.nextSibling;el=el.parentNode;_27=_15(3,tbs,_26,tbe);}else{if(_24=="afterbegin"){_28=el.firstChild;}_27=_15(4,trs,_26,tre);}}}else{if(tag=="tbody"){if(_24=="beforebegin"){_28=el;el=el.parentNode;_27=_15(2,ts,_26,te);}else{if(_24=="afterend"){_28=el.nextSibling;el=el.parentNode;_27=_15(2,ts,_26,te);}else{if(_24=="afterbegin"){_28=el.firstChild;}_27=_15(3,tbs,_26,tbe);}}}else{if(_24=="beforebegin"||_24=="afterend"){return;}if(_24=="afterbegin"){_28=el.firstChild;}_27=_15(2,ts,_26,te);}}}el.insertBefore(_27,_28);return _27;};return{useDom:false,markup:function(o){return _3(o);},applyStyles:function(el,_2b){if(_2b){el=Ext.fly(el);if(typeof _2b=="string"){var re=/\s?([a-z\-]*)\:\s?([^;]*);?/gi;var _2d;while((_2d=re.exec(_2b))!=null){el.setStyle(_2d[1],_2d[2]);}}else{if(typeof _2b=="object"){for(var _2e in _2b){el.setStyle(_2e,_2b[_2e]);}}else{if(typeof _2b=="function"){Ext.DomHelper.applyStyles(el,_2b.call());}}}}},insertHtml:function(_2f,el,_31){_2f=_2f.toLowerCase();if(el.insertAdjacentHTML){var tag=el.tagName.toLowerCase();if(tag=="table"||tag=="tbody"||tag=="tr"||tag=="td"){var rs;if(rs=_22(tag,_2f,el,_31)){return rs;}}switch(_2f){case"beforebegin":el.insertAdjacentHTML(_2f,_31);return el.previousSibling;case"afterbegin":el.insertAdjacentHTML(_2f,_31);return el.firstChild;case"beforeend":el.insertAdjacentHTML(_2f,_31);return el.lastChild;case"afterend":el.insertAdjacentHTML(_2f,_31);return el.nextSibling;}throw"Illegal insertion point -> \""+_2f+"\"";}var _34=el.ownerDocument.createRange();var _35;switch(_2f){case"beforebegin":_34.setStartBefore(el);_35=_34.createContextualFragment(_31);el.parentNode.insertBefore(_35,el);return el.previousSibling;case"afterbegin":if(el.firstChild){_34.setStartBefore(el.firstChild);_35=_34.createContextualFragment(_31);el.insertBefore(_35,el.firstChild);return el.firstChild;}else{el.innerHTML=_31;return el.firstChild;}case"beforeend":if(el.lastChild){_34.setStartAfter(el.lastChild);_35=_34.createContextualFragment(_31);el.appendChild(_35);return el.lastChild;}else{el.innerHTML=_31;return el.lastChild;}case"afterend":_34.setStartAfter(el);_35=_34.createContextualFragment(_31);el.parentNode.insertBefore(_35,el.nextSibling);return el.nextSibling;}throw"Illegal insertion point -> \""+_2f+"\"";},insertBefore:function(el,o,_38){return this.doInsert(el,o,_38,"beforeBegin");},insertAfter:function(el,o,_3b){return this.doInsert(el,o,_3b,"afterEnd","nextSibling");},insertFirst:function(el,o,_3e){return this.doInsert(el,o,_3e,"afterBegin");},doInsert:function(el,o,_41,pos,_43){el=Ext.getDom(el);var _44;if(this.useDom){_44=_c(o,null);el.parentNode.insertBefore(_44,_43?el[_43]:el);}else{var _45=_3(o);_44=this.insertHtml(pos,el,_45);}return _41?Ext.get(_44,true):_44;},append:function(el,o,_48){el=Ext.getDom(el);var _49;if(this.useDom){_49=_c(o,null);el.appendChild(_49);}else{var _4a=_3(o);_49=this.insertHtml("beforeEnd",el,_4a);}return _48?Ext.get(_49,true):_49;},overwrite:function(el,o,_4d){el=Ext.getDom(el);el.innerHTML=_3(o);return _4d?Ext.get(el.firstChild,true):el.firstChild;},createTemplate:function(o){var _4f=_3(o);return new Ext.Template(_4f);}};}();
@@ -119,7 +119,7 @@ Ext.Button=function(_1,_2){Ext.apply(this,_2);this.addEvents({&quot;click&quot;:true,&quot;togg
 Ext.MenuButton=function(_1,_2){Ext.MenuButton.superclass.constructor.call(this,_1,_2);this.addEvents({"arrowclick":true});};Ext.extend(Ext.MenuButton,Ext.Button,{render:function(_3){var _4=new Ext.Template("<table cellspacing=\"0\" class=\"x-btn-menu-wrap x-btn\"><tr><td>","<table cellspacing=\"0\" class=\"x-btn-wrap x-btn-menu-text-wrap\"><tbody>","<tr><td class=\"x-btn-left\"><i>&#160;</i></td><td class=\"x-btn-center\"><button class=\"x-btn-text\" type=\"{1}\">{0}</button></td></tr>","</tbody></table></td><td>","<table cellspacing=\"0\" class=\"x-btn-wrap x-btn-menu-arrow-wrap\"><tbody>","<tr><td class=\"x-btn-center\"><button class=\"x-btn-menu-arrow-el\" type=\"button\">&#160;</button></td><td class=\"x-btn-right\"><i>&#160;</i></td></tr>","</tbody></table></td></tr></table>");var _5=_4.append(_3,[this.text,this.type],true);if(this.cls){_5.addClass(this.cls);}if(this.icon){_5.child("button").setStyle("background-image","url("+this.icon+")");}this.el=_5;if(this.handleMouseEvents){_5.on("mouseover",this.onMouseOver,this);_5.on("mouseout",this.onMouseOut,this);_5.on("mousedown",this.onMouseDown,this);_5.on("mouseup",this.onMouseUp,this);}_5.on(this.clickEvent,this.onClick,this);if(this.tooltip){var _6=_5.child("button:first");if(typeof this.tooltip=="object"){Ext.QuickTips.tips(Ext.apply({target:_6.id},this.tooltip));}else{_6.dom[this.tooltipType]=this.tooltip;}}if(this.arrowTooltip){var _6=_5.child("button:nth(2)");_6.dom[this.tooltipType]=this.arrowTooltip;}if(this.hidden){this.hide();}if(this.disabled){this.disable();}if(Ext.isIE&&!Ext.isIE7){this.autoWidth.defer(1,this);}else{this.autoWidth();}if(this.menu){this.menu.on("show",this.onMenuShow,this);this.menu.on("hide",this.onMenuHide,this);}},autoWidth:function(){if(this.el){var _7=this.el.child("table:first");var _8=this.el.child("table:last");this.el.setWidth("auto");_7.setWidth("auto");if(Ext.isIE7&&Ext.isStrict){var ib=this.el.child("button:first");if(ib&&ib.getWidth()>20){ib.clip();ib.setWidth(Ext.util.TextMetrics.measure(ib,this.text).width+ib.getFrameWidth("lr"));}}if(this.minWidth){if(this.hidden){this.el.beginMeasure();}if((_7.getWidth()+_8.getWidth())<this.minWidth){_7.setWidth(this.minWidth-_8.getWidth());}if(this.hidden){this.el.endMeasure();}}this.el.setWidth(_7.getWidth()+_8.getWidth());}},setHandler:function(_a,_b){this.handler=_a;this.scope=_b;},setArrowHandler:function(_c,_d){this.arrowHandler=_c;this.scope=_d;},focus:function(){if(this.el){this.el.child("button:first").focus();}},onClick:function(e){e.preventDefault();if(!this.disabled){if(e.getTarget(".x-btn-menu-arrow-wrap")){if(this.menu&&!this.menu.isVisible()){this.menu.show(this.el,this.menuAlign);}this.fireEvent("arrowclick",this,e);if(this.arrowHandler){this.arrowHandler.call(this.scope||this,this,e);}}else{this.fireEvent("click",this,e);if(this.handler){this.handler.call(this.scope||this,this,e);}}}},onMouseDown:function(e){if(!this.disabled){Ext.fly(e.getTarget("table")).addClass("x-btn-click");}},onMouseUp:function(e){Ext.fly(e.getTarget("table")).removeClass("x-btn-click");}});
-Ext.Toolbar=function(_1,_2,_3){if(_1 instanceof Array){_2=_1;_3=_2;_1=null;}Ext.apply(this,_3);this.buttons=_2;if(_1){this.render(_1);}};Ext.Toolbar.prototype={render:function(ct){this.el=Ext.get(ct);if(this.cls){this.el.addClass(this.cls);}this.el.update("<div class=\"x-toolbar x-small-editor\"><table cellspacing=\"0\"><tr></tr></table></div>");this.tr=this.el.child("tr",true);var _5=0;this.items=new Ext.util.MixedCollection(false,function(o){return o.id||("item"+(++_5));});if(this.buttons){this.add.apply(this,this.buttons);delete this.buttons;}},add:function(){var a=arguments,l=a.length;for(var i=0;i<l;i++){var el=a[i];if(el.applyTo){this.addField(el);}else{if(el.render){this.addItem(el);}else{if(typeof el=="string"){if(el=="separator"||el=="-"){this.addSeparator();}else{if(el==" "){this.addSpacer();}else{if(el=="->"){this.addFill();}else{this.addText(el);}}}}else{if(el.tagName){this.addElement(el);}else{if(typeof el=="object"){this.addButton(el);}}}}}}},getEl:function(){return this.el;},addSeparator:function(){return this.addItem(new Ext.Toolbar.Separator());},addSpacer:function(){return this.addItem(new Ext.Toolbar.Spacer());},addFill:function(){return this.addItem(new Ext.Toolbar.Fill());},addElement:function(el){return this.addItem(new Ext.Toolbar.Item(el));},addItem:function(_c){var td=this.nextBlock();_c.render(td);this.items.add(_c);return _c;},addButton:function(_e){if(_e instanceof Array){var _f=[];for(var i=0,len=_e.length;i<len;i++){_f.push(this.addButton(_e[i]));}return _f;}var b=_e;if(!(_e instanceof Ext.Toolbar.Button)){b=new Ext.Toolbar.Button(_e);}var td=this.nextBlock();b.render(td);this.items.add(b);return b;},addText:function(_14){return this.addItem(new Ext.Toolbar.TextItem(_14));},insertButton:function(_15,_16){if(_16 instanceof Array){var _17=[];for(var i=0,len=_16.length;i<len;i++){_17.push(this.insertButton(_15+i,_16[i]));}return _17;}if(!(_16 instanceof Ext.Toolbar.Button)){_16=new Ext.Toolbar.Button(_16);}var td=document.createElement("td");this.tr.insertBefore(td,this.tr.childNodes[_15]);_16.render(td);this.items.insert(_15,_16);return _16;},addDom:function(_1b,_1c){var td=this.nextBlock();Ext.DomHelper.overwrite(td,_1b);var ti=new Ext.Toolbar.Item(td.firstChild);ti.render(td);this.items.add(ti);return ti;},addField:function(_1f){var td=this.nextBlock();_1f.render(td);var ti=new Ext.Toolbar.Item(td.firstChild);ti.render(td);this.items.add(ti);return ti;},nextBlock:function(){var td=document.createElement("td");this.tr.appendChild(td);return td;},destroy:function(){if(this.items){Ext.destroy.apply(Ext,this.items.items);}Ext.Element.uncache(this.el,this.tr);}};Ext.Toolbar.Item=function(el){this.el=Ext.getDom(el);this.id=Ext.id(this.el);this.hidden=false;};Ext.Toolbar.Item.prototype={getEl:function(){return this.el;},render:function(td){this.td=td;td.appendChild(this.el);},destroy:function(){this.td.parentNode.removeChild(this.td);},show:function(){this.hidden=false;this.td.style.display="";},hide:function(){this.hidden=true;this.td.style.display="none";},setVisible:function(_25){if(_25){this.show();}else{this.hide();}},focus:function(){Ext.fly(this.el).focus();},disable:function(){Ext.fly(this.td).addClass("x-item-disabled");this.disabled=true;this.el.disabled=true;},enable:function(){Ext.fly(this.td).removeClass("x-item-disabled");this.disabled=false;this.el.disabled=false;}};Ext.Toolbar.Separator=function(){var s=document.createElement("span");s.className="ytb-sep";Ext.Toolbar.Separator.superclass.constructor.call(this,s);};Ext.extend(Ext.Toolbar.Separator,Ext.Toolbar.Item,{enable:Ext.emptyFn,disable:Ext.emptyFn,focus:Ext.emptyFn});Ext.Toolbar.Spacer=function(){var s=document.createElement("div");s.className="ytb-spacer";Ext.Toolbar.Spacer.superclass.constructor.call(this,s);};Ext.extend(Ext.Toolbar.Spacer,Ext.Toolbar.Item,{enable:Ext.emptyFn,disable:Ext.emptyFn,focus:Ext.emptyFn});Ext.Toolbar.Fill=Ext.extend(Ext.Toolbar.Spacer,{render:function(td){td.style.width="100%";Ext.Toolbar.Fill.superclass.render.call(this,td);}});Ext.Toolbar.TextItem=function(_29){var s=document.createElement("span");s.className="ytb-text";s.innerHTML=_29;Ext.Toolbar.TextItem.superclass.constructor.call(this,s);};Ext.extend(Ext.Toolbar.TextItem,Ext.Toolbar.Item,{enable:Ext.emptyFn,disable:Ext.emptyFn,focus:Ext.emptyFn});Ext.Toolbar.Button=function(_2b){Ext.Toolbar.Button.superclass.constructor.call(this,null,_2b);};Ext.extend(Ext.Toolbar.Button,Ext.Button,{render:function(td){this.td=td;Ext.Toolbar.Button.superclass.render.call(this,td);},destroy:function(){Ext.Toolbar.Button.superclass.destroy.call(this);this.td.parentNode.removeChild(this.td);},show:function(){this.hidden=false;this.td.style.display="";},hide:function(){this.hidden=true;this.td.style.display="none";},disable:function(){Ext.fly(this.td).addClass("x-item-disabled");this.disabled=true;},enable:function(){Ext.fly(this.td).removeClass("x-item-disabled");this.disabled=false;}});Ext.ToolbarButton=Ext.Toolbar.Button;Ext.Toolbar.MenuButton=function(_2d){Ext.Toolbar.MenuButton.superclass.constructor.call(this,null,_2d);};Ext.extend(Ext.Toolbar.MenuButton,Ext.MenuButton,{render:function(td){this.td=td;Ext.Toolbar.MenuButton.superclass.render.call(this,td);},destroy:function(){Ext.Toolbar.MenuButton.superclass.destroy.call(this);this.td.parentNode.removeChild(this.td);},show:function(){this.hidden=false;this.td.style.display="";},hide:function(){this.hidden=true;this.td.style.display="none";}});
+Ext.Toolbar=function(_1,_2,_3){if(_1 instanceof Array){_2=_1;_3=_2;_1=null;}Ext.apply(this,_3);this.buttons=_2;if(_1){this.render(_1);}};Ext.Toolbar.prototype={render:function(ct){this.el=Ext.get(ct);if(this.cls){this.el.addClass(this.cls);}this.el.update("<div class=\""+this.cls+" x-small-editor\"><table cellspacing=\"0\"><tr></tr></table></div>");this.tr=this.el.child("tr",true);var _5=0;this.items=new Ext.util.MixedCollection(false,function(o){return o.id||("item"+(++_5));});if(this.buttons){this.add.apply(this,this.buttons);delete this.buttons;}},add:function(){var a=arguments,l=a.length;for(var i=0;i<l;i++){var el=a[i];if(el.applyTo){this.addField(el);}else{if(el.render){this.addItem(el);}else{if(typeof el=="string"){if(el=="separator"||el=="-"){this.addSeparator();}else{if(el==" "){this.addSpacer();}else{if(el=="->"){this.addFill();}else{this.addText(el);}}}}else{if(el.tagName){this.addElement(el);}else{if(typeof el=="object"){this.addButton(el);}}}}}}},getEl:function(){return this.el;},addSeparator:function(){return this.addItem(new Ext.Toolbar.Separator());},addSpacer:function(){return this.addItem(new Ext.Toolbar.Spacer());},addFill:function(){return this.addItem(new Ext.Toolbar.Fill());},addElement:function(el){return this.addItem(new Ext.Toolbar.Item(el));},addItem:function(_c){var td=this.nextBlock();_c.render(td);this.items.add(_c);return _c;},addButton:function(_e){if(_e instanceof Array){var _f=[];for(var i=0,len=_e.length;i<len;i++){_f.push(this.addButton(_e[i]));}return _f;}var b=_e;if(!(_e instanceof Ext.Toolbar.Button)){b=new Ext.Toolbar.Button(_e);}var td=this.nextBlock();b.render(td);this.items.add(b);return b;},addText:function(_14){return this.addItem(new Ext.Toolbar.TextItem(_14));},insertButton:function(_15,_16){if(_16 instanceof Array){var _17=[];for(var i=0,len=_16.length;i<len;i++){_17.push(this.insertButton(_15+i,_16[i]));}return _17;}if(!(_16 instanceof Ext.Toolbar.Button)){_16=new Ext.Toolbar.Button(_16);}var td=document.createElement("td");this.tr.insertBefore(td,this.tr.childNodes[_15]);_16.render(td);this.items.insert(_15,_16);return _16;},addDom:function(_1b,_1c){var td=this.nextBlock();Ext.DomHelper.overwrite(td,_1b);var ti=new Ext.Toolbar.Item(td.firstChild);ti.render(td);this.items.add(ti);return ti;},addField:function(_1f){var td=this.nextBlock();_1f.render(td);var ti=new Ext.Toolbar.Item(td.firstChild);ti.render(td);this.items.add(ti);return ti;},nextBlock:function(){var td=document.createElement("td");this.tr.appendChild(td);return td;},destroy:function(){if(this.items){Ext.destroy.apply(Ext,this.items.items);}Ext.Element.uncache(this.el,this.tr);}};Ext.Toolbar.Item=function(el){this.el=Ext.getDom(el);this.id=Ext.id(this.el);this.hidden=false;};Ext.Toolbar.Item.prototype={getEl:function(){return this.el;},render:function(td){this.td=td;td.appendChild(this.el);},destroy:function(){this.td.parentNode.removeChild(this.td);},show:function(){this.hidden=false;this.td.style.display="";},hide:function(){this.hidden=true;this.td.style.display="none";},setVisible:function(_25){if(_25){this.show();}else{this.hide();}},focus:function(){Ext.fly(this.el).focus();},disable:function(){Ext.fly(this.td).addClass("x-item-disabled");this.disabled=true;this.el.disabled=true;},enable:function(){Ext.fly(this.td).removeClass("x-item-disabled");this.disabled=false;this.el.disabled=false;}};Ext.Toolbar.Separator=function(){var s=document.createElement("span");s.className="ytb-sep";Ext.Toolbar.Separator.superclass.constructor.call(this,s);};Ext.extend(Ext.Toolbar.Separator,Ext.Toolbar.Item,{enable:Ext.emptyFn,disable:Ext.emptyFn,focus:Ext.emptyFn});Ext.Toolbar.Spacer=function(){var s=document.createElement("div");s.className="ytb-spacer";Ext.Toolbar.Spacer.superclass.constructor.call(this,s);};Ext.extend(Ext.Toolbar.Spacer,Ext.Toolbar.Item,{enable:Ext.emptyFn,disable:Ext.emptyFn,focus:Ext.emptyFn});Ext.Toolbar.Fill=Ext.extend(Ext.Toolbar.Spacer,{render:function(td){td.style.width="100%";Ext.Toolbar.Fill.superclass.render.call(this,td);}});Ext.Toolbar.TextItem=function(_29){var s=document.createElement("span");s.className="ytb-text";s.innerHTML=_29;Ext.Toolbar.TextItem.superclass.constructor.call(this,s);};Ext.extend(Ext.Toolbar.TextItem,Ext.Toolbar.Item,{enable:Ext.emptyFn,disable:Ext.emptyFn,focus:Ext.emptyFn});Ext.Toolbar.Button=function(_2b){Ext.Toolbar.Button.superclass.constructor.call(this,null,_2b);};Ext.extend(Ext.Toolbar.Button,Ext.Button,{render:function(td){this.td=td;Ext.Toolbar.Button.superclass.render.call(this,td);},destroy:function(){Ext.Toolbar.Button.superclass.destroy.call(this);this.td.parentNode.removeChild(this.td);},show:function(){this.hidden=false;this.td.style.display="";},hide:function(){this.hidden=true;this.td.style.display="none";},disable:function(){Ext.fly(this.td).addClass("x-item-disabled");this.disabled=true;},enable:function(){Ext.fly(this.td).removeClass("x-item-disabled");this.disabled=false;}});Ext.ToolbarButton=Ext.Toolbar.Button;Ext.Toolbar.MenuButton=function(_2d){Ext.Toolbar.MenuButton.superclass.constructor.call(this,null,_2d);};Ext.extend(Ext.Toolbar.MenuButton,Ext.MenuButton,{render:function(td){this.td=td;Ext.Toolbar.MenuButton.superclass.render.call(this,td);},destroy:function(){Ext.Toolbar.MenuButton.superclass.destroy.call(this);this.td.parentNode.removeChild(this.td);},show:function(){this.hidden=false;this.td.style.display="";},hide:function(){this.hidden=true;this.td.style.display="none";}});
 Ext.PagingToolbar=function(el,ds,_3){Ext.PagingToolbar.superclass.constructor.call(this,el,null,_3);this.ds=ds;this.cursor=0;this.renderButtons(this.el);this.bind(ds);};Ext.extend(Ext.PagingToolbar,Ext.Toolbar,{pageSize:20,displayMsg:"Displaying {0} - {1} of {2}",emptyMsg:"No data to display",beforePageText:"Page",afterPageText:"of {0}",firstText:"First Page",prevText:"Previous Page",nextText:"Next Page",lastText:"Last Page",refreshText:"Refresh",renderButtons:function(el){Ext.PagingToolbar.superclass.render.call(this,el);this.first=this.addButton({tooltip:this.firstText,cls:"x-btn-icon x-grid-page-first",disabled:true,handler:this.onClick.createDelegate(this,["first"])});this.prev=this.addButton({tooltip:this.prevText,cls:"x-btn-icon x-grid-page-prev",disabled:true,handler:this.onClick.createDelegate(this,["prev"])});this.addSeparator();this.add(this.beforePageText);this.field=Ext.get(this.addDom({tag:"input",type:"text",size:"3",value:"1",cls:"x-grid-page-number"}).el);this.field.on("keydown",this.onPagingKeydown,this);this.field.on("focus",function(){this.dom.select();});this.afterTextEl=this.addText(String.format(this.afterPageText,1));this.field.setHeight(18);this.addSeparator();this.next=this.addButton({tooltip:this.nextText,cls:"x-btn-icon x-grid-page-next",disabled:true,handler:this.onClick.createDelegate(this,["next"])});this.last=this.addButton({tooltip:this.lastText,cls:"x-btn-icon x-grid-page-last",disabled:true,handler:this.onClick.createDelegate(this,["last"])});this.addSeparator();this.loading=this.addButton({tooltip:this.refreshText,cls:"x-btn-icon x-grid-loading",disabled:true,handler:this.onClick.createDelegate(this,["refresh"])});if(this.displayInfo){this.displayEl=Ext.fly(this.el.dom.firstChild).createChild({cls:"x-paging-info"});}},updateInfo:function(){if(this.displayEl){var _5=this.ds.getCount();var _6=_5==0?this.emptyMsg:String.format(this.displayMsg,this.cursor+1,this.cursor+_5,this.ds.getTotalCount());this.displayEl.update(_6);}},onLoad:function(ds,r,o){this.cursor=o.params?o.params.start:0;var d=this.getPageData(),ap=d.activePage,ps=d.pages;this.afterTextEl.el.innerHTML=String.format(this.afterPageText,d.pages);this.field.dom.value=ap;this.first.setDisabled(ap==1);this.prev.setDisabled(ap==1);this.next.setDisabled(ap==ps);this.last.setDisabled(ap==ps);this.loading.enable();this.updateInfo();},getPageData:function(){var _d=this.ds.getTotalCount();return{total:_d,activePage:Math.ceil((this.cursor+this.pageSize)/this.pageSize),pages:_d<this.pageSize?1:Math.ceil(_d/this.pageSize)};},onLoadError:function(){this.loading.enable();},onPagingKeydown:function(e){var k=e.getKey();var d=this.getPageData();if(k==e.RETURN){var v=this.field.dom.value,_12;if(!v||isNaN(_12=parseInt(v,10))){this.field.dom.value=d.activePage;return;}_12=Math.min(Math.max(1,_12),d.pages)-1;this.ds.load({params:{start:_12*this.pageSize,limit:this.pageSize}});e.stopEvent();}else{if(k==e.HOME||(k==e.UP&&e.ctrlKey)||(k==e.PAGEUP&&e.ctrlKey)||(k==e.RIGHT&&e.ctrlKey)||k==e.END||(k==e.DOWN&&e.ctrlKey)||(k==e.LEFT&&e.ctrlKey)||(k==e.PAGEDOWN&&e.ctrlKey)){var _12=(k==e.HOME||(k==e.DOWN&&e.ctrlKey)||(k==e.LEFT&&e.ctrlKey)||(k==e.PAGEDOWN&&e.ctrlKey))?1:d.pages;this.field.dom.value=_12;this.ds.load({params:{start:(_12-1)*this.pageSize,limit:this.pageSize}});e.stopEvent();}else{if(k==e.UP||k==e.RIGHT||k==e.PAGEUP||k==e.DOWN||k==e.LEFT||k==e.PAGEDOWN){var v=this.field.dom.value,_12;var _13=(e.shiftKey)?10:1;if(k==e.DOWN||k==e.LEFT||k==e.PAGEDOWN){_13*=-1;}if(!v||isNaN(_12=parseInt(v,10))){this.field.dom.value=d.activePage;return;}else{if(parseInt(v,10)+_13>=1&parseInt(v,10)+_13<=d.pages){this.field.dom.value=parseInt(v,10)+_13;_12=Math.min(Math.max(1,_12+_13),d.pages)-1;this.ds.load({params:{start:_12*this.pageSize,limit:this.pageSize}});}}e.stopEvent();}}}},beforeLoad:function(){if(this.loading){this.loading.disable();}},onClick:function(_14){var ds=this.ds;switch(_14){case"first":ds.load({params:{start:0,limit:this.pageSize}});break;case"prev":ds.load({params:{start:Math.max(0,this.cursor-this.pageSize),limit:this.pageSize}});break;case"next":ds.load({params:{start:this.cursor+this.pageSize,limit:this.pageSize}});break;case"last":var _16=ds.getTotalCount();var _17=_16%this.pageSize;var _18=_17?(_16-_17):_16-this.pageSize;ds.load({params:{start:_18,limit:this.pageSize}});break;case"refresh":ds.load({params:{start:this.cursor,limit:this.pageSize}});break;}},unbind:function(ds){ds.un("beforeload",this.beforeLoad,this);ds.un("load",this.onLoad,this);ds.un("loadexception",this.onLoadError,this);this.ds=undefined;},bind:function(ds){ds.on("beforeload",this.beforeLoad,this);ds.on("load",this.onLoad,this);ds.on("loadexception",this.onLoadError,this);this.ds=ds;}});