--- loncom/interface/lonmenu.pm	2002/01/06 01:29:53	1.12
+++ loncom/interface/lonmenu.pm	2002/02/13 16:08:26	1.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.12 2002/01/06 01:29:53 harris41 Exp $
+# $Id: lonmenu.pm,v 1.14 2002/02/13 16:08:26 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,9 +43,12 @@ use vars qw(@desklines $readdesk);
 sub open {
     return(<<ENDOPEN);
 <script>
-window.status='MenuControl:nologout';
+if (window.screen) {
+    self.resizeTo(screen.availWidth-215,screen.availHeight-30);
+    self.moveTo(190,15);
+}
 menu=window.open("/res/adm/pages/menu.html","LONCAPAmenu",
-                 "height=350,width=150,scrollbars=no,menubar=no");
+"height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
 </script>
 ENDOPEN
 }
@@ -108,7 +111,7 @@ sub rawconfig {
     my $pub=($ENV{'request.state'} eq 'published');
     my $con=($ENV{'request.state'} eq 'construct');
     my $rol=$ENV{'request.role'};
-    map {
+    foreach (@desklines) {
         my ($row,$col,$pro,$prt,$img,$top,$bot,$act)=split(/\:/,$_);
         $prt=~s/\$uname/$uname/g;
         $prt=~s/\$udom/$udom/g;
@@ -145,7 +148,7 @@ sub rawconfig {
                 }
             }
         }
-    } @desklines;
+    }
     return $output;
 }
 
@@ -154,7 +157,6 @@ sub rawconfig {
 sub close {
     return(<<ENDCLOSE);
 <script>
-window.status='MenuControl:nologout';
 menu=window.open("/adm/rat/empty.html","LONCAPAmenu",
                  "height=350,width=150,scrollbars=no,menubar=no");
 menu.close();
@@ -170,18 +172,23 @@ sub footer {
 
 # ================================================================ Main Program
 
-BEGIN {
-  unless ($readdesk) {
-  {
+sub BEGIN {
+  if ($readdesk ne 'done') {
+   {
     my $config=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
 				  '/mydesk.tab');
     while (my $configline=<$config>) {
+       $configline=(split(/\#/,$configline))[0];
+       $configline=~s/^\s+//;
        chomp($configline);
-       $desklines[$#desklines+1]=$configline;
+       if ($configline) {
+          $desklines[$#desklines+1]=$configline;
+       }
     }
+   }
+   $readdesk='done';
   }
 }
-}
 1;
 __END__