Index: branches/RC/core/admin_templates/users/users_edit_groups.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/users/users_edit_groups.tpl	(revision 0)
+++ branches/RC/core/admin_templates/users/users_edit_groups.tpl	(revision 11141)
@@ -0,0 +1,105 @@
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
+	<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_edit_groups" tab_preset="Default"/>
+<inp2:m_else/>
+	<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_edit_groups" tab_preset="RegularUsers"/>
+</inp2:m_if>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				//do not rename - this function is used in default grid for double click!
+	  			function edit()
+	  			{
+	  				std_edit_temp_item('u-ug', 'users/user_edit_group');
+	  			}
+
+	  			a_toolbar = new ToolBar();
+
+	  			a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('u','<inp2:u_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							cancel_edit('u','OnCancelEdit','<inp2:u_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('u', '<inp2:u_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('u', '<inp2:u_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('in-portal:usertogroup', '<inp2:m_phrase label="la_ToolTip_AddToGroup" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							openSelector('u-ug', '<inp2:m_Link t="users/group_selector" pass="m,u"/>', 'GroupId', '800x600');
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('u-ug');
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('in-portal:primary_group', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>',
+						function() {
+							submit_event('u-ug','OnSetPrimary');
+						} ) );
+
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="u_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="u_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="u_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="grid_membership_td" td_style="">
+	<inp2:m_if check="Field" name="$field" db="db">
+		<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>
+	<inp2:m_else/>
+		<inp2:m_phrase name="la_NeverExpires"/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="u-ug" IdField="GroupId" grid="Default" limited_heights="1"/>
+<script type="text/javascript">
+	Grids['u-ug'].SetDependantToolbarButtons( new Array('delete', 'primary_group') );
+</script>
+
+<input type="hidden" name="u_mode" value="t<inp2:m_Get var="m_wid" />" />
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/users/admin_edit_group.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/users/admin_edit_group.tpl	(revision 0)
+++ branches/RC/core/admin_templates/users/admin_edit_group.tpl	(revision 11141)
@@ -0,0 +1,37 @@
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_RenderElement name="combined_header" section="proj-base:admins" prefix="u" title_preset="user_edit_group"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('u-ug', '<inp2:u-ug_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('u-ug', 'OnCancel');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:u_SaveWarning name="grid_save_warning"/>
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+	<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+		<inp2:m_RenderElement name="inp_label" prefix="u-ug" field="GroupName" title="la_fld_GroupName"/>
+		<inp2:m_RenderElement name="inp_label" prefix="u-ug" field="PrimaryGroup" title="la_prompt_PrimaryGroup"/> <!-- OLD PHRASE, la_fld_PrimaryGroup -->
+		<inp2:m_RenderElement name="inp_edit_date_time" prefix="u-ug" field="MembershipExpires" title="la_prompt_MembershipExpires"/> <!-- OLD PHRASE, la_fld_MembershipExpires -->
+
+</table>
+
+<inp2:m_include t="incs/footer"/>
Index: branches/RC/core/units/users/users_config.php
===================================================================
diff -u -r11118 -r11141
--- branches/RC/core/units/users/users_config.php	(.../users_config.php)	(revision 11118)
+++ branches/RC/core/units/users/users_config.php	(.../users_config.php)	(revision 11141)
@@ -105,26 +105,30 @@
 																			'icon'		=>	'icon16_user_pending.gif',
 																			'label'		=>	'la_Text_Users',
 																			'js_url' 	=>	'#url#',
-																			'url'		=>	Array('t' => 'in-portal/users/users_list', 'pass' => 'm,u', 'u_event' => 'OnSetFilterPattern', 'u_filters' => 'show_active=0,show_pending=1,show_disabled=0'),
+																			'url'		=>	Array('t' => 'users/users_list', 'pass' => 'm,u', 'u_event' => 'OnSetFilterPattern', 'u_filters' => 'show_active=0,show_pending=1,show_disabled=0'),
 																			'status'	=>	STATUS_PENDING,
 																	),
 											),
 
-					'TitlePresets'		=>	Array(
-						'default'	=>	Array(
-							'new_status_labels'		=> Array('u'=>'!la_title_Adding_User!'),
-							'edit_status_labels'	=> Array('u'=>'!la_title_Editing_User!'),
-							'new_titlefield'		=> Array('u'=>''),
+					'TitlePresets' => Array (
+						'default' => Array (
+							'new_status_labels' => Array ('u' => '!la_title_Adding_User!'),
+							'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#)"),
+						'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#)"),
+						'user_edit_items' => Array ('prefixes' => Array ('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Items!"),
+						'user_edit_custom' => Array ('prefixes' => Array ('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Custom!"),
 
-						'users_edit' => Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_General!"),
-						'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#)"),
-						'user_edit_items' => Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Items!"),
-						'user_edit_custom' => Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Custom!"),
 
+						'admins_list' => Array ('prefixes' => Array ('u.admins_List'), 'format' => "!la_title_Administrators! (#u.admins_recordcount#)"),
+						'admins_edit' => Array ('prefixes' => Array ('u'), 'format' => "#u_status# #u_titlefield#"),
+						'regular_users_list' => Array ('prefixes' => Array ('u.regular_List'), 'format' => "!la_title_Users! (#u.regular_recordcount#)"),
+						'root_edit' => Array ('prefixes' => Array ('u'), 'format' => "!la_title_Editing_User! 'root'"),
+
 						'user_edit_group' => Array (
 							'prefixes' => Array ('u', 'u-ug'),
 							'edit_status_labels' => Array ('u-ug' => '!la_title_EditingMembership!'),
@@ -139,18 +143,28 @@
 							'format' => "#u_status# '#u_titlefield#' - #u-img_status# '#u-img_titlefield#'",
 						),
 
-						'users_select'		=>	Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#) - !la_title_SelectUser!"),
+						'users_select'		=>	Array ('prefixes' => Array ('u_List'), 'format' => "!la_title_Users! (#u_recordcount#) - !la_title_SelectUser!"),
 						'tree_users'		=>	Array('format' => '!la_section_overview!'),
 					),
 
 					'EditTabPresets' => Array (
    						'Default' => Array (
-   							Array ('title' => 'la_tab_General', 't' => 'in-portal/users/users_edit', 'priority' => 1),
-   							Array ('title' => 'la_tab_Groups', 't' => 'in-portal/users/users_edit_groups', 'priority' => 2),
-   							Array ('title' => 'la_tab_Images', 't' => 'in-portal/users/user_edit_images', 'priority' => 3),
-   							Array ('title' => 'la_tab_Items', 't' => 'in-portal/users/user_edit_items', 'priority' => 4),
-   							Array ('title' => 'la_tab_Custom', 't' => 'in-portal/users/users_edit_custom', 'priority' => 5),
+   							'general' => Array ('title' => 'la_tab_General', 't' => 'users/users_edit', 'priority' => 1),
+   							'groups' => Array ('title' => 'la_tab_Groups', 't' => 'users/users_edit_groups', 'priority' => 2),
+   							'images' => Array ('title' => 'la_tab_Images', 't' => 'users/user_edit_images', 'priority' => 3),
+   							'items' => Array ('title' => 'la_tab_Items', 't' => 'users/user_edit_items', 'priority' => 4),
+   							'custom' => Array ('title' => 'la_tab_Custom', 't' => 'users/users_edit_custom', 'priority' => 5),
    						),
+
+   						'RegularUsers' => Array (
+   							'general' => Array ('title' => 'la_tab_General', 't' => 'users/users_edit', 'priority' => 1),
+   							'groups' => Array ('title' => 'la_tab_Groups', 't' => 'users/users_edit_groups', 'priority' => 2),
+   						),
+
+   						'Admins' => Array (
+   							'general' => Array ('title' => 'la_tab_General', 't' => 'users/admins_edit', 'priority' => 1),
+   							'groups' => Array ('title' => 'la_tab_Groups', 't' => 'users/admins_edit_groups', 'priority' => 2),
+   						),
    					),
 
 					'PermSection'		=>	Array('main' => 'in-portal:user_list', 'email' => 'in-portal:user_email', 'custom' => 'in-portal:user_custom'),
@@ -204,7 +218,7 @@
 							        'FirstName' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
 							        'LastName' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
 							        'Company' => Array('type' => 'string','not_null' => '1','default' => ''),
-							        'Email' => Array('type' => 'string', 'formatter'=>'kFormatter', 'regexp'=>'/^[_a-zA-Z0-9-\.]+@[a-zA-Z0-9-\.]+\.[a-z]{2,4}$/', 'sample_value' => 'email@domain.com', 'unique'=>Array('Email'), 'not_null' => '1', 'required'=>1, 'default' => '', 'error_msgs' => Array('invalid_format'=>'!la_invalid_email!', 'unique'=>'!lu_email_already_exist!') ),
+							        'Email' => Array('type' => 'string', 'formatter'=>'kFormatter', 'regexp'=>'/^[_a-zA-Z0-9-\.]+@[a-zA-Z0-9-\.]+\.[a-z]{2,4}$/', 'sample_value' => 'email@domain.com', 'unique'=>Array('Email'), 'not_null' => '1', /*'required'=>1, */'default' => '', 'error_msgs' => Array('invalid_format'=>'!la_invalid_email!', 'unique'=>'!lu_email_already_exist!') ),
 							        'CreatedOn' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 							        'Phone' => Array('type' => 'string','default' => null),
 							        'Fax' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
@@ -256,6 +270,7 @@
 					),
 
 					'Grids'	=> Array(
+						// not in use
 						'Default'	=>	Array(
 							'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'),
 							'Fields' => Array(
@@ -268,6 +283,7 @@
 								),
 						),
 
+						// used
 						'UserSelector'	=>	Array(
 							'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'),
 							'Selector' => 'radio',
@@ -280,6 +296,31 @@
 								'CreatedOn_formatted'	=>	Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'),
 							),
 						),
+
+						// used
+						'Admins' => Array (
+							'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'),
+							'Fields' => Array (
+								'PortalUserId'	=> Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60),
+								'Login'			=> Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width'=>100),
+								'FirstName'		=> Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width'=>100),
+								'LastName'		=> Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width'=>150),
+								'Email'			=> Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width'=>140),
+							),
+						),
+
+						// used
+						'RegularUsers' => Array (
+							'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'),
+							'Fields' => Array(
+								'PortalUserId'	=> Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60),
+								'Login'			=> Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width'=>100),
+								'FirstName'		=> Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width'=>100),
+								'LastName'		=> Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width'=>150),
+								'Email'			=> Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width'=>140),
+								'Status'		=> Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width'=>100),
+							),
+						),
 					),
 	);
 
Index: branches/RC/core/units/sections/sections_config.php
===================================================================
diff -u -r11131 -r11141
--- branches/RC/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 11131)
+++ branches/RC/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 11141)
@@ -116,7 +116,7 @@
 				'parent'		=>	'in-portal:users',
 				'icon'			=>	'in-portal:users',
 				'label'			=>	'la_tab_User_List',
-				'url'			=>	Array ('t' => 'in-portal/users/users_list', 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'users/users_list', 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /*'advanced:add_favorite', 'advanced:remove_favorite',*/),
 				'priority'		=>	1,
 				'type'			=>	stTREE,
Index: branches/RC/core/admin_templates/users/image_edit.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/users/image_edit.tpl	(revision 0)
+++ branches/RC/core/admin_templates/users/image_edit.tpl	(revision 11141)
@@ -0,0 +1,55 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_image_edit"/>
+
+<inp2:m_include t="incs/image_blocks"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('u-img','<inp2:u-img_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('u-img','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+	<inp2:m_RenderElement name="subsection" title="!la_section_Image!"/>
+		<inp2:m_RenderElement name="inp_edit_hidden" prefix="u-img" field="ResourceId"/>
+		<inp2:m_RenderElement name="inp_label" prefix="u-img" field="ImageId" title="!la_fld_ImageId!"/>
+
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="Name" title="!la_fld_Name!" size="40"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="AltName" title="!la_fld_AltValue!" size="40"/>
+
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u-img" field="Priority" title="!la_fld_Priority!" size="5"/>
+
+	<inp2:m_RenderElement name="subsection" title="!la_section_ThumbnailImage!"/>
+		<inp2:m_RenderElement name="thumbnail_section" prefix="u-img"/>
+
+	<inp2:m_RenderElement name="subsection" title="!la_section_FullSizeImage!"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="u-img" field="SameImages" title="!la_fld_SameAsThumb!" onchange="toggle_fullsize()"/>
+		<inp2:m_RenderElement name="fullsize_section" prefix="u-img"/>
+
+</table>
+
+<script type="text/javascript">
+	<inp2:m_RenderElement name="images_edit_js" prefix="u-img"/>
+	toggle_fullsize();
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/users/admins_edit_groups.tpl
===================================================================
diff -u -r11140 -r11141
--- branches/RC/core/admin_templates/users/admins_edit_groups.tpl	(.../admins_edit_groups.tpl)	(revision 11140)
+++ branches/RC/core/admin_templates/users/admins_edit_groups.tpl	(.../admins_edit_groups.tpl)	(revision 11141)
@@ -1,6 +1,6 @@
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="admins_edit" tab_preset="Admins"/>
+<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="user_edit_groups" tab_preset="Admins"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -11,7 +11,7 @@
 				//do not rename - this function is used in default grid for double click!
 	  			function edit()
 	  			{
-
+	  				std_edit_temp_item('u-ug', 'users/admin_edit_group');
 	  			}
 
 	  			a_toolbar = new ToolBar();
@@ -43,6 +43,7 @@
 							openSelector('u-ug', '<inp2:m_Link t="users/group_selector" pass="m,u"/>', 'GroupId', '800x600');
 						} ) );
 
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('u-ug');
@@ -66,7 +67,7 @@
 				<inp2:m_if check="u_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
+					a_toolbar.HideButton('sep2');
 				<inp2:m_else/>
 					<inp2:m_if check="u_IsLast" >
 						a_toolbar.DisableButton('next');
@@ -90,7 +91,7 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_ParseBlock name="grid" PrefixSpecial="u-ug" IdField="GroupId" grid="Default" limited_heights="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="u-ug" IdField="GroupId" grid="Default" limited_heights="1"/>
 <script type="text/javascript">
 	Grids['u-ug'].SetDependantToolbarButtons( new Array('delete', 'primary_group') );
 </script>
Index: branches/RC/kernel/units/sections/sections_config.php
===================================================================
diff -u -r11132 -r11141
--- branches/RC/kernel/units/sections/sections_config.php	(.../sections_config.php)	(revision 11132)
+++ branches/RC/kernel/units/sections/sections_config.php	(.../sections_config.php)	(revision 11141)
@@ -116,7 +116,7 @@
 				'parent'		=>	'in-portal:users',
 				'icon'			=>	'in-portal:users',
 				'label'			=>	'la_tab_User_List',
-				'url'			=>	Array ('t' => 'in-portal/users/users_list', 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'users/users_list', 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /*'advanced:add_favorite', 'advanced:remove_favorite',*/),
 				'priority'		=>	1,
 				'type'			=>	stTREE,
Index: branches/RC/core/admin_templates/summary/root.tpl
===================================================================
diff -u -r11118 -r11141
--- branches/RC/core/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 11118)
+++ branches/RC/core/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 11141)
@@ -130,7 +130,7 @@
 
 					<tr>
 						<td>
-							<a class="userslink" href="<inp2:m_Link template='in-portal/users/users_list'/>">
+							<a class="userslink" href="<inp2:m_Link template='users/users_list'/>">
 								<img hSpace="3" src="<inp2:adm_ModulePath module="In-portal"/>img/icons/icon24_users.gif" border="0" align="absMiddle">
 								<inp2:m_phrase name="la_Text_Users"/>
 							</a>
Index: branches/RC/core/admin_templates/users/users_list.tpl
===================================================================
diff -u -r11139 -r11141
--- branches/RC/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 11139)
+++ branches/RC/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 11141)
@@ -28,17 +28,15 @@
 							std_delete_items('u.regular')
 						} ) );
 
-				<inp2:m_if check="m_IsDebugMode">
-					a_toolbar.AddButton (
-						new ToolBarButton(
-							'in-portal:primary_user_group',
-							'<inp2:m_phrase label="la_ToolTip_PrimaryGroup" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_SetPrimary" escape="1"/>',
-							function() {
-								openSelector('u.regular', '<inp2:m_Link t="users/group_selector" pass="m,u"/>', 'PrimaryGroupId', '800x600', 'OnSaveSelected');
-							}
-						)
-					);
-				</inp2:m_if>
+				/*a_toolbar.AddButton (
+					new ToolBarButton(
+						'in-portal:primary_user_group',
+						'<inp2:m_phrase label="la_ToolTip_PrimaryGroup" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_SetPrimary" escape="1"/>',
+						function() {
+							openSelector('u.regular', '<inp2:m_Link t="users/group_selector" pass="m,u"/>', 'PrimaryGroupId', '800x600', 'OnSaveSelected');
+						}
+					)
+				);*/
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
Index: branches/RC/kernel/admin_templates/summary/root.tpl
===================================================================
diff -u -r11118 -r11141
--- branches/RC/kernel/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 11118)
+++ branches/RC/kernel/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 11141)
@@ -130,7 +130,7 @@
 
 					<tr>
 						<td>
-							<a class="userslink" href="<inp2:m_Link template='in-portal/users/users_list'/>">
+							<a class="userslink" href="<inp2:m_Link template='users/users_list'/>">
 								<img hSpace="3" src="<inp2:adm_ModulePath module="In-portal"/>img/icons/icon24_users.gif" border="0" align="absMiddle">
 								<inp2:m_phrase name="la_Text_Users"/>
 							</a>
Index: branches/RC/core/admin_templates/users/user_edit_group.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/users/user_edit_group.tpl	(revision 0)
+++ branches/RC/core/admin_templates/users/user_edit_group.tpl	(revision 11141)
@@ -0,0 +1,42 @@
+<inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
+
+<inp2:m_include t="incs/header" nobody="yes"/>
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+
+<inp2:m_RenderElement name="section_header" prefix="u" icon="icon46_users" module="in-portal" title="la_title_Users"/>
+
+<inp2:m_RenderElement name="blue_bar" prefix="u" title_preset="user_edit_group" module="in-portal" icon="icon46_users"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('u-ug', '<inp2:u-ug_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('u-ug', 'OnCancel');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:u_SaveWarning name="grid_save_warning"/>
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+	<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+		<inp2:m_RenderElement name="inp_label" prefix="u-ug" field="GroupName" title="la_fld_GroupName"/>
+		<inp2:m_RenderElement name="inp_label" prefix="u-ug" field="PrimaryGroup" title="la_prompt_PrimaryGroup"/> <!-- OLD PHRASE, la_fld_PrimaryGroup -->
+		<inp2:m_RenderElement name="inp_edit_date_time" prefix="u-ug" field="MembershipExpires" title="la_prompt_MembershipExpires"/> <!-- OLD PHRASE, la_fld_MembershipExpires -->
+
+</table>
+
+<inp2:m_include t="incs/footer"/>
Index: branches/RC/core/admin_templates/users/users_edit_custom.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/users/users_edit_custom.tpl	(revision 0)
+++ branches/RC/core/admin_templates/users/users_edit_custom.tpl	(revision 11141)
@@ -0,0 +1,62 @@
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_edit_custom" tab_preset="Default"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('u','<inp2:u_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('u','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('u', '<inp2:u_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('u', '<inp2:u_NextId/>');
+						}
+				 ) );
+
+				function edit(){ }
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="u_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="u_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="u_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_include t="incs/custom_blocks"/>
+<inp2:m_if check="u_DisplayOriginal" display_original="1">
+	<inp2:m_RenderElement name="grid" PrefixSpecial="cf" IdField="CustomFieldId" SourcePrefix="u" value_field="Value" per_page="-1" grid="SeparateTabOriginal" header_block="grid_column_title_no_sorting" no_init="no_init" original_title="la_section_OriginalValues" display_original="1"/>
+<inp2:m_else/>
+	<inp2:m_RenderElement name="grid" PrefixSpecial="cf" IdField="CustomFieldId" SourcePrefix="u" value_field="Value" per_page="-1" grid="SeparateTab" header_block="grid_column_title_no_sorting" no_init="no_init"/>
+</inp2:m_if>
+
+
+<inp2:m_include t="incs/footer"/>
Index: branches/RC/core/admin_templates/users/user_edit_items.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/users/user_edit_items.tpl	(revision 0)
+++ branches/RC/core/admin_templates/users/user_edit_items.tpl	(revision 11141)
@@ -0,0 +1,167 @@
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_edit_items" tab_preset="Default"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<link rel="stylesheet" rev="stylesheet" href="incs/nlsmenu.css" type="text/css" />
+			<script type="text/javascript" src="js/nlsmenu.js"></script>
+			<script type="text/javascript" src="js/nlsmenueffect_1_2_1.js"></script>
+
+	  		<script type="text/javascript" src="js/ajax.js"></script>
+	  		<script type="text/javascript" src="js/catalog.js"></script>
+	  		<script type="text/javascript">
+  				var menuMgr = new NlsMenuManager("mgr");
+					menuMgr.timeout = 500;
+					menuMgr.flowOverFormElement = true;
+
+  				Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
+
+  				Catalog.prototype.AfterInit = function () {
+					this.switchTab(); // refresh current item tab
+				}
+
+  				/*Catalog.prototype.refreshTab = function($prefix, $div_id, $force) {
+					// query tab content only in case if not queried or category don't match
+
+					var $cat_id = get_hidden_field('m_cat_id');
+					var $tab_cat_id = document.getElementById($div_id).getAttribute('category_id');
+					if ($cat_id != $tab_cat_id || $force) {
+						var $url = this.URLMask.replace('#TEMPLATE_NAME#', this.queryTabRegistry('prefix', $prefix, 'module_path') + '/user_item_tab');
+
+						this.BusyRequest[$prefix] = false;
+
+						Request.makeRequest($url, this.BusyRequest[$prefix], $div_id, this.successCallback, this.errorCallback, $div_id, this);
+					}
+				}*/
+
+	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" pass_through="ts" ts="user" pass="m,u" no_amp="1"/>', 'useritems_', 0);
+
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('u','<inp2:u_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('u','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('u', '<inp2:u_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('u', '<inp2:u_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+					function() {
+						var $template = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'view_template');
+						$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
+						set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + '.user]', 1);
+						std_delete_items($Catalog.ActivePrefix, $template, 1);
+					} ) );
+
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				function edit() {
+					$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
+					var $kf = document.getElementById($form_name);
+					var $prev_action = $kf.action;
+					$kf.action = '<inp2:m_t pass="all" no_pass_through="1"/>';
+
+					set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + ']', 1);
+					std_edit_item($Catalog.ActivePrefix, $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'edit_template'));
+
+					$kf.action = $prev_action;
+				}
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="u_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="u_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="u_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+<inp2:m_RenderElement name="kernel_form_end"/>
+
+<inp2:u_SaveWarning name="grid_save_warning"/>
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+	<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
+	<inp2:m_RenderElement name="subsection" title="la_section_Items"/>
+</table>
+<br />
+
+<!-- item tabs: begin -->
+<table cellpadding="0" cellspacing="0">
+	<tr>
+		<inp2:m_DefineElement name="item_tab" title="">
+			<td nowrap="nowrap" width="140">
+				<table id="<inp2:m_param name="prefix"/>.user_tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('<inp2:m_param name="prefix"/>.user');">
+					<tr>
+						<td class="catalog-tab-left">
+							<img src="img/spacer.gif" height="22" width="9" />
+						</td>
+						<td class="catalog-tab-middle" width="100%" valign="middle" nowrap="nowrap">
+							<inp2:m_Phrase name="$title"/> <span class="cats_stats">(<span id="<inp2:m_param name="prefix"/>.user_item_count">?</span>)</span>
+						</td>
+		       			<td class="catalog-tab-right">
+		     				<img src="img/spacer.gif" height="22" width="9" />
+						</td>
+						<td style="background-color: #FFFFFF;">
+							<img src="img/spacer.gif" height="1" width="5" />
+						</td>
+					</tr>
+				</table>
+
+			</td>
+		</inp2:m_DefineElement>
+
+		<inp2:m_ModuleInclude template="user_item_tab" tab_init="2" title_property="ViewMenuPhrase" skip_prefixes="m,adm,cms"/>
+	</tr>
+</table>
+<!-- item tabs: end -->
+
+<inp2:m_set ts="user"/>
+<inp2:m_ModuleInclude template="user_item_tab" tab_init="1" skip_prefixes="m,adm,cms"/>
+<script type="text/javascript">
+
+addLoadEvent(
+	function() {
+		$Catalog.Init();
+	}
+);
+
+</script>
+<inp2:m_include t="incs/footer" noform="yes"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/users/user_edit_images.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/users/user_edit_images.tpl	(revision 0)
+++ branches/RC/core/admin_templates/users/user_edit_images.tpl	(revision 11141)
@@ -0,0 +1,103 @@
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_edit_images" tab_preset="Default"/>
+
+<inp2:m_include t="incs/image_blocks"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+
+  				function edit()
+	  			{
+	  				std_edit_temp_item('u-img', 'users/image_edit');
+	  			}
+
+  				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('u','<inp2:u_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('u','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('u', '<inp2:u_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('u', '<inp2:u_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+
+				a_toolbar.AddButton( new ToolBarButton('new_image', '<inp2:m_phrase label="la_ToolTip_New_Images" escape="1"/>',
+						function() {
+							std_new_item('u-img', 'users/image_edit')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('u-img')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
+							submit_event('u-img','OnMassMoveUp');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
+							submit_event('u-img','OnMassMoveDown');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('primary_image', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
+							submit_event('u-img','OnSetPrimary');
+						}
+				 ) );
+
+				  a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="u_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="u_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="u_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="u-img" IdField="ImageId" grid="Default" menu_filters="yes"/>
+<script type="text/javascript">
+	Grids['u-img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','primary_image') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file