--- loncom/interface/lonmenu.pm	2002/06/14 20:02:43	1.23
+++ loncom/interface/lonmenu.pm	2002/12/06 17:49:49	1.29
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.23 2002/06/14 20:02:43 www Exp $
+# $Id: lonmenu.pm,v 1.29 2002/12/06 17:49:49 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,7 +47,7 @@ sub open {
 # resizing does not work on linux because of virtual desktop sizes
        $returnval.=(<<ENDRESIZE);
 if (window.screen) {
-    self.resizeTo(screen.availWidth-215,screen.availHeight-40);
+    self.resizeTo(screen.availWidth-215,screen.availHeight-55);
     self.moveTo(190,15);
 }
 ENDRESIZE
@@ -62,12 +62,12 @@ ENDOPEN
 # ============================================================ Switch Menu Item
 
 sub switchmenu {
-    my ($row,$col,$imgsrc,$texttop,$textbot,$action)=@_;
+    my ($row,$col,$imgsrc,$texttop,$textbot,$action,$description)=@_;
     my $openwin=&openmenu();
     return(<<ENDSMENU);
 <script>
    var swmenu=$openwin
-   swmenu.switchbutton($row,$col,"$imgsrc","$texttop","$textbot","$action");
+   swmenu.switchbutton($row,$col,"$imgsrc","$texttop","$textbot","$action","$description");
 </script>
 ENDSMENU
 }
@@ -79,23 +79,25 @@ sub clear {
     return qq(swmenu.clearbut($row,$col););
 }
 
+# Switch acts on the javascript that is executed when a button is clicked.  
+# The javascript is usually similar to "go('/adm/roles')" or "cstrgo(..)".
 sub switch {
-    my ($uname,$udom,$row,$col,$img,$top,$bot,$act)=@_;
+    my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc)=@_;
     $act=~s/\$uname/$uname/g;
     $act=~s/\$udom/$udom/g;
     return "\n".
- qq(swmenu.switchbutton($row,$col,"$img","$top","$bot","$act"););
+ qq(swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc"););
 }
 
 sub secondlevel {
     my $output='';
     my 
-    ($uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act)=@_;
+    ($uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc)=@_;
     if ($prt eq 'any') {
-	   $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act);
+	   $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
     } elsif ($prt=~/^r(\w+)/) {
         if ($rol eq $1) {
-           $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act);
+           $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
         }
     }
     return $output;
@@ -127,54 +129,58 @@ sub rawconfig {
     my $pub=($ENV{'request.state'} eq 'published');
     my $con=($ENV{'request.state'} eq 'construct');
     my $rol=$ENV{'request.role'};
+    my $requested_domain = $ENV{'request.role.domain'};
     foreach (@desklines) {
-        my ($row,$col,$pro,$prt,$img,$top,$bot,$act)=split(/\:/,$_);
+        my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$_);
         $prt=~s/\$uname/$uname/g;
         $prt=~s/\$udom/$udom/g;
         $prt=~s/\$crs/$crs/g; 
+        $prt=~s/\$requested_domain/$requested_domain/g;
         if ($pro eq 'clear') {
 	    $output.=&clear($row,$col);
         } elsif ($pro eq 'any') {
                $output.=&secondlevel(
-	  $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act);
+	  $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc);
 	} elsif ($pro eq 'smp') {
             unless ($adv) {
                $output.=&secondlevel(
-          $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act);
+          $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc);
             }
         } elsif ($pro eq 'adv') {
             if ($adv) {
                $output.=&secondlevel(
-	  $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act);
+	  $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc);
             }
         } elsif (($pro=~/p(\w+)/) && ($prt)) {
 	    if (&Apache::lonnet::allowed($1,$prt)) {
-               $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act);
+               $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
             }
+        } elsif ($pro eq 'course') {
+            if ($ENV{'request.course.fn'}) {
+               $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
+	    }
         } elsif ($pro eq 'author') {
             if ($author) {
-                if (($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) {
+                if ((($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) ||
+                    (($prt eq 'rau') && ($ENV{'request.role'}=~/^au/))) {
                     # Check that we are on the correct machine
-		    my ($cadom,$caname)=
+                    my $cadom=$requested_domain;
+                    my $caname=$ENV{'user.name'};
+                    if ($prt eq 'rca') {
+		       ($cadom,$caname)=
                                ($ENV{'request.role'}=~/(\w+)\/(\w+)$/);
+                    }                       
+                    $act =~ s/\$caname/$caname/g;
                     my $home = &Apache::lonnet::homeserver($caname,$cadom);
                     if ($home eq $r->dir_config('lonHostID')) {
                         $output.=switch($caname,$cadom,
-                                        $row,$col,$img,$top,$bot,$act);
-                    }
-                } elsif ($prt eq 'any') {
-                    my $home = &Apache::lonnet::homeserver
-                        ($ENV{'user.name'},$ENV{'user.domain'});
-                    if ($home eq $r->dir_config('lonHostID')) {
-                        $output.=switch
-                            ($ENV{'user.name'},$ENV{'user.domain'},
-                             $row,$col,$img,$top,$bot,$act);
+                                        $row,$col,$img,$top,$bot,$act,$desc);
                     }
                 }
             }
         }
     }
-    $output.="swmenu.clock.setTime(1000*".time.");";
+    $output.="swmenu.syncclock(1000*".time.");";
     return $output;
 }