Index: trunk/kernel/admin_templates/regional/languages_list.tpl
===================================================================
diff -u -N -r4834 -r5072
--- trunk/kernel/admin_templates/regional/languages_list.tpl (.../languages_list.tpl) (revision 4834)
+++ trunk/kernel/admin_templates/regional/languages_list.tpl (.../languages_list.tpl) (revision 5072)
@@ -63,7 +63,7 @@
-
+
Index: trunk/kernel/admin_templates/regional/languages_edit_email_events.tpl
===================================================================
diff -u -N -r4834 -r5072
--- trunk/kernel/admin_templates/regional/languages_edit_email_events.tpl (.../languages_edit_email_events.tpl) (revision 4834)
+++ trunk/kernel/admin_templates/regional/languages_edit_email_events.tpl (.../languages_edit_email_events.tpl) (revision 5072)
@@ -72,7 +72,7 @@
-
+
Index: trunk/kernel/admin_templates/user_selector.tpl
===================================================================
diff -u -N -r4834 -r5072
--- trunk/kernel/admin_templates/user_selector.tpl (.../user_selector.tpl) (revision 4834)
+++ trunk/kernel/admin_templates/user_selector.tpl (.../user_selector.tpl) (revision 5072)
@@ -37,7 +37,7 @@
-
+
Index: trunk/kernel/admin_templates/incs/script.js
===================================================================
diff -u -N -r5061 -r5072
--- trunk/kernel/admin_templates/incs/script.js (.../script.js) (revision 5061)
+++ trunk/kernel/admin_templates/incs/script.js (.../script.js) (revision 5072)
@@ -90,10 +90,11 @@
submit_event($prefix_special,'OnResetSorting');
}
-function set_per_page($prefix_special,$per_page)
+function set_per_page($prefix_special, $per_page, $ajax)
{
- set_hidden_field($prefix_special+'_PerPage',$per_page);
- submit_event($prefix_special,'OnSetPerPage');
+ set_form($prefix_special, $ajax);
+ set_hidden_field($prefix_special + '_PerPage', $per_page);
+ submit_event($prefix_special, 'OnSetPerPage', null, null, $ajax);
}
function submit_event(prefix_special, event, t, form_action, $ajax)
Index: trunk/core/admin_templates/groups/groups_edit_users.tpl
===================================================================
diff -u -N -r4834 -r5072
--- trunk/core/admin_templates/groups/groups_edit_users.tpl (.../groups_edit_users.tpl) (revision 4834)
+++ trunk/core/admin_templates/groups/groups_edit_users.tpl (.../groups_edit_users.tpl) (revision 5072)
@@ -84,7 +84,7 @@
-
+
Index: trunk/kernel/admin_templates/groups/groups_edit_users.tpl
===================================================================
diff -u -N -r4834 -r5072
--- trunk/kernel/admin_templates/groups/groups_edit_users.tpl (.../groups_edit_users.tpl) (revision 4834)
+++ trunk/kernel/admin_templates/groups/groups_edit_users.tpl (.../groups_edit_users.tpl) (revision 5072)
@@ -84,7 +84,7 @@
-
+
Index: trunk/kernel/admin_templates/xml/categories_list.tpl
===================================================================
diff -u -N -r5061 -r5072
--- trunk/kernel/admin_templates/xml/categories_list.tpl (.../categories_list.tpl) (revision 5061)
+++ trunk/kernel/admin_templates/xml/categories_list.tpl (.../categories_list.tpl) (revision 5072)
@@ -5,7 +5,7 @@
Grids['c'].AddItemsByIdMask('td', /^c_([0-9-]+)/, 'c[$$ID$$][CategoryId]');
Grids['c'].InitItems();
Grids['c'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6'));
-
+
$Catalog.setItemCount('c', '');
$Catalog.ParentCategoryID = ;
document.getElementById('c_search_warning').style.display = 'blocknone';
Index: trunk/core/admin_templates/categories/xml/categories_list.tpl
===================================================================
diff -u -N -r5061 -r5072
--- trunk/core/admin_templates/categories/xml/categories_list.tpl (.../categories_list.tpl) (revision 5061)
+++ trunk/core/admin_templates/categories/xml/categories_list.tpl (.../categories_list.tpl) (revision 5072)
@@ -5,7 +5,7 @@
Grids['c'].AddItemsByIdMask('td', /^c_([0-9-]+)/, 'c[$$ID$$][CategoryId]');
Grids['c'].InitItems();
Grids['c'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6'));
-
+
$Catalog.setItemCount('c', '');
$Catalog.ParentCategoryID = ;
document.getElementById('c_search_warning').style.display = 'blocknone';
Index: trunk/kernel/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r5057 -r5072
--- trunk/kernel/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 5057)
+++ trunk/kernel/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 5072)
@@ -68,7 +68,7 @@
-
+
document.getElementById('_search_keyword').onkeydown = search_keydown;
Toolbars['_search'] = new ToolBar('icon16_');
Toolbars['_search'].AddButton(
@@ -205,50 +205,62 @@
$Menus[''+'_filter_menu'].addMenuSeparator();
-
+
// define ViewMenu
$fw_menus[''+'_view_menu'] = function()
{
-
+
// filtring menu
$Menus[''+'_filter_menu'] = new Menu('');
$Menus[''+'_filter_menu'].addMenuItem('All','filters_remove_all("");');
$Menus[''+'_filter_menu'].addMenuItem('None','filters_apply_all("");');
$Menus[''+'_filter_menu'].addMenuSeparator();
-
-
- // sorting menu
- $Menus[''+'_sorting_menu'] = new Menu('');
- $Menus[''+'_sorting_menu'].addMenuItem('','direct_sort_grid("","","asc");','2');
- $Menus[''+'_sorting_menu'].addMenuItem('','direct_sort_grid("","","desc");','2');
- $Menus[''+'_sorting_menu'].addMenuSeparator();
- $Menus[''+'_sorting_menu'].addMenuItem('','reset_sorting("");');
-
-
- // per page menu
- $Menus[''+'_perpage_menu'] = new Menu('');
- $Menus[''+'_perpage_menu'].addMenuItem('10','set_per_page("",10);','2');
- $Menus[''+'_perpage_menu'].addMenuItem('20','set_per_page("",20);','2');
- $Menus[''+'_perpage_menu'].addMenuItem('50','set_per_page("",50);','2');
- $Menus[''+'_perpage_menu'].addMenuItem('100','set_per_page("",100);','2');
- $Menus[''+'_perpage_menu'].addMenuItem('500','set_per_page("",500);','2');
-
- // select menu
- $Menus[''+'_select_menu'] = new Menu('');
- $Menus[''+'_select_menu'].addMenuItem('','Grids[""].SelectAll();');
- $Menus[''+'_select_menu'].addMenuItem('','Grids[""].ClearSelection();');
- $Menus[''+'_select_menu'].addMenuItem('','Grids[""].InvertSelection();');
-
+
+
+
+ // sorting menu
+ $Menus[''+'_sorting_menu'] = new Menu('');
+ $Menus[''+'_sorting_menu'].addMenuItem('','direct_sort_grid("","","asc");','2');
+ $Menus[''+'_sorting_menu'].addMenuItem('','direct_sort_grid("","","desc");','2');
+ $Menus[''+'_sorting_menu'].addMenuSeparator();
+ $Menus[''+'_sorting_menu'].addMenuItem('','reset_sorting("");');
+
+
+
+
+ // per page menu
+ $Menus[''+'_perpage_menu'] = new Menu('');
+ $Menus[''+'_perpage_menu'].addMenuItem('10','set_per_page("",10,);','2');
+ $Menus[''+'_perpage_menu'].addMenuItem('20','set_per_page("",20,);','2');
+ $Menus[''+'_perpage_menu'].addMenuItem('50','set_per_page("",50,);','2');
+ $Menus[''+'_perpage_menu'].addMenuItem('100','set_per_page("",100,);','2');
+ $Menus[''+'_perpage_menu'].addMenuItem('500','set_per_page("",500,);','2');
+
+
+
+ // select menu
+ $Menus[''+'_select_menu'] = new Menu('');
+ $Menus[''+'_select_menu'].addMenuItem('','Grids[""].SelectAll();');
+ $Menus[''+'_select_menu'].addMenuItem('','Grids[""].ClearSelection();');
+ $Menus[''+'_select_menu'].addMenuItem('','Grids[""].InvertSelection();');
+
+
processHooks('ViewMenu', hBEFORE, '');
$Menus[''+'_view_menu'] = new Menu('');
-
+
$Menus[''+'_view_menu'].addMenuItem( $Menus[''+'_filter_menu'] );
-
- $Menus[''+'_view_menu'].addMenuItem( $Menus[''+'_sorting_menu'] );
- $Menus[''+'_view_menu'].addMenuItem( $Menus[''+'_perpage_menu'] );
- $Menus[''+'_view_menu'].addMenuItem( $Menus[''+'_select_menu'] );
+
+
+ $Menus[''+'_view_menu'].addMenuItem( $Menus[''+'_sorting_menu'] );
+
+
+ $Menus[''+'_view_menu'].addMenuItem( $Menus[''+'_perpage_menu'] );
+
+
+ $Menus[''+'_view_menu'].addMenuItem( $Menus[''+'_select_menu'] );
+
processHooks('ViewMenu', hAFTER, '');
}
@@ -268,7 +280,7 @@
-
+