Index: trunk/core/admin_templates/catalog/catalog.tpl =================================================================== diff -u -N -r6093 -r6583 --- trunk/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 6093) +++ trunk/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 6583) @@ -21,26 +21,26 @@ Request.progressText = ''; var $is_catalog = true; var $Catalog = new Catalog('', 'catalog_'); - var a_toolbar = new ToolBar(); - + var a_toolbar = new ToolBar(); + a_toolbar.AddButton( new ToolBarButton('upcat', '', function() { $Catalog.go_to_cat($Catalog.ParentCategoryID); } ) ); - + a_toolbar.AddButton( new ToolBarButton('homecat', '', function() { $Catalog.go_to_cat(0); } - ) ); - + ) ); + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); - + a_toolbar.AddButton( new ToolBarButton('new_cat', '', function() { std_precreate_item('c', 'categories/categories_edit'); } - ) ); - - + ) ); + + a_toolbar.AddButton( new ToolBarButton('editcat', '', function() { var $edit_url = ''; var $category_id = get_hidden_field('m_cat_id'); @@ -49,33 +49,33 @@ redirect($redirect_url); } ) ); - + - - + + a_toolbar.AddButton( new ToolBarButton('edit', '', edit) ); - + a_toolbar.AddButton( new ToolBarButton('delete', '', function() { var $template = $Catalog.queryTabRegistry('prefix', $Catalog.getCurrentPrefix(), 'view_template'); std_delete_items($Catalog.getCurrentPrefix(), $template, 1); - } ) ); - - + } ) ); + + a_toolbar.AddButton( new ToolBarSeparator('sep2') ); - + a_toolbar.AddButton( new ToolBarButton('approve', '', function() { $Catalog.submit_event(null, 'OnMassApprove'); } ) ); - + a_toolbar.AddButton( new ToolBarButton('decline', '', function() { $Catalog.submit_event(null, 'OnMassDecline'); } - ) ); - + ) ); + a_toolbar.AddButton( new ToolBarSeparator('sep3') ); - + a_toolbar.AddButton( new ToolBarButton('export', '', function() { var $export_prefixes = new Array('l', 'p'); if (in_array($Catalog.ActivePrefix, $export_prefixes)) { @@ -86,65 +86,65 @@ } } ) ); - + a_toolbar.AddButton( new ToolBarButton('rebuild_cache', '', function() { redirect(''); } ) ); - + a_toolbar.AddButton( new ToolBarSeparator('sep4') ); - - + + a_toolbar.AddButton( new ToolBarButton('cut', '', function() { $Catalog.submit_event(null, 'OnCut'); } ) ); - + a_toolbar.AddButton( new ToolBarButton('copy', '', function() { $Catalog.submit_event(null, 'OnCopy'); } ) ); - - + + a_toolbar.AddButton( new ToolBarButton('paste', '', function() { - $Catalog.submit_event('c', 'OnPasteClipboard', null, function($object) { + $Catalog.submit_event('c', 'OnPasteClipboard', null, function($object) { $object.resetTabs(true); - $object.switchTab(); + $object.switchTab(); } ); } ) ); - + /*a_toolbar.AddButton( new ToolBarButton('clear_clipboard', '', function() { if (confirm('')) { - $Catalog.submit_event('c', 'OnClearClipboard', null, function($object) { + $Catalog.submit_event('c', 'OnClearClipboard', null, function($object) { $GridManager.CheckDependencies($object.ActivePrefix); } ); } } ) );*/ - + a_toolbar.AddButton( new ToolBarSeparator('sep5') ); - + a_toolbar.AddButton( new ToolBarButton('move_up', '', function() { $Catalog.submit_event(null, 'OnMassMoveUp'); } ) ); - - + + a_toolbar.AddButton( new ToolBarButton('move_down', '', function() { $Catalog.submit_event(null, 'OnMassMoveDown'); } ) ); - + a_toolbar.AddButton( new ToolBarSeparator('sep6') ); - + a_toolbar.AddButton( new ToolBarButton('view', '', function() { show_viewmenu(a_toolbar, 'view'); } ) ); - - a_toolbar.Render(); - + + a_toolbar.Render(); + function edit() { var $current_prefix = $Catalog.getCurrentPrefix(); @@ -189,7 +189,7 @@ - + @@ -218,10 +218,10 @@ - + - +