Index: trunk/admin/include/toolbar.js
===================================================================
diff -u -r13 -r767
--- trunk/admin/include/toolbar.js	(.../toolbar.js)	(revision 13)
+++ trunk/admin/include/toolbar.js	(.../toolbar.js)	(revision 767)
@@ -1,806 +1,405 @@
 <?php
-
 //***********************************
-
 //***********************************
-
 //The dropdown menu
-
 //***********************************
 
-
-
 function int_view_init()
-
 {
-
 global $section, $pathtoroot, $envar, $g_status, $n_categories_articles, $n_categories, $n_articles, $n_cat_filter, $n_article_filter, $n_lead_article, $n_archived_article, $n_pending_article, $n_disabled_article, $n_pending_category, $n_disabled_category, $n_category_sort, $n_category_sortby, $n_article_sort, $n_article_sortby, $n_article_perpage;
 
-
-
 if ($g_status == 'cut' || $g_status == 'copy')
-
 	$pasteval = "true";
-
 else
-
 	$pasteval = "false";
 
 
-
-
-
 // Select viewing categories or articles
-
 if ($n_categories_articles == "1")
-
 	$n_categories = 1;
-
 if ($n_categories_articles == "2")
-
 	$n_articles = 1;
-
 if ($n_categories_articles == "3")
-
 {	$n_articles = 1;
-
 	$n_categories = 1;
-
 }
 
-
-
 // Article filter
-
 if ($n_lead_article == 1)	
-
 	$n_article_filter .= " AND LeadStory=1";
-
 if ($n_archived_article == 1)
-
 	$n_article_filter .= " AND Archived=1";
-
 if ($n_pending_article == 1)
-
 	$n_article_filter .= " AND Pending=1";
-
 if ($n_disabled_article == 1)
-
 	$n_article_filter .= " AND Visible=0";
 
-
-
 // Category filter
-
 if ($n_pending_category == 1)
-
 	$n_cat_filter .= " AND Pending=1";
-
 if ($n_disabled_category == 1)
-
 	$n_cat_filter .= " AND Visible=0";
 
-
-
 // Sorting
-
 $varname = "n_category_sort_" . $n_category_sort;
-
 $$varname = 1;
 
-
-
 $varname = "n_category_sortby_" . $n_category_sortby;
-
 $$varname = 1;
 
-
-
 $varname = "n_article_sort_" . $n_article_sort;
-
 $$varname = 1;
 
-
-
 $varname = "n_article_sortby_" . $n_article_sortby;
-
 $$varname = 1;
 
-
-
 $varname = "n_article_perpage_" . $n_article_perpage;
-
 $$varname = 1;
 
 
 
-
-
-
-
 print <<<END
 
-
 <script language="JavaScript">
-
 <!--
 
-
-
 function n_categories_articles(val){
-
 	document.viewmenu.fieldname.value = "n_categories_articles";
-
 	document.viewmenu.varvalue.value = val;
-
 	document.viewmenu.submit();
-
 }
 
-
-
 function n_filter(fieldnum, val){
-
 	var field;
-
 	switch(fieldnum){
-
 		case 1:
-
 			field = "n_lead_article";
-
 		break;
-
 		case 2:
-
 			field = "n_archived_article";
-
 		break;
-
 		case 3:
-
 			field = "n_pending_article";
-
 		break;
-
 		case 4:
-
 			field = "n_pending_category";
-
 		break;
-
 		case 5:
-
 			field = "n_disabled_article";
-
 		break;		
-
 		case 6:
-
 			field = "n_disabled_category";
-
 		break;				
-
 		}
-
 	document.viewmenu.fieldname.value = "n_serval";
-
 	document.viewmenu.varvalue.value = field;
 
-
-
 	if (val == 1)
-
 		document.viewmenu.varvalue2.value = "0";
-
 	else	
-
 		document.viewmenu.varvalue2.value = "1";
 
-
-
 	document.viewmenu.submit();
 
-
-
 }
 
-
-
 function n_cat_sort(val){
-
 	var field;
-
 	switch(val){
-
 		case 1:
-
 			field = "asc";
-
 		break;
-
 		case 2:
-
 			field = "desc";
-
 		break;
-
 	}
-
 	document.viewmenu.fieldname.value = "n_setval";
-
 	document.viewmenu.varvalue.value = "n_category_sort";	
-
 	document.viewmenu.varvalue2.value = field;
-
 	document.viewmenu.submit();
-
 }
 
-
-
 function n_cat_sortby(val){
-
 	var field;
-
 	switch(val){
-
 		case 1:
-
 			field = "Name";
-
 		break;
-
 		case 2:
-
 			field = "Description";
-
 		break;
-
 		case 3:
-
 			field = "Priority";
-
 		break;
-
 	}
-
 	document.viewmenu.fieldname.value = "n_setval";
-
 	document.viewmenu.varvalue.value = "n_category_sortby";	
-
 	document.viewmenu.varvalue2.value = field;
-
 	document.viewmenu.submit();
-
 }
 
-
-
 function n_article_sort(val){
-
 	var field;
-
 	switch(val){
-
 		case 1:
-
 			field = "asc";
-
 		break;
-
 		case 2:
-
 			field = "desc";
-
 		break;
-
 	}
-
 	document.viewmenu.fieldname.value = "n_setval";
-
 	document.viewmenu.varvalue.value = "n_article_sort";	
-
 	document.viewmenu.varvalue2.value = field;
-
 	document.viewmenu.submit();
-
 }
 
-
-
 function n_article_sortby(val){
-
 	var field;
-
 	switch(val){
-
 		case 1:
-
 			field = "Title";
-
 		break;
-
 		case 2:
-
 			field = "Author";
-
 		break;
-
 		case 3:
-
 			field = "Priority";
-
 		break;
-
 	}
-
 	document.viewmenu.fieldname.value = "n_setval";
-
 	document.viewmenu.varvalue.value = "n_article_sortby";	
-
 	document.viewmenu.varvalue2.value = field;
-
 	document.viewmenu.submit();
-
 }
 
-
-
 function n_article_perpage(val){
-
 	document.viewmenu.fieldname.value = "n_setval";
-
 	document.viewmenu.varvalue.value = "n_article_perpage";	
-
 	document.viewmenu.varvalue2.value = val;
-
 	document.viewmenu.submit();
-
 }
 
-
-
 var userchecks = [];
 
-
-
 function adduserchecks(val){
-
 	userchecks[userchecks.length] = val;
-
 }
 
-
-
 function select(val){
 
-
-
 	if (val == 1 || val == 2)
-
 		for(i=0; i<newschecks.length; i++)
-
 		{
-
 			ob = document.getElementById(newschecks[i]);
-
 			ob.all[0].checked = true;
-
 			usenews_add(ob);
-
 		}
-
 	if (val == 1 || val == 3)
-
 		for(i=0; i<catchecks.length; i++)
-
 		{
-
 			ob = document.getElementById(catchecks[i]);
-
 			ob.all[1].checked = true;
-
 			usecat_add(ob);
-
 			}
-
 }
 
-
-
 function unselect(){
 	for(i=0; i<newschecks.length; i++)
-
 	{
-
 		ob = document.getElementById(newschecks[i]);
-
 		if (ob.all[0].checked)
-
 		{	ob.all[0].checked = false;
-
 			usenews_sub(ob);
-
 		}
-
 	}
-
 	for(i=0; i<catchecks.length; i++)
-
 	{
-
 		ob = document.getElementById(catchecks[i]);
-
 		if (ob.all[1].checked)
-
 		{	ob.all[1].checked = false;
-
 			usecat_sub(ob);
-
 		}
-
 	}
-
 }
 
-
-
 function invert(){
 	for(i=0; i<catchecks.length; i++)
-
 	{
-
 		ob = document.getElementById(catchecks[i]);
-
 		if (ob.all[1].checked)
-
 		{	ob.all[1].checked = false;
-
 			usecat_sub(ob);
-
 		}
-
 		else
-
 		{	ob.all[1].checked = true;
-
 			usecat_add(ob);
-
 		}
-
 		
-
 	}
-
 	for(i=0; i<newschecks.length; i++)
-
 	{
-
 		ob = document.getElementById(newschecks[i]);
-
 		if (ob.all[0].checked)
-
 		{	ob.all[0].checked = false;
-
 			usenews_sub(ob);	
-
 		}
-
 		else
-
 		{	ob.all[0].checked = true;
-
 			usenews_add(ob);			
-
 		}
-
 		
-
 	}
 
-
-
 }
 
-
-
 function fwLoadMenus() {
-
   if (window.fw_menu_0) return;
-
     window.fw_menu_0_1 = new Menu("Filter",150,19,"",11,"#000000","#000000","#f0f1eb","#e0e0da");
-
 	fw_menu_0_1.addMenuItem("Leading Articles","location='javascript:n_filter(1,$n_lead_article);'","$n_lead_article");
-
     fw_menu_0_1.addMenuItem("Archived Articles","location='javascript:n_filter(2,$n_archived_article);'","$n_archived_article");
-
 	fw_menu_0_1.addMenuSeparator();
-
     fw_menu_0_1.addMenuItem("Pending Articles","location='javascript:n_filter(3,$n_pending_article);'","$n_pending_article");
-
     fw_menu_0_1.addMenuItem("Pending Categories","location='javascript:n_filter(4,$n_pending_category);'","$n_pending_category");
-
 	fw_menu_0_1.addMenuSeparator();
-
     fw_menu_0_1.addMenuItem("Disabled Articles","location='javascript:n_filter(5,$n_disabled_article);'","$n_disabled_article");
-
     fw_menu_0_1.addMenuItem("Disabled Categories","location='javascript:n_filter(6,$n_disabled_category);'","$n_disabled_category");
-
      fw_menu_0_1.fontWeight="normal";
-
      fw_menu_0_1.hideOnMouseOut=true;
-
       window.fw_menu_0_2_1 = new Menu("Categories",105,19,"",11,"#000000","#000000","#f0f1eb","#e0e0da");
-
       fw_menu_0_2_1.addMenuItem("Ascending","location='javascript:n_cat_sort(1);'","$n_category_sort_asc");
-
       fw_menu_0_2_1.addMenuItem("Descending","location='javascript:n_cat_sort(2);'","$n_category_sort_desc");
-
 	  fw_menu_0_2_1.addMenuSeparator();
-
       fw_menu_0_2_1.addMenuItem("Name","location='javascript:n_cat_sortby(1);'","$n_category_sortby_Name");
-
       fw_menu_0_2_1.addMenuItem("Description","location='javascript:n_cat_sortby(2);'","$n_category_sortby_Description");
-
 	  fw_menu_0_2_1.addMenuItem("Priority","location='javascript:n_cat_sortby(3);'","$n_category_sortby_Priority");
-
 	  fw_menu_0_2_1.fontWeight="normal";
-
        fw_menu_0_2_1.hideOnMouseOut=true;
-
       window.fw_menu_0_2_2 = new Menu("Articles",105,19,"",11,"#000000","#000000","#f0f1eb","#e0e0da");
-
       fw_menu_0_2_2.addMenuItem("Ascending","location='javascript:n_article_sort(1);'","$n_article_sort_asc");
-
       fw_menu_0_2_2.addMenuItem("Descending","location='javascript:n_article_sort(2);'","$n_article_sort_desc");
-
 	  fw_menu_0_2_2.addMenuSeparator();
-
       fw_menu_0_2_2.addMenuItem("Title","location='javascript:n_article_sortby(1);'","$n_article_sortby_Title");
-
       fw_menu_0_2_2.addMenuItem("Author","location='javascript:n_article_sortby(2);'","$n_article_sortby_Author");
-
       fw_menu_0_2_2.addMenuItem("Priority","location='javascript:n_article_sortby(3);'","$n_article_sortby_Priority");
-
 	   fw_menu_0_2_2.fontWeight="normal";
-
        fw_menu_0_2_2.hideOnMouseOut=true;
-
     window.fw_menu_0_2 = new Menu("Sorting",100,19,"",11,"#000000","#000000","#f0f1eb","#e0e0da");
-
     fw_menu_0_2.addMenuItem(fw_menu_0_2_1,"","");
-
     fw_menu_0_2.addMenuItem(fw_menu_0_2_2,"","");
-
      fw_menu_0_2.fontWeight="normal";
-
      fw_menu_0_2.hideOnMouseOut=true;
-
      fw_menu_0_2.childMenuIcon="images/arrows.gif";
-
     window.fw_menu_0_3 = new Menu("Results per Page",55,19,"",11,"#000000","#000000","#f0f1eb","#e0e0da");
-
     fw_menu_0_3.addMenuItem("10","location='javascript:n_article_perpage(10);'","$n_article_perpage_10");
-
     fw_menu_0_3.addMenuItem("20","location='javascript:n_article_perpage(20);'","$n_article_perpage_20");
-
     fw_menu_0_3.addMenuItem("50","location='javascript:n_article_perpage(50);'","$n_article_perpage_50");
-
     fw_menu_0_3.addMenuItem("100","location='javascript:n_article_perpage(100);'","$n_article_perpage_100");
-
      fw_menu_0_3.fontWeight="normal";
-
      fw_menu_0_3.hideOnMouseOut=true;
-
     window.fw_menu_0_4 = new Menu("Select",115,19,"",11,"#000000","#000000","#f0f1eb","#e0e0da");
-
     fw_menu_0_4.addMenuItem("All","javascript:select(1);","");
-
     fw_menu_0_4.addMenuItem("All Articles","javascript:select(2);","");
-
     fw_menu_0_4.addMenuItem("All Categories","javascript:select(3);","");
-
     fw_menu_0_4.addMenuItem("Unselect","javascript:unselect();","");
-
     fw_menu_0_4.addMenuItem("Invert","javascript:invert();","");
-
      fw_menu_0_4.fontWeight="normal";
-
      fw_menu_0_4.hideOnMouseOut=true;
-
   window.fw_menu_0 = new Menu("root",135,19,"",11,"#000000","#000000","#f0f1eb","#e0e0da");
-
   fw_menu_0.addMenuItem("Categories","location='javascript:n_categories_articles(1);'","$n_categories");
-
   fw_menu_0.addMenuItem("Articles","location='javascript:n_categories_articles(2);'","$n_articles");
-
   fw_menu_0.addMenuSeparator();
-
   fw_menu_0.addMenuItem(fw_menu_0_1);
-
   fw_menu_0.addMenuItem(fw_menu_0_2);
-
   fw_menu_0.addMenuItem(fw_menu_0_3);
-
   fw_menu_0.addMenuItem(fw_menu_0_4);
-
    fw_menu_0.fontWeight="normal";
-
    fw_menu_0.hideOnMouseOut=true;
-
    fw_menu_0.childMenuIcon="images/arrows.gif";
 
-
-
   fw_menu_0.writeMenus();
-
 } // fwLoadMenus()
-
 //-->
-
 </script>
 
-
-
 <script language="JavaScript1.2" src="include/fw_menu.js"></script>
 
-
-
 <script language="Javascript">
-
 <!--
 
-
-
 var userchecked = 0;
-
 var edit_ = false;
-
 var delete_ = false;
-
 var approve_ = false;
-
 var addgroup_ = false;
 
-
-
 function user_add(el){
-
 	userchecked++;
-
 	tool_perm();
-
 	el.name = el.className;
-
 	el.className = 'selection';
-
 }
-
 function user_sub(el){
-
 	userchecked--;
-
 	tool_perm();
-
 	el.className = el.name;
-
 }
 
-
-
 function check_edit(){
-
 	if (userchecked != 0)
-
 	{
-
 		document.listform.action='adduser.php?$envar';
-
 		document.listform.submit();
-
 	}
-
 }
-
 END;
 
-
-
 if ($section == 'in-portal:user_list')
-
 	print<<<END
-
 function tool_perm(){
-
 	//edit/move button
 
-
-
 	//if ((edit && moveup && movedown) != null)
-
 	if (edit != null)
-
 	{	
-
 		if (userchecked == 0)
-
 		{
-
 			edit.src = '$pathtoroot' + 'admin/images/' + "tool_edit_2.gif";
-
 			approve.src = '$pathtoroot' + 'admin/images/' + "tool_approve_2.gif";
-
 			del.src = '$pathtoroot' + 'admin/images/' + "tool_del_2.gif";
-
 			adduser.src = '$pathtoroot' + 'admin/images/' + "tool_adduser_2.gif";
-
 			edit_ = false;
-
 			delete_ = false;
-
 			approve_ = false;
-
 			addgroup_ = false;
-
 		}
-
 		else
-
 		{
-
 			edit.src = '$pathtoroot' + 'admin/images/' + "tool_edit.gif";
-
 			approve.src = '$pathtoroot' + 'admin/images/' + "tool_approve.gif";
-
 			del.src = '$pathtoroot' + 'admin/images/' + "tool_del.gif";
-
 			adduser.src = '$pathtoroot' + 'admin/images/' + "tool_adduser.gif";
-
 			edit_ = true;
-
 			delete_ = true;
-
 			approve_ = true;
-
 			addgroup_ = true;
-
 		}
-
 	}
 
-
-
 }
-
 END;
-
 else
-
 print<<<END
-
 function tool_perm(){
 
-
-
 }
 
-
-
 END;
 
-
-
 print<<<END
-
 //-->
-
 </script>
 
-
-
 END;
-
 }
-
 ?>
\ No newline at end of file