Index: branches/RC/core/admin_templates/incs/menu_blocks.tpl =================================================================== diff -u -r10326 -r10356 --- branches/RC/core/admin_templates/incs/menu_blocks.tpl (.../menu_blocks.tpl) (revision 10326) +++ branches/RC/core/admin_templates/incs/menu_blocks.tpl (.../menu_blocks.tpl) (revision 10356) @@ -3,26 +3,41 @@ - $Menus[''+'_filter_menu'].addItem(rs('.filter.', true), '', 'javascript:',); + $Menus[''].addItem(rs('.filter.', true), '', 'javascript:',); + + $Menus[''].addItem(rs('.refresh_interval.'), '', 'javascript:set_refresh_interval("", , )', ['img/menu_dot.gif']); + + - $Menus[''+'_filter_menu'].addSeparator(); + $Menus[''].addSeparator(); - + // define ViewMenu + + // auto refresh menu + $Menus[''+'_auto_refresh_menu'] = menuMgr.createMenu(rs('.auto_refresh.menu')); + $Menus[''+'_auto_refresh_menu'].applyBorder(false, false, false, false); + $Menus[''+'_auto_refresh_menu'].dropShadow("none"); + $Menus[''+'_auto_refresh_menu'].showIcon = true; + $Menus[''+'_auto_refresh_menu'].addItem(rs('.auto_refresh.enabled'), '', 'javascript:submit_event("", "OnAutoRefreshToggle");', ['img/check_on.gif']); + $Menus[''+'_auto_refresh_menu'].addSeparator(); + + + // filtring menu $Menus[''+'_filter_menu'] = menuMgr.createMenu(rs('.filter.menu')); $Menus[''+'_filter_menu'].applyBorder(false, false, false, false); $Menus[''+'_filter_menu'].dropShadow("none"); $Menus[''+'_filter_menu'].showIcon = true; - $Menus[''+'_filter_menu'].addItem(rs('.filter.all'), 'All','javascript:filters_remove_all("", );'); - $Menus[''+'_filter_menu'].addItem(rs('.filter.none'), 'None','javasript:filters_apply_all("", );'); + $Menus[''+'_filter_menu'].addItem(rs('.filter.all'), '','javascript:filters_remove_all("", );'); + $Menus[''+'_filter_menu'].addItem(rs('.filter.none'), '','javascript:filters_apply_all("", );'); $Menus[''+'_filter_menu'].addSeparator(); - + @@ -73,6 +88,10 @@ // $Menus[''+'_view_menu'].addItem(rs('.save_view'),'','javascript:myGrid.SaveWidths()'); + + $Menus[''+'_view_menu'].addItem(rs('.auto_refresh'), '', 'javascript:void()', null, true, null, rs('.auto_refresh.menu'), null); + + $Menus[''+'_view_menu'].addItem(rs('.filters'), '', 'javascript:void()', null, true, null, rs('.filter.menu'), null);