Index: trunk/kernel/admin_templates/incs/toolbar.js
===================================================================
diff -u -N -r5009 -r5044
--- trunk/kernel/admin_templates/incs/toolbar.js	(.../toolbar.js)	(revision 5009)
+++ trunk/kernel/admin_templates/incs/toolbar.js	(.../toolbar.js)	(revision 5044)
@@ -35,13 +35,22 @@
 	if (!img_path) {
 		alert('error: toolbar image path not set');
 	}
+//	alert('base toolbar button: ['+img_path + this.Module + 'toolbar/'+'];');
 	return img_path + this.Module + 'toolbar/';
 }
 
 ToolBarButton.prototype.GetHTML = function() {
 	return '<img id="tool_' + this.Title + '" src="' + this.IconsPath() + this.ToolBar.IconPrefix + this.Title + '.gif" title="' + this.Alt + '">';
 }
 
+ToolBarButton.prototype.GetObject = function() {
+	var $img = document.createElement('IMG');
+	$img.id = 'tool_' + this.Title;
+	$img.src = this.IconsPath() + this.ToolBar.IconPrefix + this.Title + '.gif';
+	$img.title = this.Alt;
+	return $img;
+}
+
 ToolBarButton.prototype.Init = function() {
 	img = document.getElementById('tool_' + this.Title);
 	this.imgObject = img;
@@ -139,6 +148,14 @@
 	return '<img id="tool_' + this.Title + '" src="' + this.IconsPath() + 'tool_divider.gif">';
 }
 
+ToolBarSeparator.prototype.GetObject = function() {
+	var $img = document.createElement('IMG');
+	$img.id = 'tool_' + this.Title;
+	$img.src = this.IconsPath() + 'tool_divider.gif';
+	$img.title = '';
+	return $img;
+}
+
 ToolBarSeparator.prototype.Init = function() {
 	img = document.getElementById(this.ToolBar.IconPrefix + this.Title);
 	this.imgObject = img;
@@ -167,13 +184,22 @@
 	this.Buttons[a_button.Title] = a_button;
 }
 
-ToolBar.prototype.Render = function()
+ToolBar.prototype.Render = function($container)
 {
-	for (var i in this.Buttons) {
-		btn = this.Buttons[i];
-		document.write( btn.GetHTML() );
-		btn.Init();
+	if ($container) {
+		for (var i in this.Buttons) {
+			btn = this.Buttons[i];
+			$container.appendChild( btn.GetObject() );
+			btn.Init();
+		}
 	}
+	else {
+		for (var i in this.Buttons) {
+			btn = this.Buttons[i];
+			document.write( btn.GetHTML() );
+			btn.Init();
+		}
+	}
 }
 
 ToolBar.prototype.EnableButton = function(button_id) {
Index: trunk/kernel/admin_templates/incs/script.js
===================================================================
diff -u -N -r5042 -r5044
--- trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 5042)
+++ trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 5044)
@@ -471,16 +471,16 @@
 	return $kf.elements[$field] ? $kf.elements[$field].value : false;
 }
 
-function search($prefix_special, $grid_name)
+function search($prefix_special, $grid_name, $ajax)
 {
 	set_hidden_field('grid_name', $grid_name);
-	submit_event($prefix_special,'OnSearch');
+	submit_event($prefix_special, 'OnSearch', null, null, $ajax);
 }
 
-function search_reset($prefix_special, $grid_name)
+function search_reset($prefix_special, $grid_name, $ajax)
 {
 	set_hidden_field('grid_name', $grid_name);
-	submit_event($prefix_special,'OnSearchReset');
+	submit_event($prefix_special, 'OnSearchReset', null, null, $ajax);
 }
 
 function search_keydown($event)
Index: trunk/kernel/admin_templates/incs/header.tpl
===================================================================
diff -u -N -r5026 -r5044
--- trunk/kernel/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 5026)
+++ trunk/kernel/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 5044)
@@ -30,7 +30,7 @@
 var tpl_changed = 0;
 var base_url = '<inp2:m_BaseURL/>';
 var $base_path = '<inp2:m_GetConst name="BASE_PATH"/>';
-var img_path = "img/";
+var img_path = '<inp2:m_TemplatesBase/>/img/';
 
 </script>
 </head>
Index: trunk/kernel/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r5042 -r5044
--- trunk/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 5042)
+++ trunk/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 5044)
@@ -58,20 +58,24 @@
 									Grid="<inp2:m_param name="grid"/>"
 									style="border: 1px solid grey;">
 							</td>
-							<td>
+							<td id="search_buttons[<inp2:m_param name="PrefixSpecial"/>]">
 								<script type="text/javascript">
-									document.getElementById('<inp2:m_param name="PrefixSpecial"/>_search_keyword').onkeydown = search_keydown;
-									Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'] = new ToolBar('icon16_');
-									Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].AddButton( new ToolBarButton('search', '<inp2:m_phrase name="la_ToolTip_Search" escape="1"/>', function() { search('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>') } ) );
-									Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].AddButton( new ToolBarButton('search_reset', '<inp2:m_phrase name="la_ToolTip_SearchReset" escape="1"/>', function() { search_reset('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>') } ) );
-									Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].Render();
+									<inp2:m_RenderElement name="grid_search_buttons" pass_params="true"/>
 								</script>
 							</td>
 						</tr>
 					</table>
 				</td>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="grid_search_buttons" PrefixSpecial="" grid="" ajax="0">
+	document.getElementById('<inp2:m_param name="PrefixSpecial"/>_search_keyword').onkeydown = search_keydown;
+	Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'] = new ToolBar('icon16_');
+	Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].AddButton( new ToolBarButton('search', '<inp2:m_phrase name="la_ToolTip_Search" escape="1"/>', function() { search('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>) } ) );
+	Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].AddButton( new ToolBarButton('search_reset', '<inp2:m_phrase name="la_ToolTip_SearchReset" escape="1"/>', function() { search_reset('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>) } ) );
+	Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].Render(document.getElementById('search_buttons[<inp2:m_param name="PrefixSpecial"/>]'));
+</inp2:m_DefineElement>
+
 <inp2:m_block name="grid_column_title"/>
 	<td nowrap="nowrap">
 		<a href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);" class="columntitle_small"><IMG alt="" src="img/list_arrow_<inp2:$PrefixSpecial_order field="$sort_field"/>.gif" border="0" align="absmiddle"><inp2:m_phrase name="$title"/><!-- <inp2:m_param name="title"/> --></a>
Index: trunk/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r4997 -r5044
--- trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 4997)
+++ trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 5044)
@@ -26,16 +26,26 @@
 	}
 
 	/**
+	 * Base folder for all template includes
+	 *
+	 * @param Array $params
+	 * @return string
+	 */
+	function TemplatesBase($params)
+	{
+		return $this->Application->BaseURL().substr(THEMES_PATH, 1);
+	}
+	
+	/**
 	 * Creates <base href ..> HTML tag for all templates
 	 * affects future css, js files and href params of links
 	 *
 	 * @return string
 	 * @access public
 	 */
-	function Base_Ref()
+	function Base_Ref($params)
 	{
-		$url = $this->Application->BaseURL().substr(THEMES_PATH, 1).'/';
-		return '<base href="'.$url.'" />';
+		return '<base href="'.$this->TemplatesBase($params).'/" />';
 	}
 
 	/**
@@ -49,11 +59,6 @@
 		return $this->Application->BaseURL();
 	}
 
-	function TemplatesBase($params)
-	{
-		return $this->Application->BaseURL().THEMES_PATH;
-	}
-
 	function ProjectBase($params)
 	{
 		return $this->Application->BaseURL();