Index: trunk/kernel/admin/include/toolbar/reviews.php =================================================================== diff -u -r983 -r1333 --- trunk/kernel/admin/include/toolbar/reviews.php (.../reviews.php) (revision 983) +++ trunk/kernel/admin/include/toolbar/reviews.php (.../reviews.php) (revision 1333) @@ -121,12 +121,25 @@ $lang_Within = language("la_Text_Within"); $lang_Current = language("la_Text_Current"); $lang_Active = language("la_Text_Active"); -$lang_SubCats = language("la_Text_SubCats"); -$lang_SubItems = language("la_Text_Subitems"); +//$lang_SubCats = language("la_Text_SubCats"); +//$lang_SubItems = language("la_Text_Subitems"); +// View, Sort, Select, Per Page +$lang_View = language('la_Text_View'); +$lang_Sort = language('la_Text_Sort'); +$lang_PerPage = language('la_prompt_PerPage'); +$lang_Select = language('la_Text_Select'); + print << +// global usage phrases +var lang_View = '$lang_View'; +var lang_Sort = '$lang_Sort'; +var lang_PerPage = '$lang_PerPage'; +var lang_Select = '$lang_Select'; + +// local usage phrases var default_tab = "$DefaultTab"; var Category_Sortfield = '$Category_Sortfield'; var Category_Sortorder = '$Category_Sortorder'; @@ -151,8 +164,8 @@ var lang_Within="$lang_Within"; var lang_Current = "$lang_Current"; var lang_Active = "$lang_Active"; -var lang_SubCats = "$lang_SubCats"; -var lang_SubItems = "$lang_SubItems"; +//var lang_SubCats = "$lang_SubCats"; +//var lang_SubItems = "$lang_SubItems"; var hostname = '$rootURL'; var env = '$envar'; @@ -164,7 +177,7 @@ addCommonActions(); initToolbar('mainToolBar', actionHandler); initCheckBoxes(null, false); - toggleMenu(); +// toggleMenu(); } function AddButtonAction(actionname,actionval) @@ -240,30 +253,9 @@ function toggleMenu() { - if (activeTab) - { - // module filtring menu - filterfunc = activeTab.getAttribute("tabTitle")+'_FilterMenu(cat_menu_filter);'; - window.cat_menu_filter = new Menu(lang_View); - cat_menu_filter = eval(filterfunc); - - // module select menu - selectfunc = activeTab.getAttribute("tabTitle")+"_SelectMenu(cat_menu_select);"; - window.cat_menu_select = new Menu(lang_Select); - cat_menu_select = eval(selectfunc); - - // module per-page menu (in case if module selected) - pagefunc = activeTab.getAttribute("tabTitle")+"_PerPageMenu();"; - window.PerPageMenu = eval(pagefunc); - } - window.cat_menu = new Menu("root"); - if (activeTab) - { - // add root ViewMenu elements - window.cat_menu.addMenuItem(cat_menu_filter); // "View" menu - window.cat_menu.addMenuItem(PerPageMenu); // Module "Per-Page" menu - window.cat_menu.addMenuItem(cat_menu_select); // "Select" menu - } + var prefix_special = activeTab.getAttribute('PrefixSpecial'); + \$fw_menus[prefix_special+'_view_menu'](); + window.cat_menu = \$Menus[prefix_special+'_view_menu']; window.triedToWriteMenus = false; window.cat_menu.writeMenus(); } @@ -356,68 +348,7 @@ window.contextMenu.writeMenus(); return true; } - - - // only "Category" tab functions - function Categories_SortMenu(menu_sorting) - { - if(menu_sorting == null && typeof(menu_sorting) == 'undefined') menu_sorting = new Menu(lang_Categories); - - menu_sorting.addMenuItem(lang_Asc,"config_val('Category_Sortorder','asc');",RadioIsSelected(Category_Sortorder,'asc')); - menu_sorting.addMenuItem(lang_Desc,"config_val('Category_Sortorder','desc');",RadioIsSelected(Category_Sortorder,'desc')); - menu_sorting.addMenuSeparator(); - - menu_sorting.addMenuItem(lang_Default,"config_val('Category_Sortfield','Name');",""); - menu_sorting.addMenuItem(lang_Name,"config_val('Category_Sortfield','Name');",RadioIsSelected(Category_Sortfield,'Name')); - menu_sorting.addMenuItem(lang_Description,"config_val('Category_Sortfield','Description');",RadioIsSelected(Category_Sortfield,'Description')); - - menu_sorting.addMenuItem(lang_CreatedOn,"config_val('Category_Sortfield','CreatedOn');",RadioIsSelected(Category_Sortfield,'CreatedOn')); - menu_sorting.addMenuItem(lang_SubCats,"config_val('Category_Sortfield','CachedDescendantCatsQty');",RadioIsSelected(Category_Sortfield,'CachedDescendantCatsQty')); - menu_sorting.addMenuItem(lang_SubItems,"config_val('Category_Sortfield','SubItems');",RadioIsSelected(Category_Sortfield,'SubItems')); - - return menu_sorting; - - } - - function Categories_FilterMenu(menu_filter) - { - if(menu_filter == null && typeof(menu_filter) == 'undefined') menu_filter = new Menu(lang_Categories); - menu_filter.addMenuItem(lang_All,"config_val('Category_View', 127);",CategoryView==127); - menu_filter.addMenuSeparator(); - menu_filter.addMenuItem(lang_Active,"FlipBit('Category_View',CategoryView,6);",BitStatus(CategoryView,6)); - menu_filter.addMenuItem(lang_Pending,"FlipBit('Category_View',CategoryView,5);", BitStatus(CategoryView,5)); - menu_filter.addMenuItem(lang_Disabled,"FlipBit('Category_View',CategoryView,4);",BitStatus(CategoryView,4)); - - menu_filter.addMenuSeparator(); - menu_filter.addMenuItem(lang_New,"FlipBit('Category_View',CategoryView,3);",BitStatus(CategoryView,3)); - menu_filter.addMenuItem(lang_EdPick,"FlipBit('Category_View',CategoryView,0);",BitStatus(CategoryView,0)); - - return menu_filter; - } - - function Categories_SelectMenu(menu_select) - { - if(menu_select == null && typeof(menu_select) == 'undefined') menu_select = new Menu(lang_Categories); - menu_select.addMenuItem(lang_All,"javascript:selectAllC('"+activeTab.id+"');",""); - menu_select.addMenuItem(lang_Unselect,"javascript:unselectAll('"+activeTab.id+"');",""); - menu_select.addMenuItem(lang_Invert,"javascript:invert('"+activeTab.id+"');",""); - return menu_select; - } - - function Categories_PerPageMenu() - { - caption = lang_Categories +" "+lang_PerPage; - - menu_results = new Menu(caption); - menu_results.addMenuItem("10","config_val('Perpage_Category', '10');",RadioIsSelected(Category_Perpage,10)); - menu_results.addMenuItem("20","config_val('Perpage_Category', '20');",RadioIsSelected(Category_Perpage,20)); - menu_results.addMenuItem("50","config_val('Perpage_Category', '50');",RadioIsSelected(Category_Perpage,50)); - menu_results.addMenuItem("100","config_val('Perpage_Category', '100');",RadioIsSelected(Category_Perpage,100)); - menu_results.addMenuItem("500","config_val('Perpage_Category', '500');",RadioIsSelected(Category_Perpage,500)); - return menu_results; - } - // Event Handling Stuff Cross-Browser getEvent = window.Event ? function(e){return e}