Index: trunk/kernel/admin/include/toolbar/browse.php
===================================================================
diff -u -r251 -r1333
--- trunk/kernel/admin/include/toolbar/browse.php	(.../browse.php)	(revision 251)
+++ trunk/kernel/admin/include/toolbar/browse.php	(.../browse.php)	(revision 1333)
@@ -156,9 +156,22 @@
 $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 <<<END
 
 <script language="JavaScript">
+// 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 Category_Sortfield = '$Category_Sortfield';
 var Category_Sortorder = '$Category_Sortorder';
 var Category_Perpage = $Perpage_Category;
@@ -460,153 +473,81 @@
       window.SearchMenu.writeMenus();
     }
 
-    function Category_SortMenu(caption)
+    \$fw_menus['c_view_menu'] = function()
     {
-        menu_sorting = new Menu(caption);
+    	// filtering menu
+    	\$Menus['c_filtring_menu'] = new Menu(lang_View);
+        \$Menus['c_filtring_menu'].addMenuItem(lang_All,"config_val('Category_View', 127);",CategoryView==127);
+        \$Menus['c_filtring_menu'].addMenuSeparator();
+        \$Menus['c_filtring_menu'].addMenuItem(lang_Active,"FlipBit('Category_View',CategoryView,6);",BitStatus(CategoryView,6));
+        \$Menus['c_filtring_menu'].addMenuItem(lang_Pending,"FlipBit('Category_View',CategoryView,5);", BitStatus(CategoryView,5));
+        \$Menus['c_filtring_menu'].addMenuItem(lang_Disabled,"FlipBit('Category_View',CategoryView,4);",BitStatus(CategoryView,4));
+        \$Menus['c_filtring_menu'].addMenuSeparator();
+        \$Menus['c_filtring_menu'].addMenuItem(lang_New,"FlipBit('Category_View',CategoryView,3);",BitStatus(CategoryView,3));
+        \$Menus['c_filtring_menu'].addMenuItem(lang_EdPick,"FlipBit('Category_View',CategoryView,0);",BitStatus(CategoryView,0));	
+    
+		// sorting menu
+    	\$Menus['c_sorting_menu'] = new Menu(lang_Sort);
+        \$Menus['c_sorting_menu'].addMenuItem(lang_Asc,"config_val('Category_Sortorder','asc');",RadioIsSelected(Category_Sortorder,'asc'));
+        \$Menus['c_sorting_menu'].addMenuItem(lang_Desc,"config_val('Category_Sortorder','desc');",RadioIsSelected(Category_Sortorder,'desc'));
+        \$Menus['c_sorting_menu'].addMenuSeparator();
+        \$Menus['c_sorting_menu'].addMenuItem(lang_Default,"config_val('Category_Sortfield','Name');","");
+        \$Menus['c_sorting_menu'].addMenuItem(lang_Name,"config_val('Category_Sortfield','Name');",RadioIsSelected(Category_Sortfield,'Name'));
+        \$Menus['c_sorting_menu'].addMenuItem(lang_Description,"config_val('Category_Sortfield','Description');",RadioIsSelected(Category_Sortfield,'Description'));
+        \$Menus['c_sorting_menu'].addMenuItem(lang_CreatedOn,"config_val('Category_Sortfield','CreatedOn');",RadioIsSelected(Category_Sortfield,'CreatedOn'));
+        \$Menus['c_sorting_menu'].addMenuItem(lang_SubCats,"config_val('Category_Sortfield','CachedDescendantCatsQty');",RadioIsSelected(Category_Sortfield,'CachedDescendantCatsQty'));
+        \$Menus['c_sorting_menu'].addMenuItem(lang_SubItems,"config_val('Category_Sortfield','SubItems');",RadioIsSelected(Category_Sortfield,'SubItems'));
+		
+        // perpage menu
         
-        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'));
+        // select menu
+    	\$Menus['c_select_menu'] = new Menu(lang_Select);
+        \$Menus['c_select_menu'].addMenuItem(lang_All,"javascript:selectAllC('categories');","");
+        \$Menus['c_select_menu'].addMenuItem(lang_Unselect,"javascript:unselectAll('categories');","");
+        \$Menus['c_select_menu'].addMenuItem(lang_Invert,"javascript:invert('categories');","");
         
-        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;
-
+        // view menu
+        \$Menus['c_view_menu'] = new Menu(lang_Categories);
+    	\$Menus['c_view_menu'].addMenuItem( \$Menus['c_filtring_menu'] );
+    	\$Menus['c_view_menu'].addMenuItem( \$Menus['c_sorting_menu'] );
+    	\$Menus['c_view_menu'].addMenuItem( \$Menus['c_select_menu'] );
     }
 
-
-    function Category_FilterMenu(caption)
-    {
-        menu_filter = new Menu(caption);
-        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 toggleMenu()
     {
-   //var tab_title = GetTabTitle(activeTab.id);
-   //alert(tab_title);
-        if ((document.getElementById('categories').active) && (activeTab))
-        {
-          filterfunc = activeTab.getAttribute("tabTitle")+'_FilterMenu();';
-
-          window.cat_menu_filter_sub = Category_FilterMenu(lang_Categories);
-          window.sub_menu_filter_sub = eval(filterfunc);
-          
-          window.cat_menu_filter = new Menu(lang_View);
-          cat_menu_filter.addMenuItem(cat_menu_filter_sub);
-          cat_menu_filter.addMenuItem(sub_menu_filter_sub);
-        }
-        else
-        {
+    	var \$ViewMenus = new Array();
+  		
+        // prepare categories menu
           if (document.getElementById('categories').active)
           {
-            window.cat_menu_filter = Category_FilterMenu(lang_View);
-          } 
+        	\$fw_menus['c_view_menu']();
+        	\$ViewMenus.push('c');
+        }
+        
           if  (activeTab)
           {
-              filterfunc = activeTab.getAttribute("tabTitle")+'_FilterMenu();';
-              window.cat_menu_filter = eval(filterfunc);
-          }
-        } // Filter
-
-        //Sorting
-        if ((document.getElementById('categories').active) && (activeTab))
-        {
-          //Sort->Categories
-          sortfunc = activeTab.getAttribute("tabTitle")+'_SortMenu();';
-          
-          window.cat_menu_sorting_sub = Category_SortMenu(lang_Categories);
-          window.sub_menu_sorting_sub = eval(sortfunc);
-
-          window.cat_menu_sorting = new Menu(lang_Sort);
-          cat_menu_sorting.addMenuItem(cat_menu_sorting_sub);
-          cat_menu_sorting.addMenuItem(sub_menu_sorting_sub);
+        	var prefix_special = activeTab.getAttribute('PrefixSpecial');
+        	\$fw_menus[prefix_special+'_view_menu']();
+        	\$ViewMenus.push(prefix_special);
         }
-        else
-        {
-            if (document.getElementById('categories').active)
-            {
-                window.cat_menu_sorting = Category_SortMenu(lang_Sort);
-                
-            } // categories
-            if  (activeTab)
-            {
-                window.cat_menu_sorting = Category_SortMenu(lang_Sort);
-            }
-
-        } // && Sorting
-        if ((document.getElementById('categories').active) && (activeTab))
-        {
-          window.cat_menu_select_sub = new Menu(lang_Categories);
-          cat_menu_select_sub.addMenuItem(lang_All,"javascript:selectAllC('categories');","");
-          cat_menu_select_sub.addMenuItem(lang_Unselect,"javascript:unselectAll('categories');","");
-          cat_menu_select_sub.addMenuItem(lang_Invert,"javascript:invert('categories');","");
-          
-          selectfunc = activeTab.getAttribute("tabTitle")+"_SelectMenu();";
-
-          window.sub_menu_select_sub = eval(selectfunc);
-//          sub_menu_select_sub.addMenuItem(lang_All,"javascript:selectAllC('"+activeTab.id+"');","");
-//          sub_menu_select_sub.addMenuItem(lang_Unselect,"javascript:unselectAll('"+activeTab.id+"');","");
-//          sub_menu_select_sub.addMenuItem(lang_Invert,"javascript:invert('"+activeTab.id+"');","");
-
-END;
-if (!$hideSelectAll) {
-echo "	
-          window.cat_menu_select = new Menu(lang_Select);
-          cat_menu_select.addMenuItem(cat_menu_select_sub);
-          cat_menu_select.addMenuItem(sub_menu_select_sub);";
-}
-print <<<END
+        
+        if(\$ViewMenus.length == 1)
+		{
+			prefix_special = \$ViewMenus[\$ViewMenus.length-1];
+			window.cat_menu = \$Menus[prefix_special+'_view_menu'];
         }
         else
         {
-            if (document.getElementById('categories').active)
-            {
-                window.cat_menu_select = new Menu(lang_Select);
-                cat_menu_select.addMenuItem(lang_All,"javascript:selectAllC('categories');","");
-                cat_menu_select.addMenuItem(lang_Unselect,"javascript:unselectAll('categories');","");
-                cat_menu_select.addMenuItem(lang_Invert,"javascript:invert('categories');","");
-            } 
-END;
-if (!$hideSelectAll) {
-echo '      if  (activeTab)
-            {
-
-                window.cat_menu_select = new Menu(lang_Select);
-                cat_menu_select.addMenuItem(lang_All,"javascript:selectAllC(\'"+activeTab.id+"\');","");
-                cat_menu_select.addMenuItem(lang_Unselect,"javascript:unselectAll(\'"+activeTab.id+"\');","");
-                cat_menu_select.addMenuItem(lang_Invert,"javascript:invert(\'"+activeTab.id+"\');","");
-			}   ';
-}
-print <<<END
-        } // && Select        
-        if(activeTab)
-        {
-            pagefunc = activeTab.getAttribute("tabTitle")+"_PerPageMenu();";
-            window.PerPageMenu =  eval(pagefunc);
-                    }
-        window.cat_menu = new Menu("root");
-        if ((document.getElementById('categories').active) || (activeTab)) window.cat_menu.addMenuItem(cat_menu_filter);
-        if ((document.getElementById('categories').active) || (activeTab)) window.cat_menu.addMenuItem(cat_menu_sorting);
-        if(activeTab) window.cat_menu.addMenuItem(PerPageMenu);
-
-        if ((document.getElementById('categories').active) || (activeTab)) window.cat_menu.addMenuItem(cat_menu_select);
+			window.cat_menu = new Menu('ViewMenu_mixed');
+			
+			// merge menus into new one
+			for(var i in \$ViewMenus)
+			{
+				prefix_special = \$ViewMenus[i];
+				window.cat_menu.addMenuItem( \$Menus[prefix_special+'_view_menu'] );
+			}
+		}
+        
         window.triedToWriteMenus = false;
         window.cat_menu.writeMenus();
     }