--- loncom/interface/lonmenu.pm	2002/05/24 20:32:48	1.21
+++ loncom/interface/lonmenu.pm	2002/08/08 19:33:09	1.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.21 2002/05/24 20:32:48 www Exp $
+# $Id: lonmenu.pm,v 1.25 2002/08/08 19:33:09 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,17 +42,21 @@ use vars qw(@desklines $readdesk);
 # =============================================================== Open the menu
 
 sub open {
-#    return(<<ENDOPEN);
-#if (window.screen) {
-#    self.resizeTo(screen.availWidth-215,screen.availHeight-30);
-#    self.moveTo(190,15);
-#}
-    return(<<ENDOPEN);
-<script>
+    my $returnval='';
+    unless (shift eq 'unix') {
+# 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.moveTo(190,15);
+}
+ENDRESIZE
+    }
+    $returnval.=(<<ENDOPEN);
 var menu=window.open("/res/adm/pages/menu.html","LONCAPAmenu",
 "height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
-</script>
 ENDOPEN
+    return '<script>'.$returnval.'</script>';
 }
 
 # ============================================================ Switch Menu Item
@@ -75,6 +79,8 @@ 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)=@_;
     $act=~s/\$uname/$uname/g;
@@ -123,11 +129,13 @@ 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(/\:/,$_);
         $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') {
@@ -170,7 +178,7 @@ sub rawconfig {
             }
         }
     }
-    $output.="swmenu.clock.setTime(1000*".time.");";
+    $output.="swmenu.syncclock(1000*".time.");";
     return $output;
 }