--- loncom/interface/lonmenu.pm	2002/02/08 23:52:37	1.13
+++ loncom/interface/lonmenu.pm	2002/03/21 17:53:27	1.18
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.13 2002/02/08 23:52:37 harris41 Exp $
+# $Id: lonmenu.pm,v 1.18 2002/03/21 17:53:27 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,6 +30,7 @@
 # 05/29/00,05/30 Gerd Kortemeyer)
 #
 # 10/05,05/28,05/30,06/01,06/08,06/09,07/04,08/07 Gerd Kortemeyer
+# 02/15/02 Matthew Hall
 
 package Apache::lonmenu;
 
@@ -41,11 +42,15 @@ 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>
-window.status='MenuControl:nologout';
 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
 }
@@ -54,9 +59,10 @@ ENDOPEN
 
 sub switchmenu {
     my ($row,$col,$imgsrc,$texttop,$textbot,$action)=@_;
+    my $openwin=&openmenu();
     return(<<ENDSMENU);
 <script>
-   swmenu=window.open('','LONCAPAmenu');
+   swmenu=$openwin
    swmenu.switchbutton($row,$col,"$imgsrc","$texttop","$textbot","$action");
 </script>
 ENDSMENU
@@ -91,8 +97,16 @@ sub secondlevel {
     return $output;
 }
 
+sub openmenu {
+    if ($ENV{'browser.type'} eq 'explorer') {
+       return "window.open('javascript:void(0);','LONCAPAmenu');";
+   } else {
+       return "window.open('','LONCAPAmenu');";
+   }
+}
+
 sub rawconfig {
-    my $output="swmenu=window.open('','LONCAPAmenu');";
+    my $output="swmenu=".&openmenu();
     my $uname=$ENV{'user.name'};
     my $udom=$ENV{'user.domain'};
     my $adv=$ENV{'user.adv'};
@@ -154,7 +168,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();
@@ -171,17 +184,22 @@ sub footer {
 # ================================================================ Main Program
 
 BEGIN {
-  unless ($readdesk) {
-  {
+  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);
-       $desklines[$#desklines+1]=$configline;
+       if ($configline) {
+          $desklines[$#desklines+1]=$configline;
+       }
     }
+   }
+   $readdesk='done';
   }
 }
-}
 1;
 __END__