Index: branches/RC/core/admin_templates/users/user_edit_password.tpl
===================================================================
diff -u -r10031 -r11139
--- branches/RC/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 10031)
+++ branches/RC/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 11139)
@@ -1,6 +1,6 @@
 <inp2:adm_SetPopupSize width="564" height="377"/>
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="proj-base:users" perm_section="ADMIN" permission_type="" pagination="0" prefix="u" title_preset="admins_edit"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" perm_section="ADMIN" permission_type="" pagination="0" prefix="u" title_preset="admins_edit"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
Index: branches/RC/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -r10020 -r11139
--- branches/RC/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 10020)
+++ branches/RC/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 11139)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="550" height="400"/>
 <inp2:m_include t="incs/header"/>
 <inp2:m_if check="m_ConfigEquals" name="AdvancedUserManagement" value="1">
-	<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="admins_edit" tabs="proj-base/users/admins_edit_tabs"/>
+	<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="admins_edit" tabs="users/admins_edit_tabs"/>
 <inp2:m_else/>
 	<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="admins_edit"/>
 </inp2:m_if>
Index: branches/RC/core/admin_templates/users/admins_edit_groups.tpl
===================================================================
diff -u -r11134 -r11139
--- branches/RC/core/admin_templates/users/admins_edit_groups.tpl	(.../admins_edit_groups.tpl)	(revision 11134)
+++ branches/RC/core/admin_templates/users/admins_edit_groups.tpl	(.../admins_edit_groups.tpl)	(revision 11139)
@@ -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" tabs="proj-base/users/admins_edit_tabs"/>
+<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="admins_edit" tabs="users/admins_edit_tabs"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
Index: branches/RC/core/admin_templates/users/admins_list.tpl
===================================================================
diff -u -r10005 -r11139
--- branches/RC/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 10005)
+++ branches/RC/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 11139)
@@ -11,14 +11,14 @@
 	  			function edit()
 	  			{
 	  				set_hidden_field('remove_specials[u.admins]', 1);
-	  				std_edit_item('u.admins', 'proj-base/users/admins_edit');
+	  				std_edit_item('u.admins', 'users/admins_edit');
 	  			}
 
 	  			var a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('proj-base:new_user', '<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							set_hidden_field('remove_specials[u.admins]', 1);
-							std_precreate_item('u.admins', 'proj-base/users/admins_edit')
+							std_precreate_item('u.admins', 'users/admins_edit')
 						} ) );
 
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', edit) );
@@ -36,8 +36,8 @@
 							set_hidden_field('remove_specials[u.admins]', 1);
 							submit_event('u.admins', 'OnMassCloneUsers');
 						} ) );
-				
-				
+
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 				a_toolbar.AddButton( new ToolBarButton('refresh', '<inp2:m_phrase label="la_ToolTip_ResetSettings" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_ResetSettings" escape="1"/>',
@@ -47,7 +47,7 @@
 						} ) );
 
 				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');
 						}
Index: branches/RC/core/admin_templates/users/users_edit.tpl
===================================================================
diff -u -r10972 -r11139
--- branches/RC/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 10972)
+++ branches/RC/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 11139)
@@ -1,6 +1,6 @@
 <inp2:adm_SetPopupSize width="550" height="425"/>
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="proj-base:users" pagination="0" prefix="u" title_preset="admins_edit"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" pagination="0" prefix="u" title_preset="admins_edit"/>
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
Index: branches/RC/core/admin_templates/users/users_list.tpl
===================================================================
diff -u -r8929 -r11139
--- branches/RC/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 11139)
@@ -1,5 +1,5 @@
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="proj-base:users" pagination="1" prefix="u" title_preset=""/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" grid="RegularUsers" pagination="1" prefix="u"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -11,14 +11,14 @@
 	  			function edit()
 	  			{
 	  				set_hidden_field('remove_specials[u.regular]', 1);
-	  				std_edit_item('u.regular', 'proj-base/users/users_edit');
+	  				std_edit_item('u.regular', 'users/users_edit');
 	  			}
 
 	  			var a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('proj-base:new_user', '<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('proj-base:new_user', '<inp2:m_phrase label="la_ToolTip_NewUser" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							set_hidden_field('remove_specials[u.regular]', 1);
-							std_precreate_item('u.regular', 'proj-base/users/users_edit')
+							std_precreate_item('u.regular', 'users/users_edit')
 						} ) );
 
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', edit) );
@@ -28,10 +28,51 @@
 							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 ToolBarSeparator('sep1') );
 
 
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							set_hidden_field('remove_specials[u.regular]', 1);
+							submit_event('u.regular', 'OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							set_hidden_field('remove_specials[u.regular]', 1);
+							submit_event('u.regular', 'OnMassDecline');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				<inp2:m_if check="m_Recall" name="user_id" equals_to="-1">
+					a_toolbar.AddButton( new ToolBarButton('in-portal:e-mail', '<inp2:m_phrase label="la_ToolTip_SendMail" escape="1"/>', function() {
+								set_hidden_field('remove_specials[u.regular]', 1);
+								openSelector('emailmessages', '<inp2:m_Link template="emails/mass_mail"/>', 'UserEmail', null, 'OnPrepareMassRecipients');
+							}
+					 ) );
+				</inp2:m_if>
+
+				a_toolbar.AddButton( new ToolBarButton('export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
+							set_hidden_field('remove_specials[u.regular]', 1);
+							std_csv_export('u.regular', 'RegularUsers', 'export/export_progress');
+						}
+				) );
+
+				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');
 						}
Index: branches/RC/core/admin_templates/users/admins_edit_tabs.tpl
===================================================================
diff -u -r10020 -r11139
--- branches/RC/core/admin_templates/users/admins_edit_tabs.tpl	(.../admins_edit_tabs.tpl)	(revision 10020)
+++ branches/RC/core/admin_templates/users/admins_edit_tabs.tpl	(.../admins_edit_tabs.tpl)	(revision 11139)
@@ -3,8 +3,8 @@
 	<td align="right" width="100%">
 	  	<table cellpadding="0" cellspacing="0" border="0" height="23">
 			<tr>
-				<inp2:m_ParseBlock name="tab" title="la_tab_General" t="proj-base/users/admins_edit" main_prefix="u"/>
-				<inp2:m_ParseBlock name="tab" title="la_tab_Groups" t="proj-base/users/admins_edit_groups" main_prefix="u"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_General" t="users/admins_edit" main_prefix="u"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_Groups" t="users/admins_edit_groups" main_prefix="u"/>
 			</tr>
 		</table>
 	</td>