--- loncom/interface/lonmenu.pm	2003/11/21 21:38:50	1.103
+++ loncom/interface/lonmenu.pm	2004/04/01 15:29:40	1.107
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.103 2003/11/21 21:38:50 www Exp $
+# $Id: lonmenu.pm,v 1.107 2004/04/01 15:29:40 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,7 +43,6 @@ use Apache::lonnet;
 use Apache::Constants qw(:common);
 use Apache::lonhtmlcommon();
 use Apache::loncommon;
-use Apache::File;
 use Apache::lonlocal;
 
 use vars qw(@desklines $readdesk);
@@ -264,30 +263,29 @@ sub innerregister {
 # ============================ This is for URLs that actually can be registered
     if (($ENV{'request.noversionuri'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
 # -- This applies to homework problems for users with grading privileges
-        my $hwkadd='';
-        if 
-      ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
-	    my $crs='/'.$ENV{'request.course.id'};
-	    if ($ENV{'request.course.sec'}) {
-	        $crs.='_'.$ENV{'request.course.sec'};
-	    }
-	    $crs=~s/\_/\//g;
+	my $crs='/'.$ENV{'request.course.id'};
+	if ($ENV{'request.course.sec'}) {
+	    $crs.='_'.$ENV{'request.course.sec'};
+	}
+	$crs=~s/\_/\//g;
 
+        my $hwkadd='';
+        if ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 	    if (&Apache::lonnet::allowed('vgr',$crs)) {
-		$hwkadd.=&switch('','',7,1,'subm.gif','view sub-','missions',
+		$hwkadd.=&switch('','',7,1,'subm.gif','view sub-[_1]','missions[_1]',
                        "gocmd('/adm/grades','submission')",
 		       'View user submissions for this assessment resource');
             }
 	    if (&Apache::lonnet::allowed('mgr',$crs)) {
-		$hwkadd.=&switch('','',7,2,'pgrd.gif','problem','grades',
+		$hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_3]',
                        "gocmd('/adm/grades','gradingmenu')",
                        'Modify user grades for this assessment resource');
             }
-	    if (&Apache::lonnet::allowed('opa',$crs)) {
-		$hwkadd.=&switch('','',7,3,'pparm.gif','problem','parms',
-                       "gocmd('/adm/parmset','set')",
-                       'Modify deadlines, etc, for this assessment resource');
-            }
+	}
+	if (&Apache::lonnet::allowed('opa',$crs)) {
+	    $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]',
+			     "gocmd('/adm/parmset','set')",
+			     'Modify deadlines, etc, for this resource');
 	}
 # -- End Homework
         ###
@@ -338,7 +336,7 @@ sub innerregister {
             # Finally, turn the button on or off
             if ($cfile) {
                 $editbutton=&switch
-                    ('','',6,1,'cstr.gif','edit','resource',
+                    ('','',6,1,'cstr.gif','edit[_1]','resource[_2]',
                      "go('".$cfile."');","Edit this resource");
             } elsif ($editbutton eq '') {
                 $editbutton=&clear(6,1);
@@ -349,20 +347,20 @@ sub innerregister {
 # Prepare the rest of the buttons
 	my $menuitems=(<<ENDMENUITEMS);
 c&3&1
-s&2&1&back.gif&backward&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
-s&2&3&forw.gif&forward&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3
+s&2&1&back.gif&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
+s&2&3&forw.gif&forward[_1]&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3
 c&6&3
 c&8&1
 c&8&2
-s&8&3&prt.gif&prepare&printout&gopost('/adm/printout',currentURL)&Prepare a printable document
-s&9&1&sbkm.gif&set&bookmark&set_bookmark()&Set a bookmark for this resource&2
-s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2
+s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&2
+s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&2
 ENDMENUITEMS
         unless ($ENV{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
 	    $menuitems.=(<<ENDREALRES);
-s&6&3&catalog.gif&catalog&info&catalog_info()&Show catalog information
-s&8&1&eval.gif&evaluate&this&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
-s&8&2&fdbk.gif&feedback&discuss&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
+s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information
+s&8&1&eval.gif&evaluate[_1]&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
+s&8&2&fdbk.gif&feedback[_1]&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
 ENDREALRES
 	}
         my $buttons='';
@@ -646,6 +644,7 @@ sub switch {
     $top=&mt($top);
     $bot=&mt($bot);
     $desc=&mt($desc);
+    $img=&mt($img);
     unless (($ENV{'browser.interface'} eq 'textual')  ||
             ($ENV{'environment.remote'} eq 'off')) {
 # Remote
@@ -668,8 +667,12 @@ sub switch {
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
        $text=~s/\s*\-\s*//gs;
+
+       my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
+       if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
        my $pic=
-	   '<img border="0" alt="'.$text.'" src="/res/adm/pages/'.$img.'" align="'.
+	   '<img border="0" alt="'.$text.'" src="http://'.$ENV{'HTTP_HOST'}.
+	   ':'.$lonhttpdPort.'/res/adm/pages/'.$img.'" align="'.
 	   ($nobreak==3?'right':'left').'" />';
        if (($ENV{'browser.interface'} eq 'textual') || ($ENV{'browser.interface'} eq 'faketextual')) {
 # Accessibility
@@ -962,15 +965,17 @@ ENDHEADER
 BEGIN {
   if (! defined($readdesk)) {
    {
-    my $config=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
-				  '/mydesk.tab');
-    while (my $configline=<$config>) {
-       $configline=(split(/\#/,$configline))[0];
-       $configline=~s/^\s+//;
-       chomp($configline);
-       if ($configline) {
-          $desklines[$#desklines+1]=$configline;
-       }
+    my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab';
+    if ( CORE::open( my $config,"<$tabfile") ) {
+        while (my $configline=<$config>) {
+            $configline=(split(/\#/,$configline))[0];
+            $configline=~s/^\s+//;
+            chomp($configline);
+            if ($configline) {
+                $desklines[$#desklines+1]=$configline;
+            }
+        }
+        CORE::close($config);
     }
    }
    $readdesk='done';