Index: branches/RC/core/units/general/cat_tag_processor.php
===================================================================
diff -u -r10870 -r10902
--- branches/RC/core/units/general/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 10870)
+++ branches/RC/core/units/general/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 10902)
@@ -151,6 +151,7 @@
 
 			$params['cat_prefix'] = trim('c.'.($tab_params['special'] ? $tab_params['special'] : $this->Special), '.');
 			$params['tab_mode'] = $tab_params['mode'];
+			$params['grid_name'] = ($tab_params['mode'] == 'multi') ? $params['default_grid'] : $params['radio_grid'];
 			$params['tab_dependant'] = $tab_params['dependant'];
 			$params['show_category'] = $tab_params['special'] == 'showall' ? 1 : 0; // this is advanced view -> show category name
 
Index: branches/RC/core/admin_templates/users/user_selector.tpl
===================================================================
diff -u -r10020 -r10902
--- branches/RC/core/admin_templates/users/user_selector.tpl	(.../user_selector.tpl)	(revision 10020)
+++ branches/RC/core/admin_templates/users/user_selector.tpl	(.../user_selector.tpl)	(revision 10902)
@@ -41,7 +41,6 @@
 <inp2:m_RenderElement name="grid" PrefixSpecial="u.group" IdField="PortalUserId" grid="UserSelector" menu_filters="yes"/>
 <script type="text/javascript">
 	Grids['u.group'].SetDependantToolbarButtons( new Array('select') );
-//	Grids['u.group'].EnableRadioMode();
 //	Grids['u'].DblClick = function() {return false};
 </script>
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/js/forms.js
===================================================================
diff -u -r10863 -r10902
--- branches/RC/core/admin_templates/js/forms.js	(.../forms.js)	(revision 10863)
+++ branches/RC/core/admin_templates/js/forms.js	(.../forms.js)	(revision 10902)
@@ -43,6 +43,9 @@
 				}
 			);
 		}
+		/*else {
+			console.log('error: focusing failed for [', prefix, '.', field, '] = ', element);
+		}*/
 
 		if (typeof(first_error[prefix]) == 'undefined' || first_error[prefix] == false) {
 			first_error[prefix] = [field, element];
Index: branches/RC/core/units/groups/groups_config.php
===================================================================
diff -u -r10517 -r10902
--- branches/RC/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 10517)
+++ branches/RC/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 10902)
@@ -108,6 +108,7 @@
 
 			'Radio'	=>	Array (
 				'Icons' => Array (1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'),
+				'Selector' => 'radio',
 				'Fields' => Array (
 						'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter'),
 						'Name' => Array ('title' => 'la_col_GroupName'),
Index: branches/RC/core/admin_templates/user_selector.tpl
===================================================================
diff -u -r8929 -r10902
--- branches/RC/core/admin_templates/user_selector.tpl	(.../user_selector.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/user_selector.tpl	(.../user_selector.tpl)	(revision 10902)
@@ -40,7 +40,6 @@
 <inp2:m_RenderElement name="grid" PrefixSpecial="u" IdField="PortalUserId" grid="UserSelector" menu_filters="yes"/>
 <script type="text/javascript">
 	Grids['u'].SetDependantToolbarButtons( new Array('select') );
-	Grids['u'].EnableRadioMode();
 //	Grids['u'].DblClick = function() {return false};
 </script>
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -r10863 -r10902
--- branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 10863)
+++ branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 10902)
@@ -1,9 +1,7 @@
 <inp2:adm_SetPopupSize width="880" height="680"/>
 <inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
-<inp2:m_include t="incs/header" nobody="yes"/>
+<inp2:m_include t="incs/header"/>
 
-<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF" onload="reflect_filename();">
-
 <inp2:m_RenderElement name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Categories!"/>
 
 <inp2:m_include t="in-portal/categories/categories_tabs"/>
@@ -93,6 +91,8 @@
     	var $checked = document.getElementById('_cb_<inp2:c_InputName field="AutomaticFilename"/>').checked;
     	document.getElementById('<inp2:c_InputName field="Filename"/>').readOnly = $checked;
     }
+
+    Application.setHook('m:OnAfterWindowLoad', reflect_filename);
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/kernel/admin_templates/categories/categories_edit_custom.tpl
===================================================================
diff -u -r8929 -r10902
--- branches/RC/kernel/admin_templates/categories/categories_edit_custom.tpl	(.../categories_edit_custom.tpl)	(revision 8929)
+++ branches/RC/kernel/admin_templates/categories/categories_edit_custom.tpl	(.../categories_edit_custom.tpl)	(revision 10902)
@@ -57,7 +57,18 @@
 </tbody>
 </table>
 
+<inp2:c_SaveWarning name="grid_save_warning"/>
+
 <inp2:m_include t="in-portal/incs/custom_blocks"/>
-<inp2:m_RenderElement name="grid" PrefixSpecial="cf" SourcePrefix="c" value_field="Value" per_page="-1" grid="SeparateTab" header_block="grid_column_title_no_sorting" no_init="no_init"/>
+<inp2:m_RenderElement
+	name="grid"
+	PrefixSpecial="cf"
+	SourcePrefix="c"
+	value_field="Value"
+	per_page="-1"
+	grid="SeparateTab"
+	header_block="grid_column_title_no_sorting"
+	no_init="no_init"
+	/>
 
 <inp2:m_include t="incs/footer"/>
Index: branches/RC/kernel/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -r10863 -r10902
--- branches/RC/kernel/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 10863)
+++ branches/RC/kernel/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 10902)
@@ -1,9 +1,7 @@
 <inp2:adm_SetPopupSize width="880" height="680"/>
 <inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
-<inp2:m_include t="incs/header" nobody="yes"/>
+<inp2:m_include t="incs/header"/>
 
-<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF" onload="reflect_filename();">
-
 <inp2:m_RenderElement name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Categories!"/>
 
 <inp2:m_include t="in-portal/categories/categories_tabs"/>
@@ -93,6 +91,8 @@
     	var $checked = document.getElementById('_cb_<inp2:c_InputName field="AutomaticFilename"/>').checked;
     	document.getElementById('<inp2:c_InputName field="Filename"/>').readOnly = $checked;
     }
+
+    Application.setHook('m:OnAfterWindowLoad', reflect_filename);
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/categories/categories_edit_custom.tpl
===================================================================
diff -u -r8929 -r10902
--- branches/RC/core/admin_templates/categories/categories_edit_custom.tpl	(.../categories_edit_custom.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/categories/categories_edit_custom.tpl	(.../categories_edit_custom.tpl)	(revision 10902)
@@ -57,7 +57,18 @@
 </tbody>
 </table>
 
+<inp2:c_SaveWarning name="grid_save_warning"/>
+
 <inp2:m_include t="in-portal/incs/custom_blocks"/>
-<inp2:m_RenderElement name="grid" PrefixSpecial="cf" SourcePrefix="c" value_field="Value" per_page="-1" grid="SeparateTab" header_block="grid_column_title_no_sorting" no_init="no_init"/>
+<inp2:m_RenderElement
+	name="grid"
+	PrefixSpecial="cf"
+	SourcePrefix="c"
+	value_field="Value"
+	per_page="-1"
+	grid="SeparateTab"
+	header_block="grid_column_title_no_sorting"
+	no_init="no_init"
+	/>
 
 <inp2:m_include t="incs/footer"/>
Index: branches/RC/core/admin_templates/categories/categories_edit_permissions.tpl
===================================================================
diff -u -r10863 -r10902
--- branches/RC/core/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 10863)
+++ branches/RC/core/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 10902)
@@ -171,8 +171,6 @@
 		}
 	}
 
-	Grids['g'].EnableRadioMode();
-
 	function update_light(perm_name, value)
 	{
 		document.getElementById('light_'+perm_name).src = 'img/perm_' + (value ? 'green' : 'red') + '.gif';
Index: branches/RC/kernel/admin_templates/categories/categories_edit_permissions.tpl
===================================================================
diff -u -r10863 -r10902
--- branches/RC/kernel/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 10863)
+++ branches/RC/kernel/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 10902)
@@ -171,8 +171,6 @@
 		}
 	}
 
-	Grids['g'].EnableRadioMode();
-
 	function update_light(perm_name, value)
 	{
 		document.getElementById('light_'+perm_name).src = 'img/perm_' + (value ? 'green' : 'red') + '.gif';
Index: branches/RC/core/units/users/users_config.php
===================================================================
diff -u -r10863 -r10902
--- branches/RC/core/units/users/users_config.php	(.../users_config.php)	(revision 10863)
+++ branches/RC/core/units/users/users_config.php	(.../users_config.php)	(revision 10902)
@@ -270,6 +270,7 @@
 
 						'UserSelector'	=>	Array(
 							'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'),
+							'Selector' => 'radio',
 							'Fields' => Array(
 								'Login'			=> Array('title' => 'la_col_Username', 'data_block' => 'grid_radio_td'),
 								'LastName'		=> Array( 'title'=>'la_col_LastName'),
Index: branches/RC/core/units/custom_fields/custom_fields_config.php
===================================================================
diff -u -r10856 -r10902
--- branches/RC/core/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 10856)
+++ branches/RC/core/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 10902)
@@ -98,17 +98,18 @@
 										'Default'		=>	Array(
 																	'Icons' => Array('default'=>'icon16_custom.gif'),
 																	'Fields' => Array(
-																			'CustomFieldId' => Array( 'title'=>'la_prompt_FieldId', 'data_block' => 'grid_checkbox_td' ),
+																			'CustomFieldId' => Array( 'title'=>'la_prompt_FieldId', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter' ),
 																			'FieldName' => Array( 'title'=>'la_prompt_FieldName'),
 																			'FieldLabel' => Array( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'cf_grid_data_td' ),
-																			'DisplayOrder' => Array('title' => 'la_prompt_DisplayOrder'),
+																			'DisplayOrder' => Array('title' => 'la_prompt_DisplayOrder', 'filter_block' => 'grid_range_filter' ),
 																		),
 															),
 
 										'SeparateTab'	=>	Array(
 																	'Icons' => Array('default'=>'icon16_custom.gif'),
+																	'Selector' => '',
 																	'Fields' => Array(
-																			'FieldName' => Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_icon_td'),
+																			'FieldName' => Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_checkbox_td'),
 																			'Prompt' => Array( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType'),
 																			'Value' => Array( 'title'=>'la_col_Value', 'data_block' => 'edit_custom_td'),
 																			'Error' => Array( 'title'=>'la_col_Error', 'data_block' => 'custom_error_td'),
@@ -117,6 +118,7 @@
 
 										'SeparateTabOriginal'	=>	Array(
 																			'Icons' => Array('default'=>'icon16_custom.gif'),
+																			'Selector' => '',
 																			'Fields' => Array(
 																					'FieldName'		=>	Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_icon_td'),
 																					'Prompt'		=>	Array( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType'),
Index: branches/RC/core/admin_templates/js/script.js
===================================================================
diff -u -r10719 -r10902
--- branches/RC/core/admin_templates/js/script.js	(.../script.js)	(revision 10719)
+++ branches/RC/core/admin_templates/js/script.js	(.../script.js)	(revision 10902)
@@ -1,6 +1,7 @@
 if ( !( isset($init_made) && $init_made ) ) {
 	var Application = new kApplication();
 	var Grids = new Array();
+	var GridScrollers = new Array ();
 	var Toolbars = new Array();
 	var $Menus = new Array();
 	var $ViewMenus = new Array();
Index: branches/RC/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r10832 -r10902
--- branches/RC/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 10832)
+++ branches/RC/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 10902)
@@ -382,14 +382,16 @@
 
 
 
-<inp2:m_DefineElement name="grid" main_prefix="" per_page="" main_special="" no_toolbar="" grid_filters="" search="on" header_block="grid_column_title" filter_block="grid_column_filter" data_block="grid_data_td" totals_block="grid_total_td" row_block="_row" ajax="0" totals="0">
+<inp2:m_DefineElement name="grid" main_prefix="" per_page="" main_special="" no_toolbar="" grid_filters="" search="on" header_block="grid_column_title" filter_block="grid_column_filter" data_block="grid_data_td" totals_block="grid_total_td" row_block="_row" ajax="0" totals="0" selector="checkbox">
 <!--
 	grid_filters - show individual filters for each column
 	has_filters  - draw filter section in "View" menu in toolbar
 -->
 
 	<inp2:InitList pass_params="1"/> <!-- this is to avoid recalling prefix as an item in first iterate grid, by col-picker for instance -->
 
+	<inp2:GridSelector grid="$grid" default="$selector" result_to_var="selector"/>
+
 	<inp2:{$PrefixSpecial}_SaveWarning name="grid_save_warning" main_prefix="$main_prefix" no_toolbar="$no_toolbar"/>
 	<inp2:m_if check="m_RecallEquals" var="{$PrefixSpecial}_search_keyword" value="" inverse="inverse">
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table_border_<inp2:m_if check="m_ParamEquals" name="no_toolbar" value="no_toolbar" >nobottom<inp2:m_else/>notop</inp2:m_if>">
@@ -467,12 +469,18 @@
 	<input type="hidden" id="<inp2:m_param name="PrefixSpecial"/>_Sort1_Dir" name="<inp2:m_param name="PrefixSpecial"/>_Sort1_Dir" value="asc">
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_js" view_menu="1" ajax="1">
-		<inp2:m_if check="m_ParamEquals" name="no_init" value="no_init" inverse="inverse">
+<inp2:m_DefineElement name="grid_js" view_menu="1" selector="checkbox" ajax="1">
+		<inp2:GridSelector grid="$grid" default="$selector" result_to_var="selector"/>
+
+		<inp2:m_if check="m_Param" name="selector">
 			Grids['<inp2:m_param name="PrefixSpecial"/>'] = new Grid('<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="selected_class"/>', ':original', edit, a_toolbar);
 			Grids['<inp2:m_param name="PrefixSpecial"/>'].AddItemsByIdMask('<inp2:m_param name="tag_name"/>', /^<inp2:m_param name="PrefixSpecial"/>_([\d\w-]+)/, '<inp2:m_param name="PrefixSpecial"/>[$$ID$$][<inp2:m_param name="IdField"/>]');
 	  		Grids['<inp2:m_param name="PrefixSpecial"/>'].InitItems();
 
+	  		<inp2:m_if check="m_Param" name="selector" equals_to="radio">
+		  		Grids['<inp2:m_param name="PrefixSpecial"/>'].EnableRadioMode();
+			</inp2:m_if>
+
 	  		<inp2:m_if check="{$PrefixSpecial}_UseAutoRefresh">
 	  			function refresh_grid() {
 	  				// window.location.reload();
Index: branches/RC/kernel/units/reviews/reviews_tag_processor.php
===================================================================
diff -u -r10455 -r10902
--- branches/RC/kernel/units/reviews/reviews_tag_processor.php	(.../reviews_tag_processor.php)	(revision 10455)
+++ branches/RC/kernel/units/reviews/reviews_tag_processor.php	(.../reviews_tag_processor.php)	(revision 10902)
@@ -111,6 +111,7 @@
 
 		$params['cat_prefix'] = trim('c.'.($tab_params['special'] ? $tab_params['special'] : $this->Special), '.');
 		$params['tab_mode'] = $tab_params['mode'];
+		$params['grid_name'] = ($tab_params['mode'] == 'multi') ? $params['default_grid'] : $params['radio_grid'];
 		$params['tab_dependant'] = $tab_params['dependant'];
 		$params['show_category'] = $tab_params['special'] == 'showall' ? 1 : 0; // this is advanced view -> show category name
 		$params['tab_name'] = $this->Application->GetVar('tab_name');
Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r10673 -r10902
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 10673)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 10902)
@@ -159,6 +159,10 @@
 	<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="$db"/>">
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_edit_error">
+	<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_edit_box" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="">
 	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
Index: branches/RC/core/units/reviews/reviews_tag_processor.php
===================================================================
diff -u -r10455 -r10902
--- branches/RC/core/units/reviews/reviews_tag_processor.php	(.../reviews_tag_processor.php)	(revision 10455)
+++ branches/RC/core/units/reviews/reviews_tag_processor.php	(.../reviews_tag_processor.php)	(revision 10902)
@@ -111,6 +111,7 @@
 
 		$params['cat_prefix'] = trim('c.'.($tab_params['special'] ? $tab_params['special'] : $this->Special), '.');
 		$params['tab_mode'] = $tab_params['mode'];
+		$params['grid_name'] = ($tab_params['mode'] == 'multi') ? $params['default_grid'] : $params['radio_grid'];
 		$params['tab_dependant'] = $tab_params['dependant'];
 		$params['show_category'] = $tab_params['special'] == 'showall' ? 1 : 0; // this is advanced view -> show category name
 		$params['tab_name'] = $this->Application->GetVar('tab_name');
Index: branches/RC/core/units/images/image_event_handler.php
===================================================================
diff -u -r10853 -r10902
--- branches/RC/core/units/images/image_event_handler.php	(.../image_event_handler.php)	(revision 10853)
+++ branches/RC/core/units/images/image_event_handler.php	(.../image_event_handler.php)	(revision 10902)
@@ -78,7 +78,7 @@
 	function ImageAction(&$event)
 	{
 		$id = $event->getEventParam('id');
-		$object =& $this->Application->recallObject($event->Prefix.'.-item', $event->Prefix);
+		$object =& $this->Application->recallObject($event->Prefix.'.-item', $event->Prefix, Array ('skip_autoload' => true));
 		if (in_array($event->Name, Array('OnBeforeDeleteFromLive','OnAfterClone')) ) {
 			$object->SwitchToLive();
 		}
Index: branches/RC/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r10870 -r10902
--- branches/RC/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 10870)
+++ branches/RC/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 10902)
@@ -1416,12 +1416,43 @@
 	 */
 	function UseItemIcons($params)
 	{
-		$object =& $this->getObject($params);
-
 		$grids = $this->Application->getUnitOption($this->Prefix, 'Grids');
 		return array_key_exists('Icons', $grids[ $params['grid'] ]);
 	}
 
+	/**
+	 * Returns corresponding to grid layout selector column width
+	 *
+	 * @param Array $params
+	 * @return int
+	 */
+	function GridSelectorColumnWidth($params)
+	{
+		$width = 0;
+		if ($params['selector']) {
+			$width += $params['selector_width'];
+		}
+
+		if ($this->UseItemIcons($params)) {
+			$width += $params['icon_width'];
+		}
+
+		return $width;
+	}
+
+	/**
+	 * Returns grids item selection mode (checkbox, radio, )
+	 *
+	 * @param Array $params
+	 * @return string
+	 */
+	function GridSelector($params)
+	{
+		$grids = $this->Application->getUnitOption($this->Prefix, 'Grids');
+
+		return array_key_exists('Selector', $grids[ $params['grid'] ]) ? $grids[ $params['grid'] ]['Selector'] : $params['default'];
+	}
+
 	function ItemIcon($params)
 	{
 		$object =& $this->getObject($params);
Index: branches/RC/kernel/units/images/image_event_handler.php
===================================================================
diff -u -r10853 -r10902
--- branches/RC/kernel/units/images/image_event_handler.php	(.../image_event_handler.php)	(revision 10853)
+++ branches/RC/kernel/units/images/image_event_handler.php	(.../image_event_handler.php)	(revision 10902)
@@ -78,7 +78,7 @@
 	function ImageAction(&$event)
 	{
 		$id = $event->getEventParam('id');
-		$object =& $this->Application->recallObject($event->Prefix.'.-item', $event->Prefix);
+		$object =& $this->Application->recallObject($event->Prefix.'.-item', $event->Prefix, Array ('skip_autoload' => true));
 		if (in_array($event->Name, Array('OnBeforeDeleteFromLive','OnAfterClone')) ) {
 			$object->SwitchToLive();
 		}