Index: trunk/kernel/admin_templates/img/arrow.gif
===================================================================
diff -u -r1566 -r6669
Binary files differ
Index: trunk/kernel/admin_templates/categories/categories_tabs.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/kernel/admin_templates/categories/categories_tabs.tpl	(.../categories_tabs.tpl)	(revision 6093)
+++ trunk/kernel/admin_templates/categories/categories_tabs.tpl	(.../categories_tabs.tpl)	(revision 6669)
@@ -17,14 +17,14 @@
   	<table cellpadding="0" cellspacing="0" border="0" height="23">
 		<tr>
 			<inp2:m_if check="c_IsRootCategory">
-				<inp2:m_ParseBlock name="tab" title="la_tab_Permissions" t="categories/categories_edit_permissions" main_prefix="c"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_Permissions" t="in-portal/categories/categories_edit_permissions" main_prefix="c"/>
 			<inp2:m_else/>
-				<inp2:m_ParseBlock name="tab" title="la_tab_General" t="categories/categories_edit" main_prefix="c"/>
-				<inp2:m_ParseBlock name="tab" title="la_tab_Properties" t="categories/categories_edit_properties" main_prefix="c"/>
-				<inp2:m_ParseBlock name="tab" title="la_tab_Relations" t="categories/categories_edit_relations" main_prefix="c"/>
-				<inp2:m_ParseBlock name="tab" title="la_tab_Images" t="categories/categories_edit_images" main_prefix="c"/>
-				<inp2:m_ParseBlock name="tab" title="la_tab_Permissions" t="categories/categories_edit_permissions" main_prefix="c"/>
-				<inp2:m_ParseBlock name="tab" title="la_tab_Custom" t="categories/categories_edit_custom" main_prefix="c"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_General" t="in-portal/categories/categories_edit" main_prefix="c"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_Properties" t="in-portal/categories/categories_edit_properties" main_prefix="c"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_Relations" t="in-portal/categories/categories_edit_relations" main_prefix="c"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_Images" t="in-portal/categories/categories_edit_images" main_prefix="c"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_Permissions" t="in-portal/categories/categories_edit_permissions" main_prefix="c"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_Custom" t="in-portal/categories/categories_edit_custom" main_prefix="c"/>
 			</inp2:m_if>
 		</tr>
 		</table>
Index: trunk/kernel/admin_templates/xml/cache_updater.tpl
===================================================================
diff -u -r5164 -r6669
--- trunk/kernel/admin_templates/xml/cache_updater.tpl	(.../cache_updater.tpl)	(revision 5164)
+++ trunk/kernel/admin_templates/xml/cache_updater.tpl	(.../cache_updater.tpl)	(revision 6669)
@@ -1 +1 @@
-<inp2:c_InitCacheUpdater destination_template="catalog" progress="1"/>
\ No newline at end of file
+<inp2:c_InitCacheUpdater destination_template="in-portal/catalog" progress="1"/>
\ No newline at end of file
Index: trunk/kernel/admin_templates/incs/header_mini.tpl
===================================================================
diff -u -r4330 -r6669
--- trunk/kernel/admin_templates/incs/header_mini.tpl	(.../header_mini.tpl)	(revision 4330)
+++ trunk/kernel/admin_templates/incs/header_mini.tpl	(.../header_mini.tpl)	(revision 6669)
@@ -1,10 +1,10 @@
 <link rel="stylesheet" rev="stylesheet" href="incs/style.css" type="text/css" />
 
-<script language="javascript" src="incs/is.js"></script>
-<script language="javascript" src="incs/script.js"></script>
-<script language="javascript" src="incs/in-portal.js"></script>
-<script language="javascript" src="incs/toolbar.js"></script>
-<script language="javascript" src="incs/grid.js"></script>
+<script language="javascript" src="js/is.js"></script>
+<script language="javascript" src="js/script.js"></script>
+<script language="javascript" src="js/in-portal.js"></script>
+<script language="javascript" src="js/toolbar.js"></script>
+<script language="javascript" src="js/grid.js"></script>
 
 <script language="javascript">
 	var t = '<inp2:m_get param="t"/>';
Index: trunk/core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl	(.../item_selector_advanced_view.tpl)	(revision 6093)
+++ trunk/core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl	(.../item_selector_advanced_view.tpl)	(revision 6669)
@@ -5,7 +5,7 @@
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_advanced_view" module="in-portal" title="!la_title_AdvancedView!"/>
 
 <inp2:m_set ts="showall" td="no"/>
-<inp2:m_include t="item_selector/item_selector_tabs"/>
+<inp2:m_include t="in-portal/item_selector/item_selector_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="advanced_view" module="in-portal"/>
 
@@ -17,12 +17,12 @@
 	<tr>
 	  	<td>
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
-	  		<inp2:m_include t="item_selector/item_selector_toolbar" is_catalog="0"/>
+	  		<inp2:m_include t="in-portal/item_selector/item_selector_toolbar" is_catalog="0"/>
 	  		<script type="text/javascript">
 	  			Catalog.prototype.AfterInit = function() {
 	  				this.switchTab();
 	  			}
-	  			
+
 	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" pass_through="ts,td,tm" ts="showall" td="no" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'is_advanced_view_', 0);
 			</script>
 		</td>
@@ -52,19 +52,19 @@
 						</td>
 						<td style="background-color: #FFFFFF;">
 							<img src="img/spacer.gif" height="1" width="5" />
-						</td>	
+						</td>
 					</tr>
 				</table>
 			</td>
 		</inp2:m_DefineElement>
-		
+
 		<inp2:m_DefineElement name="tab_headers">
 			<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="ViewMenuPhrase" replace_m="yes" skip_prefixes="$skip_prefixes"/>
 		</inp2:m_DefineElement>
-		
+
 		<inp2:c_InitCatalog render_as="tab_headers"/>
-		
-		
+
+
 	</tr>
 </table>
 <!-- item tabs: end -->
Index: trunk/core/admin_templates/img/ajax_progress.gif
===================================================================
diff -u
Binary files differ
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/is.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/core/units/groups/groups_config.php
===================================================================
diff -u -r6093 -r6669
--- trunk/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 6093)
+++ trunk/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 6669)
@@ -47,7 +47,7 @@
 					'Sections'			=>	Array(
 													'in-portal:user_groups'	=>	Array(
 																						'parent'		=>	'in-portal:users',
-																						'icon'			=>	'usergroups',
+																						'icon'			=>	'in-portal:usergroups',
 																						'label'			=>	'la_tab_User_Groups',
 																						'url'			=>	Array('t' => 'groups/groups_list', 'pass' => 'm'),
 																						'permissions'	=>	Array('view', 'add', 'edit', 'delete', 'advanced:send_email', 'advanced:manage_permissions'),
Index: trunk/core/units/categories/categories_config.php
===================================================================
diff -u -r6583 -r6669
--- trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 6583)
+++ trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 6669)
@@ -108,8 +108,8 @@
 																							'parent'		=>	'in-portal:site',
 																							'icon'			=>	'catalog',
 																							'label'			=>	'la_tab_Browse',
-																							'url'			=>	Array('t' => 'catalog', 'pass' => 'm'),
-																							'late_load'		=>	Array('t' => 'xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
+																							'url'			=>	Array('t' => 'in-portal/catalog', 'pass' => 'm'),
+																							'late_load'		=>	Array('t' => 'in-portal/xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
 																							'onclick'		=>	'checkCatalog(0)',
 																							'permissions'	=>	Array('view'),
 																							'priority'		=>	0.1,
@@ -119,7 +119,7 @@
 																							'parent'		=>	'in-portal:site',
 																							'icon'			=>	'advanced_view',
 																							'label'			=>	'la_tab_AdvancedView',
-																							'url'			=>	Array('t' => 'advanced_view', 'pass' => 'm'),
+																							'url'			=>	Array('t' => 'in-portal/advanced_view', 'pass' => 'm'),
 																							'permissions'	=>	Array('view'),
 																							'priority'		=>	0.2,
 																							'type'			=>	stTREE,
@@ -169,7 +169,7 @@
 																									'parent'		=>	'in-portal:site',
 																									'icon'			=>	'settings_search',
 																									'label'			=>	'la_tab_ConfigSearch',
-																									'url'			=>	Array('t' => 'config/config_search', 'module_key' => 'category', 'pass_section' => true, 'pass' => 'm'),
+																									'url'			=>	Array('t' => 'in-portal/config/config_search', 'module_key' => 'category', 'pass_section' => true, 'pass' => 'm'),
 																									'permissions'	=>	Array('view', 'edit'),
 																									'priority'		=>	5,
 																									'type'			=>	stTREE,
@@ -179,7 +179,7 @@
 																									'parent'		=>	'in-portal:site',
 																									'icon'			=>	'settings_email',
 																									'label'			=>	'la_tab_ConfigE-mail',
-																									'url'			=>	Array('t' => 'config/config_email', 'module' => 'In-Portal:Category', 'pass_section' => true, 'pass' => 'm'),
+																									'url'			=>	Array('t' => 'in-portal/config/config_email', 'module' => 'In-Portal:Category', 'pass_section' => true, 'pass' => 'm'),
 																									'permissions'	=>	Array('view', 'edit'),
 																									'priority'		=>	6,
 																									'type'			=>	stTREE,
@@ -189,7 +189,7 @@
 																									'parent'		=>	'in-portal:site',
 																									'icon'			=>	'settings_custom',
 																									'label'			=>	'la_tab_ConfigCustom',
-																									'url'			=>	Array('t' => 'custom_fields/custom_fields_list', 'cf_type' => 1, 'pass_section' => true, 'pass' => 'm,cf'),
+																									'url'			=>	Array('t' => 'in-portal/custom_fields/custom_fields_list', 'cf_type' => 1, 'pass_section' => true, 'pass' => 'm,cf'),
 																									'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
 																									'priority'		=>	7,
 																									'type'			=>	stTREE,
Index: trunk/core/admin_templates/categories/categories_edit_custom.tpl
===================================================================
diff -u -r5272 -r6669
--- trunk/core/admin_templates/categories/categories_edit_custom.tpl	(.../categories_edit_custom.tpl)	(revision 5272)
+++ trunk/core/admin_templates/categories/categories_edit_custom.tpl	(.../categories_edit_custom.tpl)	(revision 6669)
@@ -4,7 +4,7 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="la_title_Categories"/>
 
-<inp2:m_include t="categories/categories_tabs"/>
+<inp2:m_include t="in-portal/categories/categories_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_custom" module="in-portal" icon="icon46_catalog"/>
 
@@ -23,9 +23,9 @@
 							submit_event('c','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('c', '<inp2:c_PrevId/>');
 						}
@@ -34,31 +34,30 @@
 							go_to_id('c', '<inp2:c_NextId/>');
 						}
 				 ) );
-				
+
 				function edit(){ }
-				
+
 				a_toolbar.Render();
-				
+
 				<inp2:m_if check="c_IsSingle">
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if check="c_IsLast">
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
 					<inp2:m_if check="c_IsFirst">
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
-				</inp2:m_if>	
+				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
 </tbody>
 </table>
 
-<inp2:m_include t="incs/custom_blocks"/>
+<inp2:m_include t="in-portal/incs/custom_blocks"/>
 <inp2:m_ParseBlock 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"/>
-		
\ No newline at end of file
Index: trunk/core/admin_templates/img/tree/ftv2blank.gif
===================================================================
diff -u
Binary files differ
Index: trunk/core/admin_templates/img/list_arrow_2_desc.gif
===================================================================
diff -u
Binary files differ
Index: trunk/core/admin_templates/categories/categories_edit_images.tpl
===================================================================
diff -u -r5320 -r6669
--- trunk/core/admin_templates/categories/categories_edit_images.tpl	(.../categories_edit_images.tpl)	(revision 5320)
+++ trunk/core/admin_templates/categories/categories_edit_images.tpl	(.../categories_edit_images.tpl)	(revision 6669)
@@ -1,12 +1,12 @@
 <inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
 <inp2:m_include t="incs/header" nobody="yes"/>
 
-<inp2:m_include t="incs/image_blocks"/>
+<inp2:m_include t="in-portal/incs/image_blocks"/>
 
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" title="!la_title_Categories!"/>
 
-<inp2:m_include t="categories/categories_tabs"/>
+<inp2:m_include t="in-portal/categories/categories_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_images" module="in-portal" icon="icon46_catalog"/>
 
@@ -16,12 +16,12 @@
 	<tr>
   	<td>
   		<script type="text/javascript">
-				  		
+
   				function edit()
 	  			{
-	  				std_edit_temp_item('c-img', 'categories/images_edit');
+	  				std_edit_temp_item('c-img', 'in-portal/categories/images_edit');
 	  			}
-  		  		
+
   				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('c','<inp2:c_SaveEvent/>');
@@ -31,9 +31,9 @@
 							submit_event('c','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('c', '<inp2:c_PrevId/>');
 						}
@@ -42,53 +42,53 @@
 							go_to_id('c', '<inp2:c_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('c-img', 'categories/images_edit')
+							std_new_item('c-img', 'in-portal/categories/images_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('c-img')
-						} ) );				
-				
-				a_toolbar.AddButton( new ToolBarSeparator('sep3') ); 
-				
+						} ) );
+
+				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('c-img','OnMassMoveUp');
 						}
 				 ) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
 							submit_event('c-img','OnMassMoveDown');
 						}
 				 ) );
-				 
+
 				 a_toolbar.AddButton( new ToolBarButton('primary_image', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
 							submit_event('c-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 prefix="c" function="IsSingle"/>
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if prefix="c" function="IsLast"/>
 						a_toolbar.DisableButton('next');
 					<inp2:m_endif/>
Index: trunk/kernel/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/kernel/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 6093)
+++ trunk/kernel/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 6669)
@@ -5,7 +5,7 @@
 
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Categories!"/>
 
-<inp2:m_include t="categories/categories_tabs"/>
+<inp2:m_include t="in-portal/categories/categories_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_edit" module="in-portal" icon="icon46_catalog"/>
 
@@ -76,7 +76,7 @@
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="c" field="MetaDescription" title="!la_fld_MetaDescription!" rows="2" cols="60"/>
 
 	<!-- custom fields: begin -->
-	<inp2:m_include t="incs/custom_blocks"/>
+	<inp2:m_include t="in-portal/incs/custom_blocks"/>
 	<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="c" value_field="Value" per_page="-1" grid="Default" />
 	<!-- custom fields: end -->
 </table>
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/in-portal.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/core/units/languages/languages_config.php
===================================================================
diff -u -r6583 -r6669
--- trunk/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 6583)
+++ trunk/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 6669)
@@ -93,7 +93,7 @@
 					'Sections'			=>	Array(
 													'in-portal:configure_lang'	=>	Array(
 																								'parent'		=>	'in-portal:system',
-																								'icon'			=>	'conf_regional',
+																								'icon'			=>	'in-portal:conf_regional',
 																								'label'			=>	'la_tab_Regional',
 																								'url'			=>	Array('t' => 'regional/languages_list', 'pass' => 'm'),
 																								'permissions'	=>	Array('view', 'add', 'edit', 'delete', 'advanced:set_primary', 'advanced:import', 'advanced:export'),
Index: trunk/kernel/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r6583 -r6669
--- trunk/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 6583)
+++ trunk/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 6669)
@@ -37,7 +37,7 @@
 
 <inp2:m_DefineElement name="config_edit_date">
 	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
-		<script type="text/javascript" src="incs/calendar.js"></script>
+		<script type="text/javascript" src="js/calendar.js"></script>
 		<inp2:m_set calendar_included="1"/>
 	</inp2:m_if>
 	
@@ -50,7 +50,7 @@
 
 <inp2:m_DefineElement name="config_edit_datetime">
 	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
-		<script type="text/javascript" src="incs/calendar.js"></script>
+		<script type="text/javascript" src="js/calendar.js"></script>
 		<inp2:m_set calendar_included="1"/>
 	</inp2:m_if>
 	
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/ajax.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/kernel/admin_templates/item_selector/item_selector_catalog.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/kernel/admin_templates/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 6093)
+++ trunk/kernel/admin_templates/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 6669)
@@ -3,7 +3,7 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF" onload="$Catalog.Init();">
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Browse!"/>
 
-<inp2:m_include t="item_selector/item_selector_tabs"/>
+<inp2:m_include t="in-portal/item_selector/item_selector_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="catalog" module="in-portal"/>
 
@@ -15,7 +15,7 @@
 	<tr>
 	  	<td>
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
-	  		<inp2:m_include t="item_selector/item_selector_toolbar" is_catalog="1"/>
+	  		<inp2:m_include t="in-portal/item_selector/item_selector_toolbar" is_catalog="1"/>
 	  		<script type="text/javascript">
 	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'is_catalog_');
 	  		</script>
@@ -35,7 +35,7 @@
 		</tr>
 </table>
 
-<inp2:m_set t="xml/categories_list"/>
+<inp2:m_set t="in-portal/xml/categories_list"/>
 <inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
 <table class="toolbar" cellspacing="0" cellpadding="2" width="100%" border="0" class="tableborder_full_a">
 	<tr bgcolor="#e0e0da" height="20">
@@ -56,14 +56,14 @@
 						</script>
 					</td>
 				</tr>
-			</table>	
+			</table>
 		</td>
 	</tr>
 </table>
 
-<div id="categories_div" prefix="c" view_template="xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
+<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="in-portal/categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
-<inp2:m_set t="catalog"/>
+<inp2:m_set t="in-portal/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
 <!-- categories list: end -->
 
@@ -85,19 +85,19 @@
 						</td>
 						<td style="background-color: #FFFFFF;">
 							<img src="img/spacer.gif" height="1" width="5" />
-						</td>	
+						</td>
 					</tr>
 				</table>
-				
+
 			</td>
 		</inp2:m_DefineElement>
-		
+
 		<inp2:m_DefineElement name="tab_headers">
 			<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="ViewMenuPhrase" skip_prefixes="$skip_prefixes"/>
 		</inp2:m_DefineElement>
-		
+
 		<inp2:c_InitCatalog render_as="tab_headers" skip_prefixes="m"/>
-		
+
 	</tr>
 </table>
 <!-- item tabs: end -->
Index: trunk/kernel/admin_templates/advanced_view.tpl
===================================================================
diff -u -r6583 -r6669
--- trunk/kernel/admin_templates/advanced_view.tpl	(.../advanced_view.tpl)	(revision 6583)
+++ trunk/kernel/admin_templates/advanced_view.tpl	(.../advanced_view.tpl)	(revision 6669)
@@ -14,9 +14,9 @@
 	<tr>
 	  	<td>
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
-	  		<script type="text/javascript" src="incs/fw_menu.js"></script>
-	  		<script type="text/javascript" src="incs/ajax.js"></script>
-	  		<script type="text/javascript" src="incs/catalog.js"></script>
+	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/fw_menu.js"></script>
+	  		<script type="text/javascript" src="js/ajax.js"></script>
+	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
 	  		<script type="text/javascript">
 	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/tree.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/kernel/admin_templates/xml/tree_categories.tpl
===================================================================
diff -u -r5536 -r6669
--- trunk/kernel/admin_templates/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 5536)
+++ trunk/kernel/admin_templates/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 6669)
@@ -1,6 +1,6 @@
 <inp2:m_XMLTemplate/>
 <inp2:m_DefineElement name="category">
-	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink template="catalog" pass="m" m_opener="r"/>" onclick="checkCatalog(<inp2:m_get name="c_id"/>)" load_url="<inp2:CategoryLink pass="m"/>"></folder>
+	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink template="in-portal/catalog" pass="m" m_opener="r"/>" onclick="checkCatalog(<inp2:m_get name="c_id"/>)" load_url="<inp2:CategoryLink pass="m"/>"></folder>
 </inp2:m_DefineElement>
 <tree>
 <inp2:c_ListCategories render_as="category" row_start_render_as="html:" row_end_render_as="html:" per_page="-1"/>
Index: trunk/kernel/admin_templates/categories/relations_edit.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/kernel/admin_templates/categories/relations_edit.tpl	(.../relations_edit.tpl)	(revision 6093)
+++ trunk/kernel/admin_templates/categories/relations_edit.tpl	(.../relations_edit.tpl)	(revision 6669)
@@ -23,15 +23,15 @@
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-				
+
 				a_toolbar.Render();
-				
+
 				<inp2:m_if prefix="c-rel" function="IsSingle"/>
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					a_toolbar.HideButton('sep2');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if prefix="c-rel" function="IsLast"/>
 						a_toolbar.DisableButton('next');
 					<inp2:m_endif/>
@@ -45,20 +45,19 @@
 </tbody>
 </table>
 
-<inp2:m_include t="categories/ci_blocks"/>
-		
+<inp2:m_include t="in-portal/categories/ci_blocks"/>
+
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_RenderElement name="subsection" title="!la_section_Relation!"/>	
+	<inp2:m_RenderElement name="subsection" title="!la_section_Relation!"/>
 		<inp2:m_RenderElement name="inp_edit_hidden" prefix="c-rel" field="SourceId"/>
 		<inp2:m_RenderElement name="inp_edit_hidden" prefix="c-rel" field="SourceType"/>
 		<inp2:m_RenderElement name="inp_edit_hidden" prefix="c-rel" field="TargetId"/>
 		<inp2:m_RenderElement name="inp_edit_hidden" prefix="c-rel" field="TargetType"/>
-		
+
 		<inp2:m_RenderElement name="inp_id_label" prefix="c-rel" field="RelationshipId" title="!la_fld_RelationshipId!"/>
 		<inp2:m_RenderElement name="inp_edit_relation" prefix="c-rel" field="TargetId" title="!la_fld_TargetId!"/>
 		<inp2:m_RenderElement name="inp_edit_radio" prefix="c-rel" field="Type" title="!la_fld_RelationshipType!"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-rel" field="Enabled" title="!la_fld_Enabled!"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="c-rel" field="Priority" title="!la_fld_Priority!" size="4"/>
 </table>
 <inp2:m_include t="incs/footer"/>
-	
\ No newline at end of file
Index: trunk/core/admin_templates/img/itemtabs/tab_middle.gif
===================================================================
diff -u
Binary files differ
Index: trunk/kernel/admin_templates/xml/categories_list.tpl
===================================================================
diff -u -r6583 -r6669
--- trunk/kernel/admin_templates/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 6583)
+++ trunk/kernel/admin_templates/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 6669)
@@ -42,8 +42,8 @@
 </inp2:m_if>
 $Catalog.reflectPasteButton(<inp2:c_HasClipboard/>);
 #separator#
-<inp2:c_UpdateLastTemplate template="catalog"/>
-<inp2:m_include t="categories/ci_blocks"/>
+<inp2:c_UpdateLastTemplate template="in-portal/catalog"/>
+<inp2:m_include t="in-portal/categories/ci_blocks"/>
 <br />
 <table border="0" width="100%">
 	<inp2:m_DefineElement name="category_td">
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/tab_blocks.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/kernel/admin_templates/stylesheets/style_editor.tpl
===================================================================
diff -u -r4834 -r6669
--- trunk/kernel/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 4834)
+++ trunk/kernel/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 6669)
@@ -5,7 +5,7 @@
 
 <inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="style_edit" module="in-portal" icon="icon46_style"/>
 
-<script src="incs/colorselector.js" type="text/javascript" language="javascript"></script>
+<script src="<inp2:m_TemplatesBase module="in-portal"/>/incs/colorselector.js" type="text/javascript" language="javascript"></script>
 <style type="text/css">
 	.ColorBox
 	{
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/form_blocks.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl	(.../item_selector_toolbar.tpl)	(revision 6093)
+++ trunk/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl	(.../item_selector_toolbar.tpl)	(revision 6669)
@@ -1,6 +1,6 @@
-<script type="text/javascript" src="incs/ajax.js"></script>
-<script type="text/javascript" src="incs/fw_menu.js"></script>
-<script type="text/javascript" src="incs/catalog.js"></script>
+<script type="text/javascript" src="js/ajax.js"></script>
+<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/fw_menu.js"></script>
+<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
 <script type="text/javascript">
 	Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 	var a_toolbar = new ToolBar();
Index: trunk/kernel/admin_templates/catalog_tab.tpl
===================================================================
diff -u -r6583 -r6669
--- trunk/kernel/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 6583)
+++ trunk/kernel/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 6669)
@@ -1,12 +1,12 @@
 <inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
-	<div id="categories_div" prefix="c.showall" view_template="catalog_tab" edit_template="categories/categories_edit" category_id="-1" dep_buttons="" class="catalog-tab"></div>
+	<div id="categories_div" prefix="c.showall" view_template="in-portal/catalog_tab" edit_template="in-portal/categories/categories_edit" category_id="-1" dep_buttons="" class="catalog-tab"></div>
 	<script type="text/javascript">$Catalog.registerTab('categories');</script>
 <inp2:m_else/>
 	<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
 	<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
 	<inp2:m_include t="incs/blocks"/>
 	<inp2:m_include t="incs/grid_blocks"/>
-	<inp2:m_include t="categories/ci_blocks"/>
+	<inp2:m_include t="in-portal/categories/ci_blocks"/>
 	<inp2:c.showall_InitList parent_cat_id="any" no_special="1"/>
 	$Catalog.setItemCount('c.showall', '<inp2:c.showall_CatalogItemCount no_special="1"/>');
 	$Catalog.setCurrentCategory('c.showall', <inp2:m_get name="m_cat_id"/>);
Index: trunk/core/admin_templates/logs/visits/visits_list.tpl
===================================================================
diff -u -r4834 -r6669
--- trunk/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 4834)
+++ trunk/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 6669)
@@ -56,7 +56,7 @@
 	</tr>
 </tbody>
 </table>
-<script type="text/javascript" src="incs/calendar.js"></script>
+<script type="text/javascript" src="js/calendar.js"></script>
 
 <inp2:m_DefineElement name="search_calendar_td" class="">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
Index: trunk/kernel/admin_templates/summary/root.tpl
===================================================================
diff -u -r6583 -r6669
--- trunk/kernel/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 6583)
+++ trunk/kernel/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 6669)
@@ -121,7 +121,7 @@
 				<table width="100%" cellspacing="0" cellpadding="4">
 					<tr>
 						<td>
-							<a class="userslink" href="<inp2:m_t t="catalog" pass="m"/>">
+							<a class="userslink" href="<inp2:m_t t="in-portal/catalog" pass="m"/>">
 								<img hSpace="3" src="img/icons/icon24_navigate.gif" border="0" align="absMiddle">
 								<inp2:m_phrase name="la_Text_Catalog"/>
 							</a>
Index: trunk/core/admin_templates/sections_list.tpl
===================================================================
diff -u
--- trunk/core/admin_templates/sections_list.tpl	(revision 0)
+++ trunk/core/admin_templates/sections_list.tpl	(revision 6669)
@@ -0,0 +1,56 @@
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<link rel="stylesheet" rev="stylesheet" href="incs/sections_list.css" type="text/css" />
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+
+<inp2:m_DefineElement name="section_list_header" icon_module="">
+		<!-- section header -->
+		<table cellpadding="0" cellspacing="0" border="0" width="100%">
+			<tr style="background: url(<inp2:$SectionPrefix_ModulePath module="#session#"/>img/logo_bg.gif) no-repeat top right;">
+				<td valign="top" class="admintitle" align="left" style="padding-top: 2px; padding-bottom: 2px;">
+					<inp2:m_if check="m_RecallEquals" name="section" value="in-portal:root">
+						<img width="46" height="46" src="<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/<inp2:adm_GetSectionIcon icon="icon46_{$icon}"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$label" default="$label"/>">&nbsp;<inp2:adm_GetSectionTitle phrase="$label" default="$label"/>
+					<inp2:m_else/>
+		    			<img width="46" height="46" src="<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/<inp2:adm_GetSectionIcon icon="icon46_{$icon}"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$label"/>">&nbsp;<inp2:adm_GetSectionTitle phrase="$label"/>
+		    		</inp2:m_if>
+		   		</td>
+			</tr>
+		</table>
+
+		<inp2:m_ParseBlock name="blue_bar" prefix="$SectionPrefix" title_preset="tree_#section#" icon="icon46_{$icon}"/>
+</inp2:m_DefineElement>
+
+<inp2:adm_PrintSection section_name="#session#" render_as="section_list_header"/>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+	<tr>
+		<td valign="top" width="100%">
+			<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+				<inp2:m_DefineElement name="section_element" icon_module="">
+					<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+						<td class="subitem_icon">
+							<img src="<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/icon46_list_<inp2:m_param name="icon"/>.gif" border="0" alt="<inp2:m_phrase name="$label"/>" align="absmiddle"/>
+						</td>
+						<td class="subitem_description">
+							<a href="<inp2:m_param name="section_url"/>" class="dLink" title="<inp2:m_phrase name="$label"/>" target="main"><inp2:m_phrase name="$label"/></a>
+							<inp2:m_if check="m_ParamEquals" name="is_tab" value="1">
+								<inp2:m_phrase name="la_Description_{$parent}"/>
+							<inp2:m_else/>
+								<inp2:m_phrase name="la_Description_{$section_name}"/>
+							</inp2:m_if>
+						</td>
+					</tr>
+				</inp2:m_DefineElement>
+
+				<inp2:m_set odd_even="table_color1"/>
+				<inp2:adm_PrintSections block="section_element" section_name="#session#"/>
+			</table>
+		</td>
+
+		<td valign="top" align="right">
+			<inp2:adm_ModuleInclude template="summary/#section#"/>
+		</td>
+	</tr>
+</table>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: trunk/core/admin_templates/img/list_arrow_desc.gif
===================================================================
diff -u
Binary files differ
Index: trunk/core/admin_templates/categories/categories_tabs.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/core/admin_templates/categories/categories_tabs.tpl	(.../categories_tabs.tpl)	(revision 6093)
+++ trunk/core/admin_templates/categories/categories_tabs.tpl	(.../categories_tabs.tpl)	(revision 6669)
@@ -17,14 +17,14 @@
   	<table cellpadding="0" cellspacing="0" border="0" height="23">
 		<tr>
 			<inp2:m_if check="c_IsRootCategory">
-				<inp2:m_ParseBlock name="tab" title="la_tab_Permissions" t="categories/categories_edit_permissions" main_prefix="c"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_Permissions" t="in-portal/categories/categories_edit_permissions" main_prefix="c"/>
 			<inp2:m_else/>
-				<inp2:m_ParseBlock name="tab" title="la_tab_General" t="categories/categories_edit" main_prefix="c"/>
-				<inp2:m_ParseBlock name="tab" title="la_tab_Properties" t="categories/categories_edit_properties" main_prefix="c"/>
-				<inp2:m_ParseBlock name="tab" title="la_tab_Relations" t="categories/categories_edit_relations" main_prefix="c"/>
-				<inp2:m_ParseBlock name="tab" title="la_tab_Images" t="categories/categories_edit_images" main_prefix="c"/>
-				<inp2:m_ParseBlock name="tab" title="la_tab_Permissions" t="categories/categories_edit_permissions" main_prefix="c"/>
-				<inp2:m_ParseBlock name="tab" title="la_tab_Custom" t="categories/categories_edit_custom" main_prefix="c"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_General" t="in-portal/categories/categories_edit" main_prefix="c"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_Properties" t="in-portal/categories/categories_edit_properties" main_prefix="c"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_Relations" t="in-portal/categories/categories_edit_relations" main_prefix="c"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_Images" t="in-portal/categories/categories_edit_images" main_prefix="c"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_Permissions" t="in-portal/categories/categories_edit_permissions" main_prefix="c"/>
+				<inp2:m_ParseBlock name="tab" title="la_tab_Custom" t="in-portal/categories/categories_edit_custom" main_prefix="c"/>
 			</inp2:m_if>
 		</tr>
 		</table>
Index: trunk/kernel/admin_templates/img/list_arrow_2_asc.gif
===================================================================
diff -u -r1566 -r6669
Binary files differ
Index: trunk/core/admin_templates/img/arrow.gif
===================================================================
diff -u
Binary files differ
Index: trunk/kernel/admin_templates/visits/visits_list.tpl
===================================================================
diff -u -r4834 -r6669
--- trunk/kernel/admin_templates/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 4834)
+++ trunk/kernel/admin_templates/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 6669)
@@ -56,7 +56,7 @@
 	</tr>
 </tbody>
 </table>
-<script type="text/javascript" src="incs/calendar.js"></script>
+<script type="text/javascript" src="js/calendar.js"></script>
 
 <inp2:m_DefineElement name="search_calendar_td" class="">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
Index: trunk/kernel/admin_templates/img/itemtabs/tab_left.gif
===================================================================
diff -u -r4996 -r6669
Binary files differ
Index: trunk/kernel/admin_templates/categories/categories_edit_properties.tpl
===================================================================
diff -u -r5558 -r6669
--- trunk/kernel/admin_templates/categories/categories_edit_properties.tpl	(.../categories_edit_properties.tpl)	(revision 5558)
+++ trunk/kernel/admin_templates/categories/categories_edit_properties.tpl	(.../categories_edit_properties.tpl)	(revision 6669)
@@ -5,7 +5,7 @@
 
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Categories!"/>
 
-<inp2:m_include t="categories/categories_tabs"/>
+<inp2:m_include t="in-portal/categories/categories_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_properties" module="in-portal" icon="icon46_catalog"/>
 
Index: trunk/core/admin_templates/img/tree/ftv2mnode.gif
===================================================================
diff -u
Binary files differ
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/grid.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/core/admin_templates/img/tree/ftv2pnode.gif
===================================================================
diff -u
Binary files differ
Index: trunk/kernel/admin_templates/item_selector/item_selector_tabs.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/kernel/admin_templates/item_selector/item_selector_tabs.tpl	(.../item_selector_tabs.tpl)	(revision 6093)
+++ trunk/kernel/admin_templates/item_selector/item_selector_tabs.tpl	(.../item_selector_tabs.tpl)	(revision 6669)
@@ -3,8 +3,8 @@
 	<td align="right" width="100%">
 	  	<table cellpadding="0" cellspacing="0" border="0" height="23">
 			<tr>
-				<inp2:m_ParseBlock name="tab_direct" title="la_tab_Browse" t="item_selector/item_selector_catalog" pass="all"/>
-				<inp2:m_ParseBlock name="tab_direct" title="la_tab_AdvancedView" t="item_selector/item_selector_advanced_view" pass="all"/>
+				<inp2:m_ParseBlock name="tab_direct" title="la_tab_Browse" t="in-portal/item_selector/item_selector_catalog" pass="all"/>
+				<inp2:m_ParseBlock name="tab_direct" title="la_tab_AdvancedView" t="in-portal/item_selector/item_selector_advanced_view" pass="all"/>
 			</tr>
 		</table>
 	</td>
Index: trunk/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r6583 -r6669
--- trunk/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 6583)
+++ trunk/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 6669)
@@ -37,7 +37,7 @@
 
 <inp2:m_DefineElement name="config_edit_date">
 	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
-		<script type="text/javascript" src="incs/calendar.js"></script>
+		<script type="text/javascript" src="js/calendar.js"></script>
 		<inp2:m_set calendar_included="1"/>
 	</inp2:m_if>
 	
@@ -50,7 +50,7 @@
 
 <inp2:m_DefineElement name="config_edit_datetime">
 	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
-		<script type="text/javascript" src="incs/calendar.js"></script>
+		<script type="text/javascript" src="js/calendar.js"></script>
 		<inp2:m_set calendar_included="1"/>
 	</inp2:m_if>
 	
Index: trunk/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 6093)
+++ trunk/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 6669)
@@ -5,7 +5,7 @@
 
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Categories!"/>
 
-<inp2:m_include t="categories/categories_tabs"/>
+<inp2:m_include t="in-portal/categories/categories_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_edit" module="in-portal" icon="icon46_catalog"/>
 
@@ -76,7 +76,7 @@
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="c" field="MetaDescription" title="!la_fld_MetaDescription!" rows="2" cols="60"/>
 
 	<!-- custom fields: begin -->
-	<inp2:m_include t="incs/custom_blocks"/>
+	<inp2:m_include t="in-portal/incs/custom_blocks"/>
 	<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="c" value_field="Value" per_page="-1" grid="Default" />
 	<!-- custom fields: end -->
 </table>
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/blocks.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/kernel/admin_templates/img/list_arrow_asc.gif
===================================================================
diff -u -r1566 -r6669
Binary files differ
Index: trunk/kernel/admin_templates/img/list_arrow_no.gif
===================================================================
diff -u -r1566 -r6669
Binary files differ
Index: trunk/core/admin_templates/tree.tpl
===================================================================
diff -u -r6656 -r6669
--- trunk/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 6656)
+++ trunk/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 6669)
@@ -15,8 +15,8 @@
 	}
 </script>
 
-<script src="incs/ajax.js"></script>
-<script src="incs/tree.js"></script>
+<script src="js/ajax.js"></script>
+<script src="js/tree.js"></script>
 
 <style type="text/css">
 	.tree_head.td, .tree_head, .tree_head:hover {
@@ -70,7 +70,7 @@
 
 	<tr>
 		<td colspan="2" style="padding: 5px;">
-			<inp2:m_DefineElement name="xml_node">
+			<inp2:m_DefineElement name="xml_node" icon_module="">
 				<inp2:m_if check="m_ParamEquals" param="children_count" value="0">
 					<item href="<inp2:m_param name="section_url"/>" onclick="<inp2:m_param name="onclick"/>" icon="<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/icon24_<inp2:m_param name="icon"/>.gif"><inp2:m_phrase name="$label" escape="1"/></item>
 				<inp2:m_else/>
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/calendar.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/kernel/admin_templates/categories/images_edit.tpl
===================================================================
diff -u -r5320 -r6669
--- trunk/kernel/admin_templates/categories/images_edit.tpl	(.../images_edit.tpl)	(revision 5320)
+++ trunk/kernel/admin_templates/categories/images_edit.tpl	(.../images_edit.tpl)	(revision 6669)
@@ -1,7 +1,7 @@
 <inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
 <inp2:m_include t="incs/header" nobody="yes"/>
 
-<inp2:m_include t="incs/image_blocks"/>
+<inp2:m_include t="in-portal/incs/image_blocks"/>
 
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" title="!la_Text_Categories!"/>
@@ -23,7 +23,7 @@
 							submit_event('c-img','OnCancel');
 						}
 				 ) );
-				
+
 				a_toolbar.Render();
 			</script>
 		</td>
@@ -35,18 +35,18 @@
 	<inp2:m_ParseBlock name="subsection" title="!la_section_Image!"/>
 		<inp2:m_ParseBlock name="inp_edit_hidden" prefix="c-img" field="ResourceId"/>
 		<inp2:m_ParseBlock name="inp_label" prefix="c-img" field="ImageId" title="!la_fld_ImageId!"/>
-		
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="c-img" field="Name" title="!la_fld_Name!" size="40"/>		
+
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c-img" field="Name" title="!la_fld_Name!" size="40"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="c-img" field="AltName" title="!la_fld_AltValue!" size="40"/>
-		
+
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="c-img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="c-img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="c-img" field="Priority" title="!la_fld_Priority!" size="5"/>	
-		
-	<inp2:m_ParseBlock name="subsection" title="!la_section_ThumbnailImage!"/>		
-		<inp2:m_ParseBlock name="thumbnail_section" prefix="c-img"/>		
-		
-	<inp2:m_ParseBlock name="subsection" title="!la_section_FullSizeImage!"/>		
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c-img" field="Priority" title="!la_fld_Priority!" size="5"/>
+
+	<inp2:m_ParseBlock name="subsection" title="!la_section_ThumbnailImage!"/>
+		<inp2:m_ParseBlock name="thumbnail_section" prefix="c-img"/>
+
+	<inp2:m_ParseBlock name="subsection" title="!la_section_FullSizeImage!"/>
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="c-img" field="SameImages" title="!la_fld_SameAsThumb!" onchange="toggle_fullsize()"/>
 		<inp2:m_ParseBlock name="fullsize_section" prefix="c-img"/>
 </table>
Index: trunk/core/units/users/users_config.php
===================================================================
diff -u -r4702 -r6669
--- trunk/core/units/users/users_config.php	(.../users_config.php)	(revision 4702)
+++ trunk/core/units/users/users_config.php	(.../users_config.php)	(revision 6669)
@@ -48,13 +48,13 @@
 											),
 
 					'IDField' 			=>	'PortalUserId',
-					
+
 					'StatusField'		=>	Array('Status'),
-					
+
 					'TitleField'		=>	'Login',
-					
+
 					'ItemType'			=>	6,	// used for custom fields only (on user's case)
-					
+
 					'StatisticsInfo'	=>	Array(
 													'pending'	=>	Array(
 																			'icon'		=>	'icon16_user_pending.gif',
@@ -64,101 +64,101 @@
 																			'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'=>'!la_title_New_User!'),
 																),
-												
+
 												'users_list'		=>	Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#)"),
-												
+
 												'users_edit'		=>	Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_General!"),
-												
+
 												'users_select'		=>	Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#) - !la_title_SelectUser!"),
-												
+
 												'tree_users'		=>	Array('format' => '!la_section_overview!'),
 											),
-					
 
+
 					'PermSection'		=>	Array('main' => 'in-portal:user_list', 'email' => 'in-portal:user_email', 'custom' => 'in-portal:user_custom'),
-					
+
 					'Sections'			=>	Array(
 													'in-portal:users'		=>	Array(
 																						'parent'		=>	'in-portal:root',
-																						'icon'			=>	'community',
+																						'icon'			=>	'in-portal:community',
 																						'label'			=>	'la_tab_Community',
 																						'url'			=>	Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
 																						'priority'		=>	2,
 																						'type'			=>	stTREE,
 																				),
-																				
+
 													'in-portal:user_list'	=>	Array(
 																						'parent'		=>	'in-portal:users',
-																						'icon'			=>	'users',
+																						'icon'			=>	'in-portal:users',
 																						'label'			=>	'la_tab_User_List',
 																						'url'			=>	Array('index_file' => 'users/user_list.php', 'pass' => 'm', 'resetpage' => 1),
 																						'permissions'	=>	Array('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /*'advanced:add_favorite', 'advanced:remove_favorite',*/),
 																						'priority'		=>	1,
 																						'type'			=>	stTREE,
 																				),
-																				
+
 													'in-portal:configure_users'	=>	Array(
 																							'parent'		=>	'in-portal:users',
-																							'icon'			=>	'users_settings',
+																							'icon'			=>	'in-portal:users_settings',
 																							'label'			=>	'la_tab_ConfigSettings',
 																							'url'			=>	Array('t' => 'config/config_universal', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'),
 																							'permissions'	=>	Array('view', 'edit'),
 																							'priority'		=>	3,
 																							'type'			=>	stTREE,
 																					),
-																					
+
 													'in-portal:user_email'	=>	Array(
 																						'parent'		=>	'in-portal:users',
-																						'icon'			=>	'settings_email',
+																						'icon'			=>	'in-portal:settings_email',
 																						'label'			=>	'la_tab_ConfigE-mail',
 																						'url'			=>	Array('t' => 'config/config_email', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'),
 																						'permissions'	=>	Array('view', 'edit'),
 																						'priority'		=>	4,
 																						'type'			=>	stTREE,
 																				),
-																				
+
 													'in-portal:user_custom'	=>	Array(
 																						'parent'		=>	'in-portal:users',
-																						'icon'			=>	'settings_custom',
+																						'icon'			=>	'in-portal:settings_custom',
 																						'label'			=>	'la_tab_ConfigCustom',
 																						'url'			=>	Array('t' => 'custom_fields/custom_fields_list', 'cf_type' => 6, 'pass_section' => true, 'pass' => 'm,cf'),
 																						'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
 																						'priority'		=>	5,
 																						'type'			=>	stTREE,
 																				),
-													
+
 													'in-portal:user_banlist'	=>	Array(
 																						'parent'		=>	'in-portal:users',
-																						'icon'			=>	'banlist',
+																						'icon'			=>	'in-portal:banlist',
 																						'label'			=>	'la_tab_BanList',
 																						'url'			=>	Array('index_file' => 'config/edit_banlist.php', 'DataType' => 6, 'pass_section' => true, 'pass' => 'm'),
 																						'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
 																						'priority'		=>	6,
 																						'type'			=>	stTREE,
 																				),
-											),						
-											
+											),
+
 					'TableName'			=>	TABLE_PREFIX.'PortalUser',
 
 					'ListSQLs'			=>	Array(	''	=>	'	SELECT %1$s.* %2$s FROM %1$s
 																LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON %1$s.PortalUserId = ug.PortalUserId AND ug.PrimaryGroup = 1
 																LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON ug.GroupId = g.GroupId
 																LEFT JOIN '.TABLE_PREFIX.'%3$sPortalUserCustomData cust ON %1$s.ResourceId = cust.ResourceId',
 											),
-											
+
 					'ItemSQLs'			=>	Array(	''	=>	'	SELECT %1$s.* %2$s FROM %1$s
 																LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON %1$s.PortalUserId = ug.PortalUserId AND ug.PrimaryGroup = 1
 																LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON ug.GroupId = g.GroupId
 																LEFT JOIN '.TABLE_PREFIX.'%3$sPortalUserCustomData cust ON %1$s.ResourceId = cust.ResourceId',
 											),
-											
+
 					'ListSortings'	=> 	Array(
 																'' => Array(
 																	'Sorting' => Array('Login' => 'asc'),
@@ -171,20 +171,20 @@
 												'Groups' => Array(
 													Array('mode' => 'AND', 'filters' => Array(0,1,2), 'type' => WHERE_FILTER),
 												),
-												
+
 												'Filters' => Array(
 													0	=>	Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),
 													1	=>	Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0'  ),
 													2	=>	Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2'  ),
 												)
 											),
-											
+
 					'CalculatedFields'	=>	Array(
 													''	=>	Array(
 																'PrimaryGroup'	=>	'g.Name',
 															),
 											),
-					
+
 					'Fields' => Array
 							    (
 							        'PortalUserId' => Array(),
@@ -248,7 +248,7 @@
 																		'CreatedOn_formatted'	=>	Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'),
 																	),
 														),
-														
+
 										'UserSelector'	=>	Array(
 																'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'),
 																'Fields' => Array(
Index: trunk/core/admin_templates/img/tree/ftv2node.gif
===================================================================
diff -u
Binary files differ
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/header.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/core/admin_templates/categories/relations_edit.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/core/admin_templates/categories/relations_edit.tpl	(.../relations_edit.tpl)	(revision 6093)
+++ trunk/core/admin_templates/categories/relations_edit.tpl	(.../relations_edit.tpl)	(revision 6669)
@@ -23,15 +23,15 @@
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-				
+
 				a_toolbar.Render();
-				
+
 				<inp2:m_if prefix="c-rel" function="IsSingle"/>
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					a_toolbar.HideButton('sep2');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if prefix="c-rel" function="IsLast"/>
 						a_toolbar.DisableButton('next');
 					<inp2:m_endif/>
@@ -45,20 +45,19 @@
 </tbody>
 </table>
 
-<inp2:m_include t="categories/ci_blocks"/>
-		
+<inp2:m_include t="in-portal/categories/ci_blocks"/>
+
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_RenderElement name="subsection" title="!la_section_Relation!"/>	
+	<inp2:m_RenderElement name="subsection" title="!la_section_Relation!"/>
 		<inp2:m_RenderElement name="inp_edit_hidden" prefix="c-rel" field="SourceId"/>
 		<inp2:m_RenderElement name="inp_edit_hidden" prefix="c-rel" field="SourceType"/>
 		<inp2:m_RenderElement name="inp_edit_hidden" prefix="c-rel" field="TargetId"/>
 		<inp2:m_RenderElement name="inp_edit_hidden" prefix="c-rel" field="TargetType"/>
-		
+
 		<inp2:m_RenderElement name="inp_id_label" prefix="c-rel" field="RelationshipId" title="!la_fld_RelationshipId!"/>
 		<inp2:m_RenderElement name="inp_edit_relation" prefix="c-rel" field="TargetId" title="!la_fld_TargetId!"/>
 		<inp2:m_RenderElement name="inp_edit_radio" prefix="c-rel" field="Type" title="!la_fld_RelationshipType!"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c-rel" field="Enabled" title="!la_fld_Enabled!"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="c-rel" field="Priority" title="!la_fld_Priority!" size="4"/>
 </table>
 <inp2:m_include t="incs/footer"/>
-	
\ No newline at end of file
Index: trunk/core/admin_templates/stylesheets/style_editor.tpl
===================================================================
diff -u -r4834 -r6669
--- trunk/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 4834)
+++ trunk/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 6669)
@@ -5,7 +5,7 @@
 
 <inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="style_edit" module="in-portal" icon="icon46_style"/>
 
-<script src="incs/colorselector.js" type="text/javascript" language="javascript"></script>
+<script src="<inp2:m_TemplatesBase module="in-portal"/>/incs/colorselector.js" type="text/javascript" language="javascript"></script>
 <style type="text/css">
 	.ColorBox
 	{
Index: trunk/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 6093)
+++ trunk/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 6669)
@@ -3,7 +3,7 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF" onload="$Catalog.Init();">
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Browse!"/>
 
-<inp2:m_include t="item_selector/item_selector_tabs"/>
+<inp2:m_include t="in-portal/item_selector/item_selector_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="catalog" module="in-portal"/>
 
@@ -15,7 +15,7 @@
 	<tr>
 	  	<td>
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
-	  		<inp2:m_include t="item_selector/item_selector_toolbar" is_catalog="1"/>
+	  		<inp2:m_include t="in-portal/item_selector/item_selector_toolbar" is_catalog="1"/>
 	  		<script type="text/javascript">
 	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'is_catalog_');
 	  		</script>
@@ -35,7 +35,7 @@
 		</tr>
 </table>
 
-<inp2:m_set t="xml/categories_list"/>
+<inp2:m_set t="in-portal/xml/categories_list"/>
 <inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
 <table class="toolbar" cellspacing="0" cellpadding="2" width="100%" border="0" class="tableborder_full_a">
 	<tr bgcolor="#e0e0da" height="20">
@@ -56,14 +56,14 @@
 						</script>
 					</td>
 				</tr>
-			</table>	
+			</table>
 		</td>
 	</tr>
 </table>
 
-<div id="categories_div" prefix="c" view_template="xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
+<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="in-portal/categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
-<inp2:m_set t="catalog"/>
+<inp2:m_set t="in-portal/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
 <!-- categories list: end -->
 
@@ -85,19 +85,19 @@
 						</td>
 						<td style="background-color: #FFFFFF;">
 							<img src="img/spacer.gif" height="1" width="5" />
-						</td>	
+						</td>
 					</tr>
 				</table>
-				
+
 			</td>
 		</inp2:m_DefineElement>
-		
+
 		<inp2:m_DefineElement name="tab_headers">
 			<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="ViewMenuPhrase" skip_prefixes="$skip_prefixes"/>
 		</inp2:m_DefineElement>
-		
+
 		<inp2:c_InitCatalog render_as="tab_headers" skip_prefixes="m"/>
-		
+
 	</tr>
 </table>
 <!-- item tabs: end -->
Index: trunk/core/admin_templates/img/tree/ftv2mlastnode.gif
===================================================================
diff -u
Binary files differ
Index: trunk/core/admin_templates/catalog/advanced_view.tpl
===================================================================
diff -u -r6583 -r6669
--- trunk/core/admin_templates/catalog/advanced_view.tpl	(.../advanced_view.tpl)	(revision 6583)
+++ trunk/core/admin_templates/catalog/advanced_view.tpl	(.../advanced_view.tpl)	(revision 6669)
@@ -14,9 +14,9 @@
 	<tr>
 	  	<td>
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
-	  		<script type="text/javascript" src="incs/fw_menu.js"></script>
-	  		<script type="text/javascript" src="incs/ajax.js"></script>
-	  		<script type="text/javascript" src="incs/catalog.js"></script>
+	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/fw_menu.js"></script>
+	  		<script type="text/javascript" src="js/ajax.js"></script>
+	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
 	  		<script type="text/javascript">
 	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 
Index: trunk/core/admin_templates/summary/root.tpl
===================================================================
diff -u -r6583 -r6669
--- trunk/core/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 6583)
+++ trunk/core/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 6669)
@@ -121,7 +121,7 @@
 				<table width="100%" cellspacing="0" cellpadding="4">
 					<tr>
 						<td>
-							<a class="userslink" href="<inp2:m_t t="catalog" pass="m"/>">
+							<a class="userslink" href="<inp2:m_t t="in-portal/catalog" pass="m"/>">
 								<img hSpace="3" src="img/icons/icon24_navigate.gif" border="0" align="absMiddle">
 								<inp2:m_phrase name="la_Text_Catalog"/>
 							</a>
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/logout.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/style.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/kernel/admin_templates/custom_fields/custom_fields_edit.tpl
===================================================================
diff -u -r4842 -r6669
--- trunk/kernel/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 4842)
+++ trunk/kernel/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 6669)
@@ -54,7 +54,7 @@
 </tbody>
 </table>
 
-<script src="incs/calendar.js"></script>
+<script src="js/calendar.js"></script>
 
 
 
Index: trunk/core/admin_templates/img/tree/ftv2plastnode.gif
===================================================================
diff -u
Binary files differ
Index: trunk/core/admin_templates/catalog_tab.tpl
===================================================================
diff -u -r6583 -r6669
--- trunk/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 6583)
+++ trunk/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 6669)
@@ -1,12 +1,12 @@
 <inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
-	<div id="categories_div" prefix="c.showall" view_template="catalog_tab" edit_template="categories/categories_edit" category_id="-1" dep_buttons="" class="catalog-tab"></div>
+	<div id="categories_div" prefix="c.showall" view_template="in-portal/catalog_tab" edit_template="in-portal/categories/categories_edit" category_id="-1" dep_buttons="" class="catalog-tab"></div>
 	<script type="text/javascript">$Catalog.registerTab('categories');</script>
 <inp2:m_else/>
 	<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
 	<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
 	<inp2:m_include t="incs/blocks"/>
 	<inp2:m_include t="incs/grid_blocks"/>
-	<inp2:m_include t="categories/ci_blocks"/>
+	<inp2:m_include t="in-portal/categories/ci_blocks"/>
 	<inp2:c.showall_InitList parent_cat_id="any" no_special="1"/>
 	$Catalog.setItemCount('c.showall', '<inp2:c.showall_CatalogItemCount no_special="1"/>');
 	$Catalog.setCurrentCategory('c.showall', <inp2:m_get name="m_cat_id"/>);
Index: trunk/core/admin_templates/img/list_arrow_2_asc.gif
===================================================================
diff -u
Binary files differ
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/index.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/toolbar.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/footer.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/script.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/core/admin_templates/categories/xml/tree_categories.tpl
===================================================================
diff -u -r5536 -r6669
--- trunk/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 5536)
+++ trunk/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 6669)
@@ -1,6 +1,6 @@
 <inp2:m_XMLTemplate/>
 <inp2:m_DefineElement name="category">
-	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink template="catalog" pass="m" m_opener="r"/>" onclick="checkCatalog(<inp2:m_get name="c_id"/>)" load_url="<inp2:CategoryLink pass="m"/>"></folder>
+	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink template="in-portal/catalog" pass="m" m_opener="r"/>" onclick="checkCatalog(<inp2:m_get name="c_id"/>)" load_url="<inp2:CategoryLink pass="m"/>"></folder>
 </inp2:m_DefineElement>
 <tree>
 <inp2:c_ListCategories render_as="category" row_start_render_as="html:" row_end_render_as="html:" per_page="-1"/>
Index: trunk/kernel/admin_templates/categories/categories_edit_relations.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/kernel/admin_templates/categories/categories_edit_relations.tpl	(.../categories_edit_relations.tpl)	(revision 6093)
+++ trunk/kernel/admin_templates/categories/categories_edit_relations.tpl	(.../categories_edit_relations.tpl)	(revision 6669)
@@ -4,7 +4,7 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Categories!"/>
 
-<inp2:m_include t="categories/categories_tabs"/>
+<inp2:m_include t="in-portal/categories/categories_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_relations" module="in-portal" icon="icon46_catalog"/>
 
@@ -23,9 +23,9 @@
 							submit_event('c','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('c', '<inp2:c_PrevId/>');
 						}
@@ -34,54 +34,54 @@
 							go_to_id('c', '<inp2:c_NextId/>');
 						}
 				 ) );
-				 
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-				
+
 				//Relations related:
 				a_toolbar.AddButton( new ToolBarButton('new_relation', '<inp2:m_phrase label="la_ToolTip_New_Relation" escape="1"/>',
 						function() {
 							openSelector('c-rel', '<inp2:adm_SelectorLink prefix="c-rel" selection_mode="single" tab_prefixes="all"/>', 'TargetId', '950x600');
 						} ) );
-										
+
 				function edit()
 	  			{
-	  				std_edit_temp_item('c-rel', 'categories/relations_edit');
+	  				std_edit_temp_item('c-rel', 'in-portal/categories/relations_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('c-rel')
 						} ) );
-				
-				
+
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
 							submit_event('c-rel','OnMassApprove');
 						}
 				 ) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
 							submit_event('c-rel','OnMassDecline');
 						}
-				 ) ); 
-						
+				 ) );
+
 				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 prefix="c" function="IsSingle"/>
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					//a_toolbar.HideButton('sep2');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if prefix="c" function="IsLast"/>
 						a_toolbar.DisableButton('next');
 					<inp2:m_endif/>
Index: trunk/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -r6583 -r6669
--- trunk/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 6583)
+++ trunk/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 6669)
@@ -14,9 +14,9 @@
 	<tr>
 	  	<td>
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
-	  		<script type="text/javascript" src="incs/fw_menu.js"></script>
-	  		<script type="text/javascript" src="incs/ajax.js"></script>
-	  		<script type="text/javascript" src="incs/catalog.js"></script>
+	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/fw_menu.js"></script>
+	  		<script type="text/javascript" src="js/ajax.js"></script>
+	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
 	  		<script type="text/javascript">
 	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 	  			var $is_catalog = true;
@@ -36,7 +36,7 @@
 					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 					a_toolbar.AddButton( new ToolBarButton('new_cat', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>', function() {
-								std_precreate_item('c', 'categories/categories_edit');
+								std_precreate_item('c', 'in-portal/categories/categories_edit');
 							}
 					 	) );
 
@@ -45,7 +45,7 @@
 							var $edit_url = '<inp2:m_t t="#TEMPLATE#" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c" no_amp="1"/>';
 							var $category_id = get_hidden_field('m_cat_id');
 							var $redirect_url = $edit_url.replace('#CATEGORY_ID#', $category_id);
-							$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id > 0 ? 'categories/categories_edit' : 'categories/categories_edit_permissions');
+							$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id > 0 ? 'in-portal/categories/categories_edit' : 'in-portal/categories/categories_edit_permissions');
 							redirect($redirect_url);
 							}
 						) );
@@ -88,7 +88,7 @@
 				 	) );
 
 				 	a_toolbar.AddButton( new ToolBarButton('rebuild_cache', '<inp2:m_phrase label="la_ToolTip_RebuildCategoryCache" escape="1"/>', function() {
-				 			redirect('<inp2:m_t t="categories/cache_updater" pass="m"/>');
+				 			redirect('<inp2:m_t t="in-portal/categories/cache_updater" pass="m"/>');
 						}
 				 	) );
 
@@ -168,7 +168,7 @@
 		</tr>
 </table>
 
-<inp2:m_set t="xml/categories_list"/>
+<inp2:m_set t="in-portal/xml/categories_list"/>
 <inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
 <table class="toolbar" cellspacing="0" cellpadding="2" width="100%" border="0" class="tableborder_full_a">
 	<tr bgcolor="#e0e0da" height="20">
@@ -194,9 +194,9 @@
 	</tr>
 </table>
 
-<div id="categories_div" prefix="c" view_template="xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
+<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="in-portal/categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
-<inp2:m_set t="catalog"/>
+<inp2:m_set t="in-portal/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
 <!-- categories list: end -->
 
Index: trunk/core/admin_templates/img/itemtabs/tab_left.gif
===================================================================
diff -u
Binary files differ
Index: trunk/core/admin_templates/categories/categories_edit_properties.tpl
===================================================================
diff -u -r5558 -r6669
--- trunk/core/admin_templates/categories/categories_edit_properties.tpl	(.../categories_edit_properties.tpl)	(revision 5558)
+++ trunk/core/admin_templates/categories/categories_edit_properties.tpl	(.../categories_edit_properties.tpl)	(revision 6669)
@@ -5,7 +5,7 @@
 
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Categories!"/>
 
-<inp2:m_include t="categories/categories_tabs"/>
+<inp2:m_include t="in-portal/categories/categories_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_properties" module="in-portal" icon="icon46_catalog"/>
 
Index: trunk/core/admin_templates/categories/xml/categories_list.tpl
===================================================================
diff -u -r6583 -r6669
--- trunk/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 6583)
+++ trunk/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 6669)
@@ -42,8 +42,8 @@
 </inp2:m_if>
 $Catalog.reflectPasteButton(<inp2:c_HasClipboard/>);
 #separator#
-<inp2:c_UpdateLastTemplate template="catalog"/>
-<inp2:m_include t="categories/ci_blocks"/>
+<inp2:c_UpdateLastTemplate template="in-portal/catalog"/>
+<inp2:m_include t="in-portal/categories/ci_blocks"/>
 <br />
 <table border="0" width="100%">
 	<inp2:m_DefineElement name="category_td">
Index: trunk/kernel/admin_templates/img/itemtabs/tab_right.gif
===================================================================
diff -u -r4996 -r6669
Binary files differ
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/in-portal.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/core/admin_templates/img/tree/ftv2lastnode.gif
===================================================================
diff -u
Binary files differ
Index: trunk/core/admin_templates/img/list_arrow_asc.gif
===================================================================
diff -u
Binary files differ
Index: trunk/kernel/admin_templates/categories/cache_updater.tpl
===================================================================
diff -u -r5514 -r6669
--- trunk/kernel/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 5514)
+++ trunk/kernel/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 6669)
@@ -4,10 +4,10 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Categories!"/>
-	
+
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_update" module="in-portal" icon="icon46_catalog"/>
-	
-<inp2:m_if check="c_InitCacheUpdater" destination_template="catalog">
+
+<inp2:m_if check="c_InitCacheUpdater" destination_template="in-portal/catalog">
 	<table width="100%" border="0" cellspacing="0" cellpadding="2" class="tableborder">
 	    <tr>
 			<td align="center" colspan="3" bgcolor="#FFFFFF">
@@ -32,14 +32,14 @@
 		</tr>
 	</table>
 <inp2:m_else/>
-	<script type="text/javascript" src="incs/ajax.js"></script>
+	<script type="text/javascript" src="js/ajax.js"></script>
 	<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
 	<script type="text/javascript">
 		function cancel_action() {
-			redirect('<inp2:m_t t="catalog" pass="m"/>');
+			redirect('<inp2:m_t t="in-portal/catalog" pass="m"/>');
 		}
-		
-		$CacheUpdater = new AjaxProgressBar('<inp2:m_t t="xml/cache_updater" continue="2" no_amp="1"/>');
+
+		$CacheUpdater = new AjaxProgressBar('<inp2:m_t t="in-portal/xml/cache_updater" continue="2" no_amp="1"/>');
 	</script>
 </inp2:m_if>
 
Index: trunk/kernel/admin_templates/img/tabnav_back.gif
===================================================================
diff -u -r1566 -r6669
Binary files differ
Index: trunk/core/admin_templates/categories/images_edit.tpl
===================================================================
diff -u -r5320 -r6669
--- trunk/core/admin_templates/categories/images_edit.tpl	(.../images_edit.tpl)	(revision 5320)
+++ trunk/core/admin_templates/categories/images_edit.tpl	(.../images_edit.tpl)	(revision 6669)
@@ -1,7 +1,7 @@
 <inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
 <inp2:m_include t="incs/header" nobody="yes"/>
 
-<inp2:m_include t="incs/image_blocks"/>
+<inp2:m_include t="in-portal/incs/image_blocks"/>
 
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" title="!la_Text_Categories!"/>
@@ -23,7 +23,7 @@
 							submit_event('c-img','OnCancel');
 						}
 				 ) );
-				
+
 				a_toolbar.Render();
 			</script>
 		</td>
@@ -35,18 +35,18 @@
 	<inp2:m_ParseBlock name="subsection" title="!la_section_Image!"/>
 		<inp2:m_ParseBlock name="inp_edit_hidden" prefix="c-img" field="ResourceId"/>
 		<inp2:m_ParseBlock name="inp_label" prefix="c-img" field="ImageId" title="!la_fld_ImageId!"/>
-		
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="c-img" field="Name" title="!la_fld_Name!" size="40"/>		
+
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c-img" field="Name" title="!la_fld_Name!" size="40"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="c-img" field="AltName" title="!la_fld_AltValue!" size="40"/>
-		
+
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="c-img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="c-img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="c-img" field="Priority" title="!la_fld_Priority!" size="5"/>	
-		
-	<inp2:m_ParseBlock name="subsection" title="!la_section_ThumbnailImage!"/>		
-		<inp2:m_ParseBlock name="thumbnail_section" prefix="c-img"/>		
-		
-	<inp2:m_ParseBlock name="subsection" title="!la_section_FullSizeImage!"/>		
+		<inp2:m_ParseBlock name="inp_edit_box" prefix="c-img" field="Priority" title="!la_fld_Priority!" size="5"/>
+
+	<inp2:m_ParseBlock name="subsection" title="!la_section_ThumbnailImage!"/>
+		<inp2:m_ParseBlock name="thumbnail_section" prefix="c-img"/>
+
+	<inp2:m_ParseBlock name="subsection" title="!la_section_FullSizeImage!"/>
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="c-img" field="SameImages" title="!la_fld_SameAsThumb!" onchange="toggle_fullsize()"/>
 		<inp2:m_ParseBlock name="fullsize_section" prefix="c-img"/>
 </table>
Index: trunk/kernel/admin_templates/popups/translator.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/kernel/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 6093)
+++ trunk/kernel/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 6669)
@@ -17,12 +17,12 @@
 <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />
 <link rel="stylesheet" rev="stylesheet" href="incs/style.css" type="text/css" />
 
-<script language="javascript" src="incs/is.js"></script>
-<script language="javascript" src="incs/script.js"></script>
-<script language="javascript" src="incs/in-portal.js"></script>
-<script language="javascript" src="incs/toolbar.js"></script>
-<script language="javascript" src="incs/grid.js"></script>
-<script language="javascript" src="incs/tabs.js"></script>
+<script language="javascript" src="js/is.js"></script>
+<script language="javascript" src="js/script.js"></script>
+<script language="javascript" src="js/in-portal.js"></script>
+<script language="javascript" src="js/toolbar.js"></script>
+<script language="javascript" src="js/grid.js"></script>
+<script language="javascript" src="js/tabs.js"></script>
 <script language="javascript">
 var t = '<inp2:m_get param="t"/>';
 var popups = '1';
Index: trunk/core/admin_templates/img/list_arrow_no.gif
===================================================================
diff -u
Binary files differ
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/tree.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/kernel/admin_templates/custom_fields/custom_fields_list.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/kernel/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 6093)
+++ trunk/kernel/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 6669)
@@ -15,36 +15,36 @@
   			//do not rename - this function is used in default grid for double click!
   			function edit()
   			{
-  				std_edit_item('cf', 'custom_fields/custom_fields_edit');
+  				std_edit_item('cf', 'in-portal/custom_fields/custom_fields_edit');
   			}
-  		
+
   			var a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_CustomField" escape="1"/>',
 						function() {
-							std_precreate_item('cf', 'custom_fields/custom_fields_edit')
+							std_precreate_item('cf', 'in-portal/custom_fields/custom_fields_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('cf')
 						} ) );
-				
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 				<inp2:m_if check="m_isDebugMode">
-					
+
 					a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>',
 						function() {
 							submit_event('cf', 'OnMassClone')
 						} ) );
-						
+
 					a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-				</inp2:m_if> 
+				</inp2:m_if>
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
-				
+
 				a_toolbar.Render();
 			</script>
 		</td>
Index: trunk/core/admin_templates/js/catalog.js
===================================================================
diff -u -r6583 -r6669
--- trunk/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 6583)
+++ trunk/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 6669)
@@ -150,7 +150,7 @@
 	this.resetTabs(false);
 
 	// query sub categories of $cat_id
-	var $url = this.URLMask.replace('#TEMPLATE_NAME#', 'xml/categories_list').replace('#CATEGORY_ID#', $cat_id);
+	var $url = this.URLMask.replace('#TEMPLATE_NAME#', 'in-portal/xml/categories_list').replace('#CATEGORY_ID#', $cat_id);
 
 	var $prefix = this.TabRegistry[0]['prefix'];
 	var $tab_id = this.TabRegistry[0]['tab_id'];
@@ -234,7 +234,7 @@
 	this.TabRegistry[$index]['tab_id'] = $tab_id;
 	this.TabRegistry[$index]['prefix'] = $tab.getAttribute('prefix');
 	if ($tab_id == 'categories') {
-		this.TabRegistry[$index]['module_path'] = '';
+		this.TabRegistry[$index]['module_path'] = 'in-portal/';
 	}
 	else {
 		this.TabRegistry[$index]['module_path'] = $tab.getAttribute('edit_template').substring(0, $tab.getAttribute('edit_template').indexOf('/'));
@@ -248,8 +248,10 @@
 // allows to get any information about tab
 Catalog.prototype.queryTabRegistry = function($search_key, $search_value, $return_key) {
 	var $i = 0;
+//	alert('looking in '+$search_key+' for '+$search_value+' will return '+$return_key)
 	while ($i < this.TabRegistry.length) {
 		if (this.TabRegistry[$i][$search_key] == $search_value) {
+//			alert('got '+this.TabRegistry[$i][$return_key])
 			return this.TabRegistry[$i][$return_key];
 			break;
 		}
Index: trunk/kernel/admin_templates/categories/categories_edit_permissions.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/kernel/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 6093)
+++ trunk/kernel/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 6669)
@@ -4,7 +4,7 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF" onload="$PermManager.Init();">
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="la_title_Categories"/>
 
-<inp2:m_include t="categories/categories_tabs"/>
+<inp2:m_include t="in-portal/categories/categories_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_permissions" module="in-portal" icon="icon46_catalog"/>
 
@@ -13,26 +13,26 @@
 <tbody>
 	<tr>
   	<td>
-  		<script type="text/javascript" src="incs/ajax.js"></script>
-	  	<script type="text/javascript" src="incs/catalog.js"></script>
+  		<script type="text/javascript" src="js/ajax.js"></script>
+	  	<script type="text/javascript" src="js/catalog.js"></script>
   		<script type="text/javascript">
   				Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 
 				Catalog.prototype.AfterInit = function () {
 					Grids['g'].SelectFirst();
 				}
-				
+
 				Catalog.prototype.go_to_group = function($group_id) {
 					if (!isset($group_id)) {
 						$group_id = 0; // gets current group
 					}
 					else {
 						set_hidden_field('current_group_id', $group_id);
 					}
-					
+
 					this.switchTab(); // refresh current item tab
 				}
-				
+
   				Catalog.prototype.refreshTab = function($prefix, $div_id, $force) {
 					var $group_id = get_hidden_field('current_group_id');
 //					alert('refreshTab. GroupID: '+$group_id);
@@ -41,14 +41,14 @@
 						// query tab content only in case if not queried or category don't match
 						var $url = this.URLMask.replace('#ITEM_PREFIX#', $prefix).replace('#GROUP_ID#', $group_id);
 						this.BusyRequest[$prefix] = false;
-						
+
 						Request.makeRequest($url, this.BusyRequest[$prefix], $div_id, this.successCallback, this.errorCallback, $div_id, this);
 					}
 					/*else {
 						alert('refresh disabled = {tab: '+this.ActivePrefix+'; group_id: '+$group_id+'}');
 					}*/
 				}
-  				
+
 				// adds information about tab to tab_registry
 				Catalog.prototype.registerTab = function($tab_id) {
 					var $tab = document.getElementById($tab_id + '_div');
@@ -64,15 +64,15 @@
 					var $prev_template = get_hidden_field('t');
 					if (isset($event)) set_hidden_field('events[' + $prefix_special + ']', $event);
 					if (isset($t)) set_hidden_field('t', $t);
-				
+
 					var $tab_id = this.queryTabRegistry('prefix', this.ActivePrefix, 'tab_id');
 					this.submit_kernel_form();
-					
+
 					set_hidden_field('t', $prev_template);
 				}
 
-	  			var $PermManager = new Catalog('<inp2:m_Link template="categories/permissions_tab" item_prefix="#ITEM_PREFIX#" group_id="#GROUP_ID#" no_amp="1" pass="m,c"/>', 'permmanager_', 0);
-	  			
+	  			var $PermManager = new Catalog('<inp2:m_Link template="in-portal/categories/permissions_tab" item_prefix="#ITEM_PREFIX#" group_id="#GROUP_ID#" no_amp="1" pass="m,c"/>', 'permmanager_', 0);
+
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('c','<inp2:c_SaveEvent/>');
@@ -82,9 +82,9 @@
 							submit_event('c','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('c', '<inp2:c_PrevId/>');
 						}
@@ -93,30 +93,30 @@
 							go_to_id('c', '<inp2:c_NextId/>');
 						}
 				 ) );
-				
+
 				function edit(){ }
-				
+
 				a_toolbar.Render();
-				
+
 				<inp2:m_if check="c_IsSingle">
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if check="c_IsLast">
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
 					<inp2:m_if check="c_IsFirst">
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
-				</inp2:m_if>	
+				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
 </tbody>
 </table>
-	
-<inp2:c_SaveWarning name="grid_save_warning"/>	
+
+<inp2:c_SaveWarning name="grid_save_warning"/>
 <inp2:m_ParseBlock name="grid" PrefixSpecial="g" IdField="GroupId" per_page="-1" grid="Radio" header_block="grid_column_title_no_sorting"/>
 <br />
 <!-- item tabs: begin -->
@@ -137,57 +137,56 @@
 						</td>
 						<td style="background-color: #FFFFFF;">
 							<img src="img/spacer.gif" height="1" width="5" />
-						</td>	
+						</td>
 					</tr>
 				</table>
-				
+
 			</td>
 		</inp2:m_DefineElement>
 		<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="PermTabText"/>
 	</tr>
 </table>
 <!-- item tabs: end -->
 
-<inp2:c-perm_PrintTabs template="categories/permissions_tab" tab_init="1"/>
+<inp2:c-perm_PrintTabs template="in-portal/categories/permissions_tab" tab_init="1"/>
 
 <inp2:m_include t="incs/footer"/>
 
 <script type="text/javascript">
 	Grids['g'].OnSelect = function ($id) {
 		$PermManager.go_to_group($id);
 	}
-	
+
 	Grids['g'].OnUnSelect = function ($id) {
 		set_hidden_field('group_id', $id);
 		set_hidden_field('item_prefix', $PermManager.ActivePrefix);
-		$PermManager.submit_event('c', 'OnPreSave', 'categories/permissions_tab');
+		$PermManager.submit_event('c', 'OnPreSave', 'in-portal/categories/permissions_tab');
 	}
-	
+
 	Grids['g'].SelectFirst = function () {
 		for (var $i in this.Items) {
 			this.Items[$i].Select();
 			break;
 		}
 	}
-	
+
 	Grids['g'].RadioMode = true;
-	
+
 	function update_light(perm_name, value)
 	{
 		document.getElementById('light_'+perm_name).src = 'img/perm_' + (value ? 'green' : 'red') + '.gif';
 	}
-	
+
 	function inherited_click(perm_name, inherited_value, state, access_cb_id)
 	{
 		if (state) {
 			update_light(perm_name, inherited_value);
 			document.getElementById(access_cb_id).disabled = true;
 		}
 		else {
-			update_light(perm_name, document.getElementById(access_cb_id).checked) 
+			update_light(perm_name, document.getElementById(access_cb_id).checked)
 			document.getElementById(access_cb_id).disabled = false;
 		}
 	}
 </script>
 
-		
\ No newline at end of file
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/head.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/login.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/kernel/admin_templates/item_selector/item_selector_advanced_view.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/kernel/admin_templates/item_selector/item_selector_advanced_view.tpl	(.../item_selector_advanced_view.tpl)	(revision 6093)
+++ trunk/kernel/admin_templates/item_selector/item_selector_advanced_view.tpl	(.../item_selector_advanced_view.tpl)	(revision 6669)
@@ -5,7 +5,7 @@
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_advanced_view" module="in-portal" title="!la_title_AdvancedView!"/>
 
 <inp2:m_set ts="showall" td="no"/>
-<inp2:m_include t="item_selector/item_selector_tabs"/>
+<inp2:m_include t="in-portal/item_selector/item_selector_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="advanced_view" module="in-portal"/>
 
@@ -17,12 +17,12 @@
 	<tr>
 	  	<td>
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
-	  		<inp2:m_include t="item_selector/item_selector_toolbar" is_catalog="0"/>
+	  		<inp2:m_include t="in-portal/item_selector/item_selector_toolbar" is_catalog="0"/>
 	  		<script type="text/javascript">
 	  			Catalog.prototype.AfterInit = function() {
 	  				this.switchTab();
 	  			}
-	  			
+
 	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" pass_through="ts,td,tm" ts="showall" td="no" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'is_advanced_view_', 0);
 			</script>
 		</td>
@@ -52,19 +52,19 @@
 						</td>
 						<td style="background-color: #FFFFFF;">
 							<img src="img/spacer.gif" height="1" width="5" />
-						</td>	
+						</td>
 					</tr>
 				</table>
 			</td>
 		</inp2:m_DefineElement>
-		
+
 		<inp2:m_DefineElement name="tab_headers">
 			<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="ViewMenuPhrase" replace_m="yes" skip_prefixes="$skip_prefixes"/>
 		</inp2:m_DefineElement>
-		
+
 		<inp2:c_InitCatalog render_as="tab_headers"/>
-		
-		
+
+
 	</tr>
 </table>
 <!-- item tabs: end -->
Index: trunk/core/admin_templates/img/tree/ftv2vertline.gif
===================================================================
diff -u
Binary files differ
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/incs/grid_blocks.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/kernel/admin_templates/img/ajax_progress.gif
===================================================================
diff -u -r4996 -r6669
Binary files differ
Index: trunk/kernel/admin_templates/incs/catalog.js
===================================================================
diff -u -r6583 -r6669
--- trunk/kernel/admin_templates/incs/catalog.js	(.../catalog.js)	(revision 6583)
+++ trunk/kernel/admin_templates/incs/catalog.js	(.../catalog.js)	(revision 6669)
@@ -150,7 +150,7 @@
 	this.resetTabs(false);
 
 	// query sub categories of $cat_id
-	var $url = this.URLMask.replace('#TEMPLATE_NAME#', 'xml/categories_list').replace('#CATEGORY_ID#', $cat_id);
+	var $url = this.URLMask.replace('#TEMPLATE_NAME#', 'in-portal/xml/categories_list').replace('#CATEGORY_ID#', $cat_id);
 
 	var $prefix = this.TabRegistry[0]['prefix'];
 	var $tab_id = this.TabRegistry[0]['tab_id'];
@@ -234,7 +234,7 @@
 	this.TabRegistry[$index]['tab_id'] = $tab_id;
 	this.TabRegistry[$index]['prefix'] = $tab.getAttribute('prefix');
 	if ($tab_id == 'categories') {
-		this.TabRegistry[$index]['module_path'] = '';
+		this.TabRegistry[$index]['module_path'] = 'in-portal/';
 	}
 	else {
 		this.TabRegistry[$index]['module_path'] = $tab.getAttribute('edit_template').substring(0, $tab.getAttribute('edit_template').indexOf('/'));
@@ -248,8 +248,10 @@
 // allows to get any information about tab
 Catalog.prototype.queryTabRegistry = function($search_key, $search_value, $return_key) {
 	var $i = 0;
+//	alert('looking in '+$search_key+' for '+$search_value+' will return '+$return_key)
 	while ($i < this.TabRegistry.length) {
 		if (this.TabRegistry[$i][$search_key] == $search_value) {
+//			alert('got '+this.TabRegistry[$i][$return_key])
 			return this.TabRegistry[$i][$return_key];
 			break;
 		}
Index: trunk/core/admin_templates/categories/categories_edit_relations.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/core/admin_templates/categories/categories_edit_relations.tpl	(.../categories_edit_relations.tpl)	(revision 6093)
+++ trunk/core/admin_templates/categories/categories_edit_relations.tpl	(.../categories_edit_relations.tpl)	(revision 6669)
@@ -4,7 +4,7 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Categories!"/>
 
-<inp2:m_include t="categories/categories_tabs"/>
+<inp2:m_include t="in-portal/categories/categories_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_relations" module="in-portal" icon="icon46_catalog"/>
 
@@ -23,9 +23,9 @@
 							submit_event('c','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('c', '<inp2:c_PrevId/>');
 						}
@@ -34,54 +34,54 @@
 							go_to_id('c', '<inp2:c_NextId/>');
 						}
 				 ) );
-				 
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-				
+
 				//Relations related:
 				a_toolbar.AddButton( new ToolBarButton('new_relation', '<inp2:m_phrase label="la_ToolTip_New_Relation" escape="1"/>',
 						function() {
 							openSelector('c-rel', '<inp2:adm_SelectorLink prefix="c-rel" selection_mode="single" tab_prefixes="all"/>', 'TargetId', '950x600');
 						} ) );
-										
+
 				function edit()
 	  			{
-	  				std_edit_temp_item('c-rel', 'categories/relations_edit');
+	  				std_edit_temp_item('c-rel', 'in-portal/categories/relations_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('c-rel')
 						} ) );
-				
-				
+
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
 							submit_event('c-rel','OnMassApprove');
 						}
 				 ) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
 							submit_event('c-rel','OnMassDecline');
 						}
-				 ) ); 
-						
+				 ) );
+
 				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 prefix="c" function="IsSingle"/>
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					//a_toolbar.HideButton('sep2');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if prefix="c" function="IsLast"/>
 						a_toolbar.DisableButton('next');
 					<inp2:m_endif/>
Index: trunk/kernel/admin_templates/categories/categories_edit_custom.tpl
===================================================================
diff -u -r5272 -r6669
--- trunk/kernel/admin_templates/categories/categories_edit_custom.tpl	(.../categories_edit_custom.tpl)	(revision 5272)
+++ trunk/kernel/admin_templates/categories/categories_edit_custom.tpl	(.../categories_edit_custom.tpl)	(revision 6669)
@@ -4,7 +4,7 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="la_title_Categories"/>
 
-<inp2:m_include t="categories/categories_tabs"/>
+<inp2:m_include t="in-portal/categories/categories_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_custom" module="in-portal" icon="icon46_catalog"/>
 
@@ -23,9 +23,9 @@
 							submit_event('c','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('c', '<inp2:c_PrevId/>');
 						}
@@ -34,31 +34,30 @@
 							go_to_id('c', '<inp2:c_NextId/>');
 						}
 				 ) );
-				
+
 				function edit(){ }
-				
+
 				a_toolbar.Render();
-				
+
 				<inp2:m_if check="c_IsSingle">
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if check="c_IsLast">
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
 					<inp2:m_if check="c_IsFirst">
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
-				</inp2:m_if>	
+				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
 </tbody>
 </table>
 
-<inp2:m_include t="incs/custom_blocks"/>
+<inp2:m_include t="in-portal/incs/custom_blocks"/>
 <inp2:m_ParseBlock 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"/>
-		
\ No newline at end of file
Index: trunk/core/admin_templates/img/itemtabs/tab_right.gif
===================================================================
diff -u
Binary files differ
Index: trunk/kernel/units/categories/categories_config.php
===================================================================
diff -u -r6583 -r6669
--- trunk/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 6583)
+++ trunk/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 6669)
@@ -108,8 +108,8 @@
 																							'parent'		=>	'in-portal:site',
 																							'icon'			=>	'catalog',
 																							'label'			=>	'la_tab_Browse',
-																							'url'			=>	Array('t' => 'catalog', 'pass' => 'm'),
-																							'late_load'		=>	Array('t' => 'xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
+																							'url'			=>	Array('t' => 'in-portal/catalog', 'pass' => 'm'),
+																							'late_load'		=>	Array('t' => 'in-portal/xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
 																							'onclick'		=>	'checkCatalog(0)',
 																							'permissions'	=>	Array('view'),
 																							'priority'		=>	0.1,
@@ -119,7 +119,7 @@
 																							'parent'		=>	'in-portal:site',
 																							'icon'			=>	'advanced_view',
 																							'label'			=>	'la_tab_AdvancedView',
-																							'url'			=>	Array('t' => 'advanced_view', 'pass' => 'm'),
+																							'url'			=>	Array('t' => 'in-portal/advanced_view', 'pass' => 'm'),
 																							'permissions'	=>	Array('view'),
 																							'priority'		=>	0.2,
 																							'type'			=>	stTREE,
@@ -169,7 +169,7 @@
 																									'parent'		=>	'in-portal:site',
 																									'icon'			=>	'settings_search',
 																									'label'			=>	'la_tab_ConfigSearch',
-																									'url'			=>	Array('t' => 'config/config_search', 'module_key' => 'category', 'pass_section' => true, 'pass' => 'm'),
+																									'url'			=>	Array('t' => 'in-portal/config/config_search', 'module_key' => 'category', 'pass_section' => true, 'pass' => 'm'),
 																									'permissions'	=>	Array('view', 'edit'),
 																									'priority'		=>	5,
 																									'type'			=>	stTREE,
@@ -179,7 +179,7 @@
 																									'parent'		=>	'in-portal:site',
 																									'icon'			=>	'settings_email',
 																									'label'			=>	'la_tab_ConfigE-mail',
-																									'url'			=>	Array('t' => 'config/config_email', 'module' => 'In-Portal:Category', 'pass_section' => true, 'pass' => 'm'),
+																									'url'			=>	Array('t' => 'in-portal/config/config_email', 'module' => 'In-Portal:Category', 'pass_section' => true, 'pass' => 'm'),
 																									'permissions'	=>	Array('view', 'edit'),
 																									'priority'		=>	6,
 																									'type'			=>	stTREE,
@@ -189,7 +189,7 @@
 																									'parent'		=>	'in-portal:site',
 																									'icon'			=>	'settings_custom',
 																									'label'			=>	'la_tab_ConfigCustom',
-																									'url'			=>	Array('t' => 'custom_fields/custom_fields_list', 'cf_type' => 1, 'pass_section' => true, 'pass' => 'm,cf'),
+																									'url'			=>	Array('t' => 'in-portal/custom_fields/custom_fields_list', 'cf_type' => 1, 'pass_section' => true, 'pass' => 'm,cf'),
 																									'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
 																									'priority'		=>	7,
 																									'type'			=>	stTREE,
Index: trunk/kernel/admin_templates/categories/categories_edit_images.tpl
===================================================================
diff -u -r5320 -r6669
--- trunk/kernel/admin_templates/categories/categories_edit_images.tpl	(.../categories_edit_images.tpl)	(revision 5320)
+++ trunk/kernel/admin_templates/categories/categories_edit_images.tpl	(.../categories_edit_images.tpl)	(revision 6669)
@@ -1,12 +1,12 @@
 <inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
 <inp2:m_include t="incs/header" nobody="yes"/>
 
-<inp2:m_include t="incs/image_blocks"/>
+<inp2:m_include t="in-portal/incs/image_blocks"/>
 
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" title="!la_title_Categories!"/>
 
-<inp2:m_include t="categories/categories_tabs"/>
+<inp2:m_include t="in-portal/categories/categories_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_images" module="in-portal" icon="icon46_catalog"/>
 
@@ -16,12 +16,12 @@
 	<tr>
   	<td>
   		<script type="text/javascript">
-				  		
+
   				function edit()
 	  			{
-	  				std_edit_temp_item('c-img', 'categories/images_edit');
+	  				std_edit_temp_item('c-img', 'in-portal/categories/images_edit');
 	  			}
-  		  		
+
   				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('c','<inp2:c_SaveEvent/>');
@@ -31,9 +31,9 @@
 							submit_event('c','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('c', '<inp2:c_PrevId/>');
 						}
@@ -42,53 +42,53 @@
 							go_to_id('c', '<inp2:c_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('c-img', 'categories/images_edit')
+							std_new_item('c-img', 'in-portal/categories/images_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('c-img')
-						} ) );				
-				
-				a_toolbar.AddButton( new ToolBarSeparator('sep3') ); 
-				
+						} ) );
+
+				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('c-img','OnMassMoveUp');
 						}
 				 ) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
 							submit_event('c-img','OnMassMoveDown');
 						}
 				 ) );
-				 
+
 				 a_toolbar.AddButton( new ToolBarButton('primary_image', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
 							submit_event('c-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 prefix="c" function="IsSingle"/>
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if prefix="c" function="IsLast"/>
 						a_toolbar.DisableButton('next');
 					<inp2:m_endif/>
Index: trunk/core/admin_templates/categories/cache_updater.tpl
===================================================================
diff -u -r5514 -r6669
--- trunk/core/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 5514)
+++ trunk/core/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 6669)
@@ -4,10 +4,10 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Categories!"/>
-	
+
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_update" module="in-portal" icon="icon46_catalog"/>
-	
-<inp2:m_if check="c_InitCacheUpdater" destination_template="catalog">
+
+<inp2:m_if check="c_InitCacheUpdater" destination_template="in-portal/catalog">
 	<table width="100%" border="0" cellspacing="0" cellpadding="2" class="tableborder">
 	    <tr>
 			<td align="center" colspan="3" bgcolor="#FFFFFF">
@@ -32,14 +32,14 @@
 		</tr>
 	</table>
 <inp2:m_else/>
-	<script type="text/javascript" src="incs/ajax.js"></script>
+	<script type="text/javascript" src="js/ajax.js"></script>
 	<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
 	<script type="text/javascript">
 		function cancel_action() {
-			redirect('<inp2:m_t t="catalog" pass="m"/>');
+			redirect('<inp2:m_t t="in-portal/catalog" pass="m"/>');
 		}
-		
-		$CacheUpdater = new AjaxProgressBar('<inp2:m_t t="xml/cache_updater" continue="2" no_amp="1"/>');
+
+		$CacheUpdater = new AjaxProgressBar('<inp2:m_t t="in-portal/xml/cache_updater" continue="2" no_amp="1"/>');
 	</script>
 </inp2:m_if>
 
Index: trunk/kernel/admin_templates/img/list_arrow_2_desc.gif
===================================================================
diff -u -r1566 -r6669
Binary files differ
Index: trunk/core/kernel/parser/template.php
===================================================================
diff -u -r6583 -r6669
--- trunk/core/kernel/parser/template.php	(.../template.php)	(revision 6583)
+++ trunk/core/kernel/parser/template.php	(.../template.php)	(revision 6669)
@@ -98,7 +98,7 @@
 		if (isset($this->Application->ReplacementTemplates[$filename])) {
 			$filename = $this->Application->ReplacementTemplates[$filename];
 		}
-		
+
 		if (preg_match('#^[\/]{0,1}([^\/]*)\/(.*)#', $filename, $regs)) {
 			$module_filename = $regs[2];
 			$first_dir = $regs[1];
@@ -109,6 +109,9 @@
 		}
 
 		if ( $this->Application->IsAdmin() && $this->Application->findModule('Name', $first_dir)) {
+			if ($first_dir == 'in-portal') {
+				$first_dir = 'kernel';
+			}
 			$path = MODULES_PATH.'/'.strtolower($first_dir).'/admin_templates';
 		}
 		else {
@@ -118,7 +121,7 @@
 
 		return Array ($path, $module_filename);
 	}
-	
+
 	function LoadTemplate($filename, $title=NULL, $silent=0)
 	{
 		list ($path, $module_filename) = $this->GetTemplatePaths($filename);
@@ -228,7 +231,7 @@
 			$dir = preg_replace('/^'.preg_quote($base_path.'/', '/').'/', '', $dir, 1);
 			$segments = explode('/', $dir);
 			$cur_path = $base_path;
-			
+
 			foreach ($segments as $segment) {
 				// do not add leading / for windows paths (c:\...)
 				$cur_path .= preg_match('/^[a-zA-Z]{1}:/', $segment) ? $segment : '/'.$segment;
Index: trunk/kernel/admin_templates/img/tabnav_left.gif
===================================================================
diff -u -r1566 -r6669
Binary files differ
Index: trunk/core/admin_templates/img/tabnav_back.gif
===================================================================
diff -u
Binary files differ
Index: trunk/core/admin_templates/categories/categories_edit_permissions.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/core/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 6093)
+++ trunk/core/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 6669)
@@ -4,7 +4,7 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF" onload="$PermManager.Init();">
 <inp2:m_ParseBlock name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="la_title_Categories"/>
 
-<inp2:m_include t="categories/categories_tabs"/>
+<inp2:m_include t="in-portal/categories/categories_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="c" title_preset="categories_permissions" module="in-portal" icon="icon46_catalog"/>
 
@@ -13,26 +13,26 @@
 <tbody>
 	<tr>
   	<td>
-  		<script type="text/javascript" src="incs/ajax.js"></script>
-	  	<script type="text/javascript" src="incs/catalog.js"></script>
+  		<script type="text/javascript" src="js/ajax.js"></script>
+	  	<script type="text/javascript" src="js/catalog.js"></script>
   		<script type="text/javascript">
   				Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 
 				Catalog.prototype.AfterInit = function () {
 					Grids['g'].SelectFirst();
 				}
-				
+
 				Catalog.prototype.go_to_group = function($group_id) {
 					if (!isset($group_id)) {
 						$group_id = 0; // gets current group
 					}
 					else {
 						set_hidden_field('current_group_id', $group_id);
 					}
-					
+
 					this.switchTab(); // refresh current item tab
 				}
-				
+
   				Catalog.prototype.refreshTab = function($prefix, $div_id, $force) {
 					var $group_id = get_hidden_field('current_group_id');
 //					alert('refreshTab. GroupID: '+$group_id);
@@ -41,14 +41,14 @@
 						// query tab content only in case if not queried or category don't match
 						var $url = this.URLMask.replace('#ITEM_PREFIX#', $prefix).replace('#GROUP_ID#', $group_id);
 						this.BusyRequest[$prefix] = false;
-						
+
 						Request.makeRequest($url, this.BusyRequest[$prefix], $div_id, this.successCallback, this.errorCallback, $div_id, this);
 					}
 					/*else {
 						alert('refresh disabled = {tab: '+this.ActivePrefix+'; group_id: '+$group_id+'}');
 					}*/
 				}
-  				
+
 				// adds information about tab to tab_registry
 				Catalog.prototype.registerTab = function($tab_id) {
 					var $tab = document.getElementById($tab_id + '_div');
@@ -64,15 +64,15 @@
 					var $prev_template = get_hidden_field('t');
 					if (isset($event)) set_hidden_field('events[' + $prefix_special + ']', $event);
 					if (isset($t)) set_hidden_field('t', $t);
-				
+
 					var $tab_id = this.queryTabRegistry('prefix', this.ActivePrefix, 'tab_id');
 					this.submit_kernel_form();
-					
+
 					set_hidden_field('t', $prev_template);
 				}
 
-	  			var $PermManager = new Catalog('<inp2:m_Link template="categories/permissions_tab" item_prefix="#ITEM_PREFIX#" group_id="#GROUP_ID#" no_amp="1" pass="m,c"/>', 'permmanager_', 0);
-	  			
+	  			var $PermManager = new Catalog('<inp2:m_Link template="in-portal/categories/permissions_tab" item_prefix="#ITEM_PREFIX#" group_id="#GROUP_ID#" no_amp="1" pass="m,c"/>', 'permmanager_', 0);
+
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('c','<inp2:c_SaveEvent/>');
@@ -82,9 +82,9 @@
 							submit_event('c','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('c', '<inp2:c_PrevId/>');
 						}
@@ -93,30 +93,30 @@
 							go_to_id('c', '<inp2:c_NextId/>');
 						}
 				 ) );
-				
+
 				function edit(){ }
-				
+
 				a_toolbar.Render();
-				
+
 				<inp2:m_if check="c_IsSingle">
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if check="c_IsLast">
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
 					<inp2:m_if check="c_IsFirst">
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
-				</inp2:m_if>	
+				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
 </tbody>
 </table>
-	
-<inp2:c_SaveWarning name="grid_save_warning"/>	
+
+<inp2:c_SaveWarning name="grid_save_warning"/>
 <inp2:m_ParseBlock name="grid" PrefixSpecial="g" IdField="GroupId" per_page="-1" grid="Radio" header_block="grid_column_title_no_sorting"/>
 <br />
 <!-- item tabs: begin -->
@@ -137,57 +137,56 @@
 						</td>
 						<td style="background-color: #FFFFFF;">
 							<img src="img/spacer.gif" height="1" width="5" />
-						</td>	
+						</td>
 					</tr>
 				</table>
-				
+
 			</td>
 		</inp2:m_DefineElement>
 		<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="PermTabText"/>
 	</tr>
 </table>
 <!-- item tabs: end -->
 
-<inp2:c-perm_PrintTabs template="categories/permissions_tab" tab_init="1"/>
+<inp2:c-perm_PrintTabs template="in-portal/categories/permissions_tab" tab_init="1"/>
 
 <inp2:m_include t="incs/footer"/>
 
 <script type="text/javascript">
 	Grids['g'].OnSelect = function ($id) {
 		$PermManager.go_to_group($id);
 	}
-	
+
 	Grids['g'].OnUnSelect = function ($id) {
 		set_hidden_field('group_id', $id);
 		set_hidden_field('item_prefix', $PermManager.ActivePrefix);
-		$PermManager.submit_event('c', 'OnPreSave', 'categories/permissions_tab');
+		$PermManager.submit_event('c', 'OnPreSave', 'in-portal/categories/permissions_tab');
 	}
-	
+
 	Grids['g'].SelectFirst = function () {
 		for (var $i in this.Items) {
 			this.Items[$i].Select();
 			break;
 		}
 	}
-	
+
 	Grids['g'].RadioMode = true;
-	
+
 	function update_light(perm_name, value)
 	{
 		document.getElementById('light_'+perm_name).src = 'img/perm_' + (value ? 'green' : 'red') + '.gif';
 	}
-	
+
 	function inherited_click(perm_name, inherited_value, state, access_cb_id)
 	{
 		if (state) {
 			update_light(perm_name, inherited_value);
 			document.getElementById(access_cb_id).disabled = true;
 		}
 		else {
-			update_light(perm_name, document.getElementById(access_cb_id).checked) 
+			update_light(perm_name, document.getElementById(access_cb_id).checked)
 			document.getElementById(access_cb_id).disabled = false;
 		}
 	}
 </script>
 
-		
\ No newline at end of file
Index: trunk/kernel/admin_templates/item_selector/item_selector_toolbar.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/kernel/admin_templates/item_selector/item_selector_toolbar.tpl	(.../item_selector_toolbar.tpl)	(revision 6093)
+++ trunk/kernel/admin_templates/item_selector/item_selector_toolbar.tpl	(.../item_selector_toolbar.tpl)	(revision 6669)
@@ -1,6 +1,6 @@
-<script type="text/javascript" src="incs/ajax.js"></script>
-<script type="text/javascript" src="incs/fw_menu.js"></script>
-<script type="text/javascript" src="incs/catalog.js"></script>
+<script type="text/javascript" src="js/ajax.js"></script>
+<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/fw_menu.js"></script>
+<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
 <script type="text/javascript">
 	Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 	var a_toolbar = new ToolBar();
Index: trunk/kernel/admin_templates/img/itemtabs/tab_middle.gif
===================================================================
diff -u -r4996 -r6669
Binary files differ
Index: trunk/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -r6583 -r6669
--- trunk/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 6583)
+++ trunk/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 6669)
@@ -14,9 +14,9 @@
 	<tr>
 	  	<td>
 	  		<input type="hidden" name="m_cat_id" value="<inp2:m_get name="m_cat_id"/>"/>
-	  		<script type="text/javascript" src="incs/fw_menu.js"></script>
-	  		<script type="text/javascript" src="incs/ajax.js"></script>
-	  		<script type="text/javascript" src="incs/catalog.js"></script>
+	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/fw_menu.js"></script>
+	  		<script type="text/javascript" src="js/ajax.js"></script>
+	  		<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
 	  		<script type="text/javascript">
 	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 	  			var $is_catalog = true;
@@ -36,7 +36,7 @@
 					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 					a_toolbar.AddButton( new ToolBarButton('new_cat', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>', function() {
-								std_precreate_item('c', 'categories/categories_edit');
+								std_precreate_item('c', 'in-portal/categories/categories_edit');
 							}
 					 	) );
 
@@ -45,7 +45,7 @@
 							var $edit_url = '<inp2:m_t t="#TEMPLATE#" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c" no_amp="1"/>';
 							var $category_id = get_hidden_field('m_cat_id');
 							var $redirect_url = $edit_url.replace('#CATEGORY_ID#', $category_id);
-							$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id > 0 ? 'categories/categories_edit' : 'categories/categories_edit_permissions');
+							$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id > 0 ? 'in-portal/categories/categories_edit' : 'in-portal/categories/categories_edit_permissions');
 							redirect($redirect_url);
 							}
 						) );
@@ -88,7 +88,7 @@
 				 	) );
 
 				 	a_toolbar.AddButton( new ToolBarButton('rebuild_cache', '<inp2:m_phrase label="la_ToolTip_RebuildCategoryCache" escape="1"/>', function() {
-				 			redirect('<inp2:m_t t="categories/cache_updater" pass="m"/>');
+				 			redirect('<inp2:m_t t="in-portal/categories/cache_updater" pass="m"/>');
 						}
 				 	) );
 
@@ -168,7 +168,7 @@
 		</tr>
 </table>
 
-<inp2:m_set t="xml/categories_list"/>
+<inp2:m_set t="in-portal/xml/categories_list"/>
 <inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
 <table class="toolbar" cellspacing="0" cellpadding="2" width="100%" border="0" class="tableborder_full_a">
 	<tr bgcolor="#e0e0da" height="20">
@@ -194,9 +194,9 @@
 	</tr>
 </table>
 
-<div id="categories_div" prefix="c" view_template="xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
+<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="in-portal/categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
-<inp2:m_set t="catalog"/>
+<inp2:m_set t="in-portal/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
 <!-- categories list: end -->
 
Index: trunk/core/admin_templates/categories/xml/cache_updater.tpl
===================================================================
diff -u -r5164 -r6669
--- trunk/core/admin_templates/categories/xml/cache_updater.tpl	(.../cache_updater.tpl)	(revision 5164)
+++ trunk/core/admin_templates/categories/xml/cache_updater.tpl	(.../cache_updater.tpl)	(revision 6669)
@@ -1 +1 @@
-<inp2:c_InitCacheUpdater destination_template="catalog" progress="1"/>
\ No newline at end of file
+<inp2:c_InitCacheUpdater destination_template="in-portal/catalog" progress="1"/>
\ No newline at end of file
Index: trunk/core/kernel/processors/main_processor.php
===================================================================
diff -u -r6656 -r6669
--- trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 6656)
+++ trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 6669)
@@ -35,6 +35,9 @@
 	{
 		if ($this->Application->IsAdmin()) {
 			$module = isset($params['module']) ? $params['module'] : 'core';
+			if ($module == 'in-portal') {
+				$module = 'kernel';
+			}
 			$path = preg_replace('/\/(.*?)\/(.*)/', $module.'/\\2', THEMES_PATH); // remove leading slash + substitute module
 		}
 		else {
@@ -554,7 +557,7 @@
 			$module_key = strtolower($module_name);
 
 			if ($module_name == 'In-Portal') {
-				$module_prefix = '';
+				$module_prefix = $this->Application->IsAdmin() ? 'in-portal/' : '';
 			}
 			else {
 				$module_prefix = $this->Application->IsAdmin() ? $module_key.'/' : $module_data['TemplatePath'].'/';
Fisheye: Tag 6669 refers to a dead (removed) revision in file `trunk/kernel/admin_templates/sections_list.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: trunk/kernel/admin_templates/img/list_arrow_desc.gif
===================================================================
diff -u -r1566 -r6669
Binary files differ
Index: trunk/core/admin_templates/catalog/item_selector/item_selector_tabs.tpl
===================================================================
diff -u -r6093 -r6669
--- trunk/core/admin_templates/catalog/item_selector/item_selector_tabs.tpl	(.../item_selector_tabs.tpl)	(revision 6093)
+++ trunk/core/admin_templates/catalog/item_selector/item_selector_tabs.tpl	(.../item_selector_tabs.tpl)	(revision 6669)
@@ -3,8 +3,8 @@
 	<td align="right" width="100%">
 	  	<table cellpadding="0" cellspacing="0" border="0" height="23">
 			<tr>
-				<inp2:m_ParseBlock name="tab_direct" title="la_tab_Browse" t="item_selector/item_selector_catalog" pass="all"/>
-				<inp2:m_ParseBlock name="tab_direct" title="la_tab_AdvancedView" t="item_selector/item_selector_advanced_view" pass="all"/>
+				<inp2:m_ParseBlock name="tab_direct" title="la_tab_Browse" t="in-portal/item_selector/item_selector_catalog" pass="all"/>
+				<inp2:m_ParseBlock name="tab_direct" title="la_tab_AdvancedView" t="in-portal/item_selector/item_selector_advanced_view" pass="all"/>
 			</tr>
 		</table>
 	</td>