Index: trunk/core/admin_templates/categories/categories_edit_permissions.tpl =================================================================== diff -u -N -r5272 -r5296 --- trunk/core/admin_templates/categories/categories_edit_permissions.tpl (.../categories_edit_permissions.tpl) (revision 5272) +++ trunk/core/admin_templates/categories/categories_edit_permissions.tpl (.../categories_edit_permissions.tpl) (revision 5296) @@ -1,7 +1,7 @@ - + @@ -13,7 +13,59 @@ + + - - - - - - \ No newline at end of file Index: trunk/core/admin_templates/js/catalog.js =================================================================== diff -u -N -r5194 -r5296 --- trunk/core/admin_templates/js/catalog.js (.../catalog.js) (revision 5194) +++ trunk/core/admin_templates/js/catalog.js (.../catalog.js) (revision 5296) @@ -158,7 +158,10 @@ this.setViewMenu(this.ActivePrefix); setCookie(this.CookiePrefix + 'active_prefix', this.ActivePrefix); - // this.TabRegistry.length == 1 + this.refreshTab($prefix, $div_id); +} + +Catalog.prototype.refreshTab = function($prefix, $div_id) { var $cat_id = get_hidden_field('m_cat_id'); var $tab_cat_id = document.getElementById($div_id).getAttribute('category_id'); if ($cat_id != $tab_cat_id) { Index: trunk/kernel/admin_templates/incs/toolbar.js =================================================================== diff -u -N -r5060 -r5296 --- trunk/kernel/admin_templates/incs/toolbar.js (.../toolbar.js) (revision 5060) +++ trunk/kernel/admin_templates/incs/toolbar.js (.../toolbar.js) (revision 5296) @@ -37,7 +37,7 @@ ToolBarButton.prototype.IconsPath = function() { - if (!img_path) { + if (typeof(img_path) == 'undefined') { alert('error: toolbar image path not set'); } return img_path.replace('#MODULE#', this.Module) + 'toolbar/'; Index: trunk/kernel/units/permissions/permissions_tag_processor.php =================================================================== diff -u -N -r5289 -r5296 --- trunk/kernel/units/permissions/permissions_tag_processor.php (.../permissions_tag_processor.php) (revision 5289) +++ trunk/kernel/units/permissions/permissions_tag_processor.php (.../permissions_tag_processor.php) (revision 5296) @@ -63,6 +63,18 @@ $module = $this->Application->GetVar('module'); } + function PrintTabs($params) + { + $ret = ''; + $block_params = $params; + foreach ($this->Application->ModuleInfo as $module_name => $module_data) { + $params['name'] = $params['render_as']; + $params['item_prefix'] = $module_data['Var']; + $ret .= $this->Application->ProcessParsedTag('m', 'MyInclude', $params); // MyInclude($params); + } + return $ret; + } + } ?> \ No newline at end of file Index: trunk/kernel/admin_templates/categories/categories_edit_permissions.tpl =================================================================== diff -u -N -r5272 -r5296 --- trunk/kernel/admin_templates/categories/categories_edit_permissions.tpl (.../categories_edit_permissions.tpl) (revision 5272) +++ trunk/kernel/admin_templates/categories/categories_edit_permissions.tpl (.../categories_edit_permissions.tpl) (revision 5296) @@ -1,7 +1,7 @@ - + @@ -13,7 +13,59 @@ + + - - - - - - \ No newline at end of file Index: trunk/core/admin_templates/catalog/catalog.tpl =================================================================== diff -u -N -r5164 -r5296 --- trunk/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5164) +++ trunk/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5296) @@ -41,7 +41,7 @@ a_toolbar.AddButton( new ToolBarButton('editcat', '', function() { - $edit_url = ''; + $edit_url = ''; window.location.href = $edit_url.replace('#CATEGORY_ID#', get_hidden_field('m_cat_id')); } @@ -190,7 +190,7 @@

- (_item_count">?) + (_item_count">?)

@@ -203,7 +203,7 @@ - + Index: trunk/kernel/admin_templates/incs/catalog.js =================================================================== diff -u -N -r5194 -r5296 --- trunk/kernel/admin_templates/incs/catalog.js (.../catalog.js) (revision 5194) +++ trunk/kernel/admin_templates/incs/catalog.js (.../catalog.js) (revision 5296) @@ -158,7 +158,10 @@ this.setViewMenu(this.ActivePrefix); setCookie(this.CookiePrefix + 'active_prefix', this.ActivePrefix); - // this.TabRegistry.length == 1 + this.refreshTab($prefix, $div_id); +} + +Catalog.prototype.refreshTab = function($prefix, $div_id) { var $cat_id = get_hidden_field('m_cat_id'); var $tab_cat_id = document.getElementById($div_id).getAttribute('category_id'); if ($cat_id != $tab_cat_id) { Index: trunk/core/units/permissions/permissions_tag_processor.php =================================================================== diff -u -N -r5289 -r5296 --- trunk/core/units/permissions/permissions_tag_processor.php (.../permissions_tag_processor.php) (revision 5289) +++ trunk/core/units/permissions/permissions_tag_processor.php (.../permissions_tag_processor.php) (revision 5296) @@ -63,6 +63,18 @@ $module = $this->Application->GetVar('module'); } + function PrintTabs($params) + { + $ret = ''; + $block_params = $params; + foreach ($this->Application->ModuleInfo as $module_name => $module_data) { + $params['name'] = $params['render_as']; + $params['item_prefix'] = $module_data['Var']; + $ret .= $this->Application->ProcessParsedTag('m', 'MyInclude', $params); // MyInclude($params); + } + return $ret; + } + } ?> \ No newline at end of file Index: trunk/kernel/admin_templates/catalog.tpl =================================================================== diff -u -N -r5164 -r5296 --- trunk/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5164) +++ trunk/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5296) @@ -41,7 +41,7 @@ a_toolbar.AddButton( new ToolBarButton('editcat', '', function() { - $edit_url = ''; + $edit_url = ''; window.location.href = $edit_url.replace('#CATEGORY_ID#', get_hidden_field('m_cat_id')); } @@ -190,7 +190,7 @@

- (_item_count">?) + (_item_count">?)

@@ -203,7 +203,7 @@ - + Index: trunk/core/admin_templates/categories/permissions_tab.tpl =================================================================== diff -u -N --- trunk/core/admin_templates/categories/permissions_tab.tpl (revision 0) +++ trunk/core/admin_templates/categories/permissions_tab.tpl (revision 5296) @@ -0,0 +1,18 @@ + +

_div" prefix="" group_id="-1" class="catalog-tab">

+ + + document.getElementById('_div').setAttribute('group_id', ); + #separator# + + "> + works + + + + + + +

+ from ajax [prefix: ]; [group_id: ] + \ No newline at end of file Index: trunk/kernel/units/admin/admin_tag_processor.php =================================================================== diff -u -N -r5219 -r5296 --- trunk/kernel/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 5219) +++ trunk/kernel/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 5296) @@ -340,12 +340,13 @@ { $ret = ''; $special = isset($params['special']) ? $params['special'] : ''; + $skip_prefixes = isset($params['skip_prefixes']) ? explode(',', $params['skip_prefixes']) : Array(); $block_params = Array('name' => $params['render_as']); foreach ($this->Application->ModuleInfo as $module_name => $module_info) { $prefix = $module_info['Var']; - if ($prefix == 'm') continue; - $label = $this->Application->getUnitOption($prefix, 'ViewMenuPhrase'); - $block_params['title'] = $this->Application->Phrase($label); + if (in_array($prefix, $skip_prefixes)) continue; + $label = $this->Application->getUnitOption($prefix, $params['title_property']); + $block_params['title'] = $label; $block_params['prefix'] = $prefix; $ret .= $this->Application->ParseBlock($block_params); } Index: trunk/core/units/admin/admin_tag_processor.php =================================================================== diff -u -N -r5219 -r5296 --- trunk/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 5219) +++ trunk/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 5296) @@ -340,12 +340,13 @@ { $ret = ''; $special = isset($params['special']) ? $params['special'] : ''; + $skip_prefixes = isset($params['skip_prefixes']) ? explode(',', $params['skip_prefixes']) : Array(); $block_params = Array('name' => $params['render_as']); foreach ($this->Application->ModuleInfo as $module_name => $module_info) { $prefix = $module_info['Var']; - if ($prefix == 'm') continue; - $label = $this->Application->getUnitOption($prefix, 'ViewMenuPhrase'); - $block_params['title'] = $this->Application->Phrase($label); + if (in_array($prefix, $skip_prefixes)) continue; + $label = $this->Application->getUnitOption($prefix, $params['title_property']); + $block_params['title'] = $label; $block_params['prefix'] = $prefix; $ret .= $this->Application->ParseBlock($block_params); } Index: trunk/kernel/admin_templates/categories/permissions_tab.tpl =================================================================== diff -u -N --- trunk/kernel/admin_templates/categories/permissions_tab.tpl (revision 0) +++ trunk/kernel/admin_templates/categories/permissions_tab.tpl (revision 5296) @@ -0,0 +1,18 @@ + +

_div" prefix="" group_id="-1" class="catalog-tab">

+ + + document.getElementById('_div').setAttribute('group_id', ); + #separator# + + "> + works + + + + + + +

+ from ajax [prefix: ]; [group_id: ] + \ No newline at end of file