Index: branches/RC/core/admin_templates/js/jquery/thickbox/thickbox.js
===================================================================
diff -u -N -r11368 -r11412
--- branches/RC/core/admin_templates/js/jquery/thickbox/thickbox.js	(.../thickbox.js)	(revision 11368)
+++ branches/RC/core/admin_templates/js/jquery/thickbox/thickbox.js	(.../thickbox.js)	(revision 11412)
@@ -289,11 +289,11 @@
 	$('#TB_closeWindowButton').click(TB.remove);
 
 	if (params.url.indexOf('TB_inline') != -1) {
-		$('#TB_ajaxContent').append( $('#' + url_params['inlineId']).children() );
+		$('#TB_ajaxContent').html( $('#' + url_params['inlineId']).html() );
 		$('#TB_window').unload(
 			function () {
 				// move elements back when you're finished
-				$('#' + url_params['inlineId']).append( $('#TB_ajaxContent').children() );
+				$('#' + url_params['inlineId']).html( $('#TB_ajaxContent').html() );
 			}
 		);
 
Index: branches/RC/core/admin_templates/catalog/catalog_elements.tpl
===================================================================
diff -u -N -r11396 -r11412
--- branches/RC/core/admin_templates/catalog/catalog_elements.tpl	(.../catalog_elements.tpl)	(revision 11396)
+++ branches/RC/core/admin_templates/catalog/catalog_elements.tpl	(.../catalog_elements.tpl)	(revision 11412)
@@ -50,7 +50,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="catalog_search_box">
-	<td style="white-space: nowrap; text-align: right; width: 270px;" align="right">
+	<td style="white-space: nowrap; text-align: right; width: 300px;" align="right">
 		<div style="float: right">
 			<table cellpadding="0" cellspacing="0">
 				<tr>
Index: branches/RC/core/admin_templates/catalog_tab.tpl
===================================================================
diff -u -N -r11368 -r11412
--- branches/RC/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 11368)
+++ branches/RC/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 11412)
@@ -52,16 +52,16 @@
 		    		<inp2:m_Phrase name="la_fld_PrimaryCategory"/>: <a href="<inp2:m_Link template="catalog/catalog" m_cat_id="$item_category" no_pass_through="1"/>"><inp2:CategoryName cat_id="$item_category"/></a><br />
 		    	</span>
 			<inp2:m_else/>
-				<a href="javascript:$Catalog.go_to_cat(<inp2:m_get name="c_id"/>, '<inp2:GetModulePrefix/>');"><inp2:Field field="$field" grid="$grid" format="$format"/></a>
+				<a href="javascript:$Catalog.go_to_cat(<inp2:m_get name="c_id"/>, '<inp2:GetModulePrefix/>');" title="<inp2:m_Phrase name='la_alt_GoInside' html_escape='1'/>"><inp2:Field field="$field" grid="$grid" format="$format"/></a>
 				<inp2:m_if check="Field" field="IsSystem">
 					<span class="field-required">&nbsp;*</span>
 				</inp2:m_if>
 			</inp2:m_if>
 
 			<!--<span class="cats_stats">(<inp2:SubCatCount/> / <inp2:ItemCount/>)</span>-->
 
-			<a href="<inp2:PageBrowseLink/>" title="<inp2:m_Phrase name='la_Browse' html_escape='1'/>">
-				<img src="<inp2:m_TemplatesBase/>/img/arrow.gif" width="15" height="15" alt="<inp2:m_Phrase name='la_Browse' html_escape='1'/>" border="0"/>
+			<a href="<inp2:PageBrowseLink/>" title="<inp2:m_Phrase name='la_alt_Browse' html_escape='1'/>">
+				<img src="<inp2:m_TemplatesBase/>/img/arrow.gif" width="15" height="15" alt="<inp2:m_Phrase name='la_alt_Browse' html_escape='1'/>" border="0"/>
 			</a>
 
 			<!--&nbsp;
Index: branches/RC/core/admin_templates/categories/xml/categories_list.tpl
===================================================================
diff -u -N -r11368 -r11412
--- branches/RC/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 11368)
+++ branches/RC/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 11412)
@@ -75,7 +75,7 @@
 	alert('<inp2:m_Phrase name="la_error_RootCategoriesDelete"/>');
 	<inp2:m_RemoveVar name="root_delete_error"/>
 </inp2:m_if>
-GridScrollers['c'].afterLoad();
+
 #separator#
 <inp2:c_UpdateLastTemplate template="catalog/catalog"/>
 
Index: branches/RC/core/install/english.lang
===================================================================
diff -u -N -r11411 -r11412
--- branches/RC/core/install/english.lang	(.../english.lang)	(revision 11411)
+++ branches/RC/core/install/english.lang	(.../english.lang)	(revision 11412)
@@ -10,6 +10,8 @@
 			<PHRASE Label="la_AdministrativeConsole" Module="Core" Type="1">QWRtaW5pc3RyYXRpdmUgQ29uc29sZQ==</PHRASE>
 			<PHRASE Label="la_Affected_Rows" Module="Core" Type="1">QWZmZWN0ZWQgUm93cw==</PHRASE>
 			<PHRASE Label="la_AllowDeleteRootCats" Module="Core" Type="1">QWxsb3cgZGVsZXRpbmcgTW9kdWxlIFJvb3QgQ2F0ZWdvcnk=</PHRASE>
+			<PHRASE Label="la_alt_Browse" Module="Core" Type="1">VmlldyBpbiBCcm93c2UgTW9kZQ==</PHRASE>
+			<PHRASE Label="la_alt_GoInside" Module="Core" Type="1">R28gSW5zaWRl</PHRASE>
 			<PHRASE Label="la_Always" Module="Core" Type="1">QWx3YXlz</PHRASE>
 			<PHRASE Label="la_and" Module="Core" Type="1">YW5k</PHRASE>
 			<PHRASE Label="la_approve_description" Module="Core" Type="1">QWN0aXZl</PHRASE>
Index: branches/RC/core/units/users/users_config.php
===================================================================
diff -u -N -r11375 -r11412
--- branches/RC/core/units/users/users_config.php	(.../users_config.php)	(revision 11375)
+++ branches/RC/core/units/users/users_config.php	(.../users_config.php)	(revision 11412)
@@ -116,7 +116,11 @@
 							'edit_status_labels' => Array ('u' => '!la_title_Editing_User!'),
 						),
 
-						'users_list' => Array ('prefixes' => Array ('u_List'), 'format' => "!la_title_Users! (#u_recordcount#)"),
+						'users_list' => Array (
+							'prefixes' => Array ('u_List'), 'format' => "!la_title_Users! (#u_recordcount#)",
+							'toolbar_buttons' => Array ('new_user', 'edit', 'delete', 'approve', 'decline', 'e-mail', 'export', 'view'),
+						),
+
 						'users_edit' => Array ('prefixes' => Array ('u'), 'format' => "#u_status# #u_titlefield#"),
 						'user_edit_images' => Array ('prefixes' => Array ('u', 'u-img_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Images! (#u-img_recordcount#)"),
 						'user_edit_groups' => Array ('prefixes' => Array ('u', 'u-ug_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Groups! (#u-ug_recordcount#)"),
Index: branches/RC/core/admin_templates/js/script.js
===================================================================
diff -u -N -r11368 -r11412
--- branches/RC/core/admin_templates/js/script.js	(.../script.js)	(revision 11368)
+++ branches/RC/core/admin_templates/js/script.js	(.../script.js)	(revision 11412)
@@ -79,9 +79,9 @@
 	submit_event($prefix_special,'OnSetSortingDirect', null, null, $ajax);
 }
 
-function reset_sorting($prefix_special)
+function reset_sorting($prefix_special, $ajax)
 {
-	submit_event($prefix_special,'OnResetSorting');
+	submit_event($prefix_special,'OnResetSorting', null, null, $ajax);
 }
 
 function set_per_page($prefix_special, $per_page, $ajax)
@@ -802,6 +802,39 @@
 	submit_event($prefix_special,'OnApplyFilters', null, null, $ajax);
 }
 
+function filter_toggle($row_id, $prefix) {
+//	var $row = $('#' + jq($row_id));
+
+	var $row = $('tr.to-range-filter');
+	var $hidden = $row.hasClass('hidden-filter');
+
+	if ($hidden) {
+		$('td', $row).show();
+
+		$row.removeClass('hidden-filter');
+	}
+	else {
+		$('td', $row).hide();
+
+		$row.addClass('hidden-filter');
+	}
+
+	// recalculate filter row heights/widths
+	var $grid = GridScrollers[$prefix];
+	$grid.UpdateColWidths();
+
+	if ($hidden && $grid.FiltersExpanded !== true) {
+		$grid.AdjustInputWidths();
+		$grid.FiltersExpanded = true;
+	}
+
+//	$grid.SetLeftHeights();
+//	$grid.UpdateTotalDimensions();
+//	$grid.SyncScroll();
+
+//	$grid.Resize( $grid.GetAutoSize() );
+}
+
 function RemoveTranslationLink($string, $escaped)
 {
 	if (!isset($escaped)) $escaped = true;
@@ -1166,14 +1199,6 @@
 		submit_event('u', 'OnSetPersistantVariable', $t, $form_action);
 	}
 
-	/*functionremoveEvent(el, evname, func) {
-   if (Calendar.is_ie) {
-      el.detachEvent("on" + evname, func);
-   } else {
-      el.removeEventListener(evname, func, true);
-   }
-	};*/
-
 	function setCookie($Name, $Value)
 	{
 		// set cookie
@@ -1413,13 +1438,28 @@
 		return;
 	}
 
+	if (evname.match(/mousedown|mousemove|mouseup/)) {
+		$(el)
+		.unbind(evname) // don't allow more then one
+		.bind(evname, func);
+		return ;
+	}
+
 	if (is.ie) {
 		el.attachEvent("on" + evname, func);
 	} else {
 		el.addEventListener(evname, func, true);
 	}
 };
 
+/*function removeEvent(el, evname, func) {
+	if (is.ie) {
+		el.detachEvent('on' + evname, func);
+	} else {
+		el.removeEventListener(evname, func, true);
+	}
+}*/
+
 function addLoadEvent(func, wnd)
 {
 	Application.setHook('m:OnAfterWindowLoad', func);
@@ -1477,4 +1517,16 @@
 
 String.prototype.toNumeric = function () {
 	return parseInt( this.replace(/(auto|medium)/, '0px').replace(/[a-z]/gi,'') );
+}
+
+function jq($selector) {
+	return $selector.replace(/(\[|\])/g, '\\$1');
+}
+
+function setHelpLink($user_docs_url, $title_preset) {
+	if (!$user_docs_url) {
+		return ;
+	}
+
+	getFrame('head').$('#help_link').attr('href', $user_docs_url + '/' + $title_preset);
 }
\ No newline at end of file
Index: branches/RC/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r11393 -r11412
--- branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 11393)
+++ branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 11412)
@@ -1914,6 +1914,8 @@
 			$event->setPseudoClass('_List');
 
 			$search_helper =& $this->Application->recallObject('SearchHelper');
+			/* @var $search_helper kSearchHelper */
+
 			$search_helper->performSearch($event);
 		}
 
@@ -1926,6 +1928,8 @@
 		function OnSearchReset(&$event)
 		{
 			$search_helper =& $this->Application->recallObject('SearchHelper');
+			/* @var $search_helper kSearchHelper */
+
 			$search_helper->resetSearch($event);
 		}
 
Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r11281 -r11412
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11281)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11412)
@@ -719,23 +719,44 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="edit_tabs" preset_name="Default">
-	<inp2:m_if check="{$prefix}_HasEditTabs" preset_name="$preset_name">
-		<table cellpadding="0" cellspacing="0" border="0" width="100%">
-			<tr>
-				<td align="right" width="100%">
-				  	<table cellpadding="0" cellspacing="0" border="0" height="23">
-						<tr>
-							<inp2:m_DefineElement name="edit_tab">
-								<inp2:m_RenderElement name="tab" title="$title" t="$template" main_prefix="$PrefixSpecial"/>
-							</inp2:m_DefineElement>
+<inp2:m_DefineElement name="tabs_container" tabs_render_as="">
+	<table cellpadding="0" style="width: 100%;" cellspacing="0" cellpadding="0">
+		<tr>
+			<td style="width: 20px;">
+				<img src="<inp2:m_TemplatesBase/>/img/spacer.gif" width="20" height="0" alt=""/><br/>
+				<a href="#" class="scroll-left disabled"></a>
+			</td>
 
-							<inp2:{$prefix}_PrintEditTabs render_as="edit_tab" preset_name="$preset_name"/>
+			<td height="23" align="right">
+				<div id="tab-measure" style="display: none; width: 100%; height: 23px;">&nbsp;</div>
+				<div style="overflow: hidden; height: 23px;" class="tab-viewport">
+					<table class="tabs" cellpadding="0" cellspacing="0" height="23">
+						<tr>
+							<inp2:m_RenderElement name="$tabs_render_as" />
 						</tr>
 					</table>
-				</td>
-			</tr>
-		</table>
+				</div>
+			</td>
+
+			<td style="width: 20px;">
+				<img src="<inp2:m_TemplatesBase/>/img/spacer.gif" width="20" height="0" alt=""/><br/>
+				<a href="#" class="scroll-right disabled"></a>
+			</td>
+		</tr>
+	</table>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="edit_tabs_element">
+	<inp2:m_DefineElement name="edit_tab">
+		<inp2:m_RenderElement name="tab" title="$title" t="$template" main_prefix="$PrefixSpecial"/>
+	</inp2:m_DefineElement>
+
+	<inp2:{$prefix}_PrintEditTabs render_as="edit_tab" preset_name="$preset_name"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="edit_tabs" preset_name="Default">
+	<inp2:m_if check="{$prefix}_HasEditTabs" preset_name="$preset_name">
+		<inp2:m_RenderElement name="tabs_container" tabs_render_as="edit_tabs_element" pass_params="1"/>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
Index: branches/RC/core/units/general/helpers/search_helper.php
===================================================================
diff -u -N -r11290 -r11412
--- branches/RC/core/units/general/helpers/search_helper.php	(.../search_helper.php)	(revision 11290)
+++ branches/RC/core/units/general/helpers/search_helper.php	(.../search_helper.php)	(revision 11412)
@@ -392,6 +392,58 @@
 		}
 
 		/**
+		 * Checks, that range filters "To" part is defined for given grid
+		 *
+		 * @param string $prefix_special
+		 * @param string $grid_name
+		 * @return bool
+		 */
+		function rangeFiltersUsed($prefix_special, $grid_name)
+		{
+			static $cache = Array ();
+			$cache_key = $prefix_special . $grid_name;
+
+			if (array_key_exists($cache_key, $cache)) {
+				return $cache[$cache_key];
+			}
+
+			$view_name = $this->Application->RecallVar($prefix_special . '_current_view');
+			$custom_filters = $this->Application->RecallPersistentVar($prefix_special . '_custom_filter.' . $view_name, ALLOW_DEFAULT_SETTINGS);
+			if (!$custom_filters) {
+				// filters not defined for given prefix
+				$cache[$cache_key] = false;
+				return false;
+			}
+
+			$custom_filters = unserialize($custom_filters);
+			if (!array_key_exists($grid_name, $custom_filters)) {
+				// filters not defined for given grid
+				$cache[$cache_key] = false;
+				return false;
+			}
+
+			$range_filter_defined = false;
+
+			$custom_filter = $custom_filters[$grid_name];
+			foreach ($custom_filter as $field_name => $field_options) {
+				list ($filter_type, $field_options) = each($field_options);
+
+				if (strpos($filter_type, 'range') === false) {
+					continue;
+				}
+
+				$to_value = (string)$field_options['submit_value']['to'];
+				if ($to_value !== '') {
+					$range_filter_defined = true;
+					break;
+				}
+			}
+
+			$cache[$cache_key] = $range_filter_defined;
+			return $range_filter_defined;
+		}
+
+		/**
 		 * Return numeric range filter value + checking that it's number
 		 *
 		 * @param Array $value array containing range filter value
Index: branches/RC/core/admin_templates/incs/style.css
===================================================================
diff -u -N -r11368 -r11412
--- branches/RC/core/admin_templates/incs/style.css	(.../style.css)	(revision 11368)
+++ branches/RC/core/admin_templates/incs/style.css	(.../style.css)	(revision 11412)
@@ -709,10 +709,6 @@
 	font-size: 11px;
 }
 
-tr.hidden-filter td {
-	display: none;
-}
-
 span#category_path, span#category_path a {
 	color: #FFFFFF;
 }
Index: branches/RC/core/admin_templates/img/expand_filter.gif
===================================================================
diff -u -N
Binary files differ
Index: branches/RC/core/admin_templates/img/tabs/left.png
===================================================================
diff -u -N
Binary files differ
Index: branches/RC/core/admin_templates/js/tab_scroller.js
===================================================================
diff -u -N
--- branches/RC/core/admin_templates/js/tab_scroller.js	(revision 0)
+++ branches/RC/core/admin_templates/js/tab_scroller.js	(revision 11412)
@@ -0,0 +1,195 @@
+var aTabScroller = null;
+
+function TabScroller() {
+	this.tabs = [];
+	this.spacerWidth = $('td.tab-spacer:first').width();
+
+	this.viewPort = $('div.tab-viewport');
+	this.viewPortWidth = 0;
+	this.totalWidth = 0;
+
+	var $scroller = this;
+
+	$(window).resize(
+		function () {
+			$scroller.resize();
+		}
+	);
+
+	$('a.scroll-left').click(
+		function ($e) {
+			$scroller.scrollLeft();
+			$e.preventDefault();
+		}
+	)
+
+	$('a.scroll-right').click(
+		function ($e) {
+			$scroller.scrollRight();
+			$e.preventDefault();
+		}
+	)
+}
+
+TabScroller.prototype.resize = function ($affect_navigation) {
+	var $tab_measure = $('#tab-measure');
+	this.viewPort.hide();
+
+	var $width = $tab_measure.show().width();
+	$tab_measure.hide();
+
+	this.viewPort.show().width($width - 40); // 40 (2 margins with 20px width)
+	this.viewPortWidth = this.viewPort.outerWidth();
+
+	if ($affect_navigation === undefined || $affect_navigation === true) {
+		this.affectNavigation();
+	}
+}
+
+TabScroller.prototype.searchTabs = function () {
+	if (this.viewPort.length == 0) {
+		return ;
+	}
+
+	var $scroller = this;
+
+	$('a.tab-link', '.tabs').each (
+		function () {
+			var $link = $(this);
+			var $link_container = $link.parents(':first');
+
+			$scroller.addTab(
+				{
+					width: $link_container.outerWidth(),
+					active: $link_container.hasClass('tab-active')
+				}
+			);
+		}
+	);
+
+	// preselect tab
+	this.preselectTab();
+}
+
+TabScroller.prototype.preselectTab = function () {
+	var $total = 0;
+
+	for (var $i = 0; $i < this.tabs.length; $i++) {
+		$total += this.tabs[$i].width;
+		if (this.tabs[$i].active) {
+			var $new_start = $total - this.tabs[$i].width;
+
+			// move 1 tab left from selected tab (including spacers)
+			for (var $j = $i - 1; $j > $i - 3 && $j >= 0; $j--) {
+				$new_start -= this.tabs[$j].width;
+			}
+
+			this.viewPort.scrollLeft($new_start);
+			this.affectNavigation();
+			break;
+		}
+	}
+}
+
+TabScroller.prototype.addTab = function ($tab) {
+	$tab.width += this.spacerWidth;
+
+	this.tabs.push($tab);
+	this.totalWidth += $tab.width;
+//	console.log('adding tab: ', $tab);
+}
+
+TabScroller.prototype.affectNavigation = function () {
+	var $start = this.viewPort.scrollLeft();
+	var $prev = $('a.scroll-left');
+	var $next = $('a.scroll-right');
+
+	if ($start == 0) {
+		$prev.addClass('disabled');
+	}
+	else {
+		$prev.removeClass('disabled');
+	}
+
+	if ($start + this.viewPortWidth >= this.totalWidth) {
+		$next.addClass('disabled');
+	}
+	else {
+		$next.removeClass('disabled');
+	}
+}
+
+TabScroller.prototype.scrollLeft = function () {
+	var $total = 0;
+	var $start = this.viewPort.scrollLeft();
+	var $end = $start + this.viewPortWidth;
+
+	var $scroller = this;
+
+	for (var $i = 0; $i < this.tabs.length; $i++) {
+		$total += this.tabs[$i].width;
+		if ($total >= $start) {
+			var $new_start = $total - this.tabs[$i].width;
+			var $diff = Math.abs($new_start - $start);
+
+			if ($diff > 0 && $diff <= this.spacerWidth) {
+//				console.log('skipping left');
+				continue;
+			}
+
+			this.viewPort.animate(
+				{scrollLeft: $new_start}, 'slow',
+				function() {
+					$scroller.affectNavigation();
+				}
+			); // .scrollLeft($start);
+			break;
+		}
+	}
+}
+
+TabScroller.prototype.scrollRight = function () {
+	var $total = 0;
+	var $start = this.viewPort.scrollLeft();
+	var $end = $start + this.viewPortWidth;
+
+	var $scroller = this;
+
+	for (var $i = 0; $i < this.tabs.length; $i++) {
+		$total += this.tabs[$i].width;
+
+		if ($total > $end) {
+			var $new_start = $start + ($total - $end);
+			var $diff = Math.abs($new_start - $start);
+
+			if ($diff > 0 && $diff <= this.spacerWidth) {
+//				console.log('skipping right');
+				continue;
+			}
+
+			this.viewPort.animate(
+				{scrollLeft: $new_start}, 'slow',
+				function() {
+					$scroller.affectNavigation();
+				}
+			); // .scrollLeft($start);
+			break;
+		}
+	}
+
+//	console.groupEnd();
+}
+
+$(document).ready(
+	function () {
+		aTabScroller = new TabScroller();
+		aTabScroller.resize();
+
+		aTabScroller.searchTabs();
+	}
+);
+
+/*2.1.2. Занести все вкладки (ячейки таблицы с классами tab и tab-active) в регистр вкладок (их позиция и ширина).
+При нажатии на кнопку next/prev прокручивать список вкладок на одну вкладку вправо/влево + на ширину одно
+разделителя вкладок. Если некуда крутить, то прятать кнопки прокрутки. - 1 h*/
+
Index: branches/RC/core/admin_templates/categories/ci_blocks.tpl
===================================================================
diff -u -N -r11368 -r11412
--- branches/RC/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 11368)
+++ branches/RC/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 11412)
@@ -21,6 +21,10 @@
     		<inp2:m_Phrase name="la_fld_PrimaryCategory"/>: <a href="<inp2:m_Link template='catalog/catalog' m_cat_id='$item_category' anchor='tab-{$Prefix}' no_pass_through='1'/>"><inp2:CategoryName /></a><br />
     	</span>
 	</inp2:m_if>
+
+	<a href="<inp2:ItemLink template='__default__' index_file='../index.php'/>" title="<inp2:m_Phrase name='la_alt_Browse' html_escape='1'/>">
+		<img src="<inp2:m_TemplatesBase/>/img/arrow.gif" width="15" height="15" alt="<inp2:m_Phrase name='la_alt_Browse' html_escape='1'/>" border="0"/>
+	</a>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_category_td" format="" no_special="">
Index: branches/RC/core/admin_templates/incs/menu_blocks.tpl
===================================================================
diff -u -N -r10911 -r11412
--- branches/RC/core/admin_templates/incs/menu_blocks.tpl	(.../menu_blocks.tpl)	(revision 10911)
+++ branches/RC/core/admin_templates/incs/menu_blocks.tpl	(.../menu_blocks.tpl)	(revision 11412)
@@ -49,7 +49,7 @@
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.sort.asc'), '<inp2:m_phrase name="la_common_ascending" html_escape="1" js_escape="1"/>','javascript:direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:{$PrefixSpecial}_OrderInfo type="field" no_special="$no_special" pos="1"/>","asc",null,<inp2:m_param name="ajax"/>);'<inp2:m_if check="{$PrefixSpecial}_IsOrder" no_special="$no_special" direction="asc" pos="1" >,['img/menu_dot.gif']</inp2:m_if>);
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.sort.desc'), '<inp2:m_phrase name="la_common_descending" html_escape="1" js_escape="1"/>','javascript:direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:{$PrefixSpecial}_OrderInfo type="field" no_special="$no_special" pos="1"/>","desc",null,<inp2:m_param name="ajax"/>);'<inp2:m_if check="{$PrefixSpecial}_IsOrder" no_special="$no_special" direction="desc" pos="1" >,['img/menu_dot.gif']</inp2:m_if>);
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addSeparator();
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.sort.def'), '<inp2:m_phrase name="la_Text_Default" html_escape="1" js_escape="1"/>','javascript:reset_sorting("<inp2:m_param name="PrefixSpecial"/>");');
+			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.sort.def'), '<inp2:m_phrase name="la_Text_Default" html_escape="1" js_escape="1"/>','javascript:reset_sorting("<inp2:m_param name="PrefixSpecial"/>", <inp2:m_param name="ajax"/>);');
 			<inp2:{$PrefixSpecial}_IterateGridFields grid="$grid" mode="header" force_block="nlsmenu_sort_block" no_special="$no_special" ajax="$ajax"/>
 		</inp2:m_if>
 
Index: branches/RC/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r11407 -r11412
--- branches/RC/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 11407)
+++ branches/RC/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 11412)
@@ -2388,6 +2388,20 @@
 
 		return $toolbar_buttons ? "'" . implode("', '", $toolbar_buttons) . "'" : 'false';
 	}
+
+	/**
+	 * Checks, that "To" part of at least one of range filters is used
+	 *
+	 * @param Array $params
+	 * @return bool
+	 */
+	function RangeFiltersUsed($params)
+	{
+		$search_helper =& $this->Application->recallObject('SearchHelper');
+		/* @var $search_helper kSearchHelper */
+
+		return $search_helper->rangeFiltersUsed($this->getPrefixSpecial(), $params['grid']);
+	}
 }
 
 ?>
\ No newline at end of file
Index: branches/RC/core/admin_templates/js/grid_scroller.js
===================================================================
diff -u -N -r11368 -r11412
--- branches/RC/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 11368)
+++ branches/RC/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 11412)
@@ -318,17 +318,13 @@
 
 	addLoadEvent(
 		function() {
-			the_grid.afterLoad();
+			the_grid.RefreshPos();
+			the_grid.AutoResize();
+			the_grid.SetResizeHandles();
 		}
 	);
 }
 
-GridScroller.prototype.afterLoad = function() {
-	this.RefreshPos();
-	this.AutoResize();
-	this.SetResizeHandles();
-}
-
 GridScroller.prototype.SetReferences = function() {
 	this.MainOuter = document.getElementById('outer_main_'+this.GridId );
 	this.MainInner = document.getElementById('inner_main_'+this.GridId)
@@ -562,18 +558,26 @@
 		points.push(tmp);
 	}
 	var scroller = this;
-	var resize_bar = addElement(document.body, 'div');
+
+	var resize_bar = document.getElementById(this.GridId + '[resize_bar]');
+	if (!resize_bar) {
+		resize_bar = addElement(document.body, 'div');
+		resize_bar.id = this.GridId + '[resize_bar]';
+	}
+
 	resize_bar.style.display = 'none';
 	resize_bar.style.width = '2px';
 	resize_bar.style.height = '200px';
 	resize_bar.style.backgroundColor = '#777';
 	resize_bar.style.zIndex = 40;
 	resize_bar.style.position = 'absolute';
-	resize_bar.id = 'resize_bar';
 
 	for (var i=1; i<points.length; i++) {
-		var handle = addElement(document.body, 'div');
-		handle.id = 'grid_resize_handle_'+i;
+		var handle = document.getElementById(this.GridId + '[grid_resize_handle_' + i + ']');
+		if (!handle) {
+			handle = addElement(document.body, 'div');
+			handle.id = this.GridId + '[grid_resize_handle_' + i + ']';
+		}
 		handle.style.width='6px';
 		handle.style.height=this.HeadTable.offsetHeight+'px';
 		handle.style.position='absolute';
@@ -584,9 +588,9 @@
 		handle.style.cursor = 'col-resize';
 		handle.col_num = i-1;
 
-		DragManager.MakeDragable('grid_resize_handle_'+i,
+		DragManager.MakeDragable(this.GridId + '[grid_resize_handle_' + i + ']',
 			function(a_handle) {
-				var resize_bar = document.getElementById('resize_bar');
+				var resize_bar = document.getElementById(scroller.GridId + '[resize_bar]');
 				var pos = findPos(a_handle);
 				resize_bar.style.left = (pos[0])+'px';
 				resize_bar.style.top = pos[1]+'px';
@@ -598,12 +602,12 @@
 			function(drag_object, coords) {
 				var offset = coords.x - DragManager.MouseOffset[0] - DragManager.InitialPos[0];
 				if (parseInt(DragManager.DragObject.min_col_width) + offset > 15)  {
-					var resize_bar = document.getElementById('resize_bar');
+					var resize_bar = document.getElementById(scroller.GridId + '[resize_bar]');
 					resize_bar.style.left = (coords.x - DragManager.MouseOffset[0] + 2) + 'px';
 				}
 			},
 			function(a_handle) {
-				var resize_bar = document.getElementById('resize_bar');
+				var resize_bar = document.getElementById(scroller.GridId + '[resize_bar]');
 				resize_bar.style.display = 'none';
 				coords = findPos(a_handle);
 				var offset = (coords[0] - DragManager.InitialPos[0]);
@@ -657,7 +661,7 @@
 		}
 		catch (e) {
 			// IE don't allow to set width for hidden element
-			alert(e);
+//			alert('IE exception:' + e);
 		}
 	}
 }
@@ -669,8 +673,8 @@
 		for (var row=0; row < this.HeadTable.rows.length; row++)
 		{
 			this.HeadTable.rows[row].cells[col - this.LeftCells].style.width = width+'px';
-			var a = document.getElementById('cursor_work_around_A_'+col+'_'+row);
-			var b = document.getElementById('cursor_work_around_B_'+col+'_'+row);
+			var a = document.getElementById(this.GridId + '[cursor_work_around_A_'+col+'_'+row+']');
+			var b = document.getElementById(this.GridId + '[cursor_work_around_B_'+col+'_'+row+']');
 			if (a) a.style.width = width+'px';
 			if (b) b.style.width = width+'px';
 		}
@@ -683,8 +687,8 @@
 		for (var row=0; row < this.LeftHeaderTable.rows.length; row++)
 		{
 			this.LeftHeaderTable.rows[row].cells[col].style.width = width+'px';
-			var a = document.getElementById('cursor_work_around_A_'+col+'_'+row);
-			var b = document.getElementById('cursor_work_around_B_'+col+'_'+row);
+			var a = document.getElementById(this.GridId + '[cursor_work_around_A_'+col+'_'+row+']');
+			var b = document.getElementById(this.GridId + '[cursor_work_around_B_'+col+'_'+row+']');
 			if (a) a.style.width = width+'px';
 			if (b) b.style.width = width+'px';
 		}
@@ -715,21 +719,21 @@
 {
 	for (var col=1; col<this.LeftHeaderTable.rows[0].cells.length; col++)
 	{
-		var handle = document.getElementById('grid_resize_handle_'+col);
+		var handle = document.getElementById(this.GridId + '[grid_resize_handle_' + col + ']');
 		if (!handle) return;
 		var pos = findPos(this.LeftHeaderTable.rows[0].cells[col]);
 		handle.style.left = (pos[0]-3)+'px';
 	}
 
 	if (this.HeadTable.rows[0].cells.length) {
 		var left_most_pos = findPos(this.HeadTable.rows[0].cells[0]);
-		var handle = document.getElementById('grid_resize_handle_'+(this.LeftCells));
+		var handle = document.getElementById(this.GridId + '[grid_resize_handle_' + (this.LeftCells) + ']');
 		if (handle) handle.style.left = (left_most_pos[0]-3)+'px';
 	}
 
 	for (var col=1; col<this.HeadTable.rows[0].cells.length; col++)
 	{
-		var handle = document.getElementById('grid_resize_handle_'+(col+this.LeftCells));
+		var handle = document.getElementById(this.GridId + '[grid_resize_handle_'+(col+this.LeftCells)+']');
 		if (!handle) continue;
 		var pos = findPos(this.HeadTable.rows[0].cells[col]);
 		var n_left = pos[0]-this.MainInner.scrollLeft-3
@@ -1098,7 +1102,7 @@
 
 			var cursor_workaround = ['',''];
 			if (id.match(/^(left_)?header/) && is.gecko) {
-				cursor_workaround = ['<div id="cursor_work_around_A_'+col+'_'+row+'" style="width: '+(this.MinWidths[col])+'px; overflow: auto;"><div id="cursor_work_around_B_'+col+'_'+row+'" style="width: '+(this.MinWidths[col])+'px; overflow: hidden;">', '</div></div>'];
+				cursor_workaround = ['<div id="' + this.GridId + '[cursor_work_around_A_'+col+'_'+row+']" style="width: '+(this.MinWidths[col])+'px; overflow: auto;"><div id="' + this.GridId + '[cursor_work_around_B_'+col+'_'+row+']" style="width: '+(this.MinWidths[col])+'px; overflow: hidden;">', '</div></div>'];
 			}
 			else {
 				if (this.LimitedHeights) {
Index: branches/RC/core/admin_templates/img/tabs/right.png
===================================================================
diff -u -N
Binary files differ