Index: trunk/core/admin_templates/catalog_tab.tpl =================================================================== diff -u -N -r6669 -r6784 --- trunk/core/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 6669) +++ trunk/core/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 6784) @@ -27,7 +27,7 @@ _" width="50%"> radiocheckbox" name="" id=""> - ">  + img/itemicons/">  : Index: trunk/core/admin_templates/sections_list.tpl =================================================================== diff -u -N -r6669 -r6784 --- trunk/core/admin_templates/sections_list.tpl (.../sections_list.tpl) (revision 6669) +++ trunk/core/admin_templates/sections_list.tpl (.../sections_list.tpl) (revision 6784) @@ -11,8 +11,8 @@ img/icons/.gif" align="absmiddle" title="">  - img/icons/.gif" align="absmiddle" title="">  - + img/icons/.gif" align="absmiddle" title="">  + Index: trunk/kernel/admin_templates/incs/fw_menu.js =================================================================== diff -u -N -r5060 -r6784 --- trunk/kernel/admin_templates/incs/fw_menu.js (.../fw_menu.js) (revision 5060) +++ trunk/kernel/admin_templates/incs/fw_menu.js (.../fw_menu.js) (revision 6784) @@ -33,7 +33,7 @@ this.menuBorderBgColor = "#777777"; this.menuHiliteBgColor = "#e0e0da"; this.menuContainerBgColor = "#cccccc"; - this.imagePath = img_path.replace('#MODULE#', 'kernel'); + this.imagePath = img_path.replace('#MODULE#', 'core'); this.childMenuIcon = "menu_arrow.gif"; this.items = new Array(); this.actions = new Array(); Index: trunk/kernel/admin_templates/categories/ci_blocks.tpl =================================================================== diff -u -N -r6093 -r6784 --- trunk/kernel/admin_templates/categories/ci_blocks.tpl (.../ci_blocks.tpl) (revision 6093) +++ trunk/kernel/admin_templates/categories/ci_blocks.tpl (.../ci_blocks.tpl) (revision 6784) @@ -1,6 +1,6 @@ - .gif" title="" width="11" height="11" align="absmiddle" /> + img/ic_.gif" title="" width="11" height="11" align="absmiddle" /> Index: trunk/core/admin_templates/js/toolbar.js =================================================================== diff -u -N -r6703 -r6784 --- trunk/core/admin_templates/js/toolbar.js (.../toolbar.js) (revision 6703) +++ trunk/core/admin_templates/js/toolbar.js (.../toolbar.js) (revision 6784) @@ -28,6 +28,9 @@ // has module set directly this.Title = RegExp.$2; this.Module = RegExp.$1; + if (this.Module == 'in-portal') { + this.Module = 'kernel'; + } } else { // use default module Index: trunk/kernel/admin_templates/xml/tree_categories.tpl =================================================================== diff -u -N -r6669 -r6784 --- trunk/kernel/admin_templates/xml/tree_categories.tpl (.../tree_categories.tpl) (revision 6669) +++ trunk/kernel/admin_templates/xml/tree_categories.tpl (.../tree_categories.tpl) (revision 6784) @@ -1,6 +1,6 @@ - " icon="img/icons/icon24_catalog.gif" href="" onclick="checkCatalog()" load_url=""> + " icon="img/icons/icon24_catalog.gif" href="" onclick="checkCatalog()" load_url=""> Index: trunk/core/admin_templates/catalog/catalog.tpl =================================================================== diff -u -N -r6669 -r6784 --- trunk/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 6669) +++ trunk/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 6784) @@ -23,25 +23,25 @@ var $Catalog = new Catalog('', 'catalog_'); var a_toolbar = new ToolBar(); - a_toolbar.AddButton( new ToolBarButton('upcat', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:upcat', '', function() { $Catalog.go_to_cat($Catalog.ParentCategoryID); } ) ); - a_toolbar.AddButton( new ToolBarButton('homecat', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:homecat', '', function() { $Catalog.go_to_cat(0); } ) ); a_toolbar.AddButton( new ToolBarSeparator('sep1') ); - a_toolbar.AddButton( new ToolBarButton('new_cat', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:new_cat', '', function() { std_precreate_item('c', 'in-portal/categories/categories_edit'); } ) ); - a_toolbar.AddButton( new ToolBarButton('editcat', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:editcat', '', function() { var $edit_url = ''; var $category_id = get_hidden_field('m_cat_id'); var $redirect_url = $edit_url.replace('#CATEGORY_ID#', $category_id); @@ -76,7 +76,7 @@ a_toolbar.AddButton( new ToolBarSeparator('sep3') ); - a_toolbar.AddButton( new ToolBarButton('export', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:export', '', function() { var $export_prefixes = new Array('l', 'p'); if (in_array($Catalog.ActivePrefix, $export_prefixes)) { submit_event($Catalog.ActivePrefix, 'OnExport'); @@ -87,26 +87,26 @@ } ) ); - a_toolbar.AddButton( new ToolBarButton('rebuild_cache', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:rebuild_cache', '', function() { redirect(''); } ) ); a_toolbar.AddButton( new ToolBarSeparator('sep4') ); - a_toolbar.AddButton( new ToolBarButton('cut', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:cut', '', function() { $Catalog.submit_event(null, 'OnCut'); } ) ); - a_toolbar.AddButton( new ToolBarButton('copy', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:copy', '', function() { $Catalog.submit_event(null, 'OnCopy'); } ) ); - a_toolbar.AddButton( new ToolBarButton('paste', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:paste', '', function() { $Catalog.submit_event('c', 'OnPasteClipboard', null, function($object) { $object.resetTabs(true); $object.switchTab(); Index: trunk/core/admin_templates/categories/xml/tree_categories.tpl =================================================================== diff -u -N -r6669 -r6784 --- trunk/core/admin_templates/categories/xml/tree_categories.tpl (.../tree_categories.tpl) (revision 6669) +++ trunk/core/admin_templates/categories/xml/tree_categories.tpl (.../tree_categories.tpl) (revision 6784) @@ -1,6 +1,6 @@ - " icon="img/icons/icon24_catalog.gif" href="" onclick="checkCatalog()" load_url=""> + " icon="img/icons/icon24_catalog.gif" href="" onclick="checkCatalog()" load_url=""> Index: trunk/kernel/admin_templates/catalog.tpl =================================================================== diff -u -N -r6669 -r6784 --- trunk/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 6669) +++ trunk/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 6784) @@ -23,25 +23,25 @@ var $Catalog = new Catalog('', 'catalog_'); var a_toolbar = new ToolBar(); - a_toolbar.AddButton( new ToolBarButton('upcat', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:upcat', '', function() { $Catalog.go_to_cat($Catalog.ParentCategoryID); } ) ); - a_toolbar.AddButton( new ToolBarButton('homecat', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:homecat', '', function() { $Catalog.go_to_cat(0); } ) ); a_toolbar.AddButton( new ToolBarSeparator('sep1') ); - a_toolbar.AddButton( new ToolBarButton('new_cat', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:new_cat', '', function() { std_precreate_item('c', 'in-portal/categories/categories_edit'); } ) ); - a_toolbar.AddButton( new ToolBarButton('editcat', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:editcat', '', function() { var $edit_url = ''; var $category_id = get_hidden_field('m_cat_id'); var $redirect_url = $edit_url.replace('#CATEGORY_ID#', $category_id); @@ -76,7 +76,7 @@ a_toolbar.AddButton( new ToolBarSeparator('sep3') ); - a_toolbar.AddButton( new ToolBarButton('export', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:export', '', function() { var $export_prefixes = new Array('l', 'p'); if (in_array($Catalog.ActivePrefix, $export_prefixes)) { submit_event($Catalog.ActivePrefix, 'OnExport'); @@ -87,26 +87,26 @@ } ) ); - a_toolbar.AddButton( new ToolBarButton('rebuild_cache', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:rebuild_cache', '', function() { redirect(''); } ) ); a_toolbar.AddButton( new ToolBarSeparator('sep4') ); - a_toolbar.AddButton( new ToolBarButton('cut', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:cut', '', function() { $Catalog.submit_event(null, 'OnCut'); } ) ); - a_toolbar.AddButton( new ToolBarButton('copy', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:copy', '', function() { $Catalog.submit_event(null, 'OnCopy'); } ) ); - a_toolbar.AddButton( new ToolBarButton('paste', '', function() { + a_toolbar.AddButton( new ToolBarButton('in-portal:paste', '', function() { $Catalog.submit_event('c', 'OnPasteClipboard', null, function($object) { $object.resetTabs(true); $object.switchTab(); Index: trunk/kernel/admin_templates/xml/categories_list.tpl =================================================================== diff -u -N -r6669 -r6784 --- trunk/kernel/admin_templates/xml/categories_list.tpl (.../categories_list.tpl) (revision 6669) +++ trunk/kernel/admin_templates/xml/categories_list.tpl (.../categories_list.tpl) (revision 6784) @@ -49,7 +49,7 @@ _" width="50%"> radiocheckbox" name="" id=""> - ">  + img/itemicons/">  );">: Index: trunk/core/admin_templates/categories/xml/categories_list.tpl =================================================================== diff -u -N -r6669 -r6784 --- trunk/core/admin_templates/categories/xml/categories_list.tpl (.../categories_list.tpl) (revision 6669) +++ trunk/core/admin_templates/categories/xml/categories_list.tpl (.../categories_list.tpl) (revision 6784) @@ -49,7 +49,7 @@ _" width="50%"> radiocheckbox" name="" id=""> - ">  + img/itemicons/">  );">: Index: trunk/core/admin_templates/incs/form_blocks.tpl =================================================================== diff -u -N -r6751 -r6784 --- trunk/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 6751) +++ trunk/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 6784) @@ -16,7 +16,7 @@ img/logo_bg.gif) no-repeat top right;">
- .gif" align="absmiddle" title="">  + img/icons/.gif" align="absmiddle" title=""> 
Index: trunk/kernel/admin_templates/catalog_tab.tpl =================================================================== diff -u -N -r6669 -r6784 --- trunk/kernel/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 6669) +++ trunk/kernel/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 6784) @@ -27,7 +27,7 @@ _" width="50%"> radiocheckbox" name="" id=""> - ">  + img/itemicons/">  : Index: trunk/core/admin_templates/categories/ci_blocks.tpl =================================================================== diff -u -N -r6093 -r6784 --- trunk/core/admin_templates/categories/ci_blocks.tpl (.../ci_blocks.tpl) (revision 6093) +++ trunk/core/admin_templates/categories/ci_blocks.tpl (.../ci_blocks.tpl) (revision 6784) @@ -1,6 +1,6 @@ - .gif" title="" width="11" height="11" align="absmiddle" /> + img/ic_.gif" title="" width="11" height="11" align="absmiddle" />