--- loncom/interface/lonmenu.pm	2004/11/11 23:45:36	1.128
+++ loncom/interface/lonmenu.pm	2004/11/14 07:32:20	1.130
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.128 2004/11/11 23:45:36 albertel Exp $
+# $Id: lonmenu.pm,v 1.130 2004/11/14 07:32:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -96,17 +96,19 @@ ENDNAV
 ENDRELOAD
             }
         }
+        my $form=&serverform();
         my $utility=&utilityfunctions();
 	my $output=(<<ENDMAINMENU);
-<script>
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 $utility
 </script>
 <a href="/adm/menu" target="_top">$lt{'main'}</a>
 $reloadlink $navmaps<br />
-<script>
+<script type="text/javascript">
 // END LON-CAPA Internal
 </script>
+$form
 ENDMAINMENU
         if ($registration) { $output.=&innerregister($forcereg,$target); }
 	return $output."<hr />";
@@ -137,7 +139,7 @@ ENDMAINMENU
         if ($ENV{'request.course.id'}) {
         	    $navmaps=(<<ENDNAV);
 <td bgcolor="$tabbg">
-<a href="javascript:gonav('/adm/navmaps?postdata=$escurl&postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td>
+<a href="javascript:gonav('/adm/navmaps?postdata=$escurl&amp;postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td>
 ENDNAV
 	    if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
                 ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
@@ -153,9 +155,10 @@ ENDRELOAD
         if ($registration) {
            $reg=&innerregister($forcereg,$target);
         }
+        my $form=&serverform();
 	my $utility=&utilityfunctions();
 	return (<<ENDINLINEMENU);
-<script>
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 $utility
 </script>
@@ -167,15 +170,16 @@ $utility
 $reloadlink
 $navmaps
 <td bgcolor="$tabbg">
-<a href="/adm/remote?action=launch&url=$escurl" target="_top">
+<a href="/adm/remote?action=launch&amp;url=$escurl" target="_top">
 <font color="$font">$lt{'launch'}</font></a></td>
 <td bgcolor="$tabbg">
 <img align="right" src="/adm/lonIcons/minilogo.gif" />
 <b>LON-CAPA</b></td>
+$form
 </tr>
 </table>
 </font>
-<script>
+<script type="text/javascript">
 // END LON-CAPA Internal
 </script>
 $reg
@@ -406,7 +410,6 @@ ENDREALRES
         }
         if ($textual) {
 # Registered, textual output
-            my $form=&serverform();
 	    my $inlinebuttons='';
 
 	    if ($ENV{'browser.interface'} eq 'textual') {
@@ -414,7 +417,7 @@ ENDREALRES
                         join('',map { (defined($_)?$_:'') } @inlineremote);
 	    } else {
 		$inlinebuttons=(<<ENDINLINE);
-<tr><td>$inlineremote[21]</td><td>&nbsp</td><td>$inlineremote[23]</td></tr>
+<tr><td>$inlineremote[21]</td><td>&nbsp;</td><td>$inlineremote[23]</td></tr>
 <tr><td>$inlineremote[61]</td><td>$inlineremote[62]</td><td>$inlineremote[63]</td></tr>
 <tr><td>$inlineremote[71]</td><td>$inlineremote[72]</td><td>$inlineremote[73]</td></tr>
 <tr><td>$inlineremote[81]</td><td>$inlineremote[82]</td><td>$inlineremote[83]</td></tr>
@@ -422,7 +425,7 @@ ENDREALRES
 ENDINLINE
 	    }
 	    $result =(<<ENDREGTEXT);
-<script>
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 </script>
 $timesync
@@ -430,8 +433,7 @@ $newmail
 $tablestart
 $inlinebuttons
 $tableend
-$form
-<script>
+<script type="text/javascript">
 // END LON-CAPA Internal
 </script>
 
@@ -444,7 +446,7 @@ ENDREGTEXT
 	    my $navstatus=&get_nav_status();
 	    $result = (<<ENDREGTHIS);
      
-<script language="JavaScript">
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -495,7 +497,7 @@ ENDDONOTREGTEXT
 # Not registered, graphical
            $result = (<<ENDDONOTREGTHIS);
 
-<script language="JavaScript">
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -553,7 +555,7 @@ sub startupremote {
     my $esclowerurl=&Apache::lonnet::escape($lowerurl);
     my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited');
     return(<<ENDREMOTESTARTUP);
-<script>
+<script type="text/javascript">
 var timestart;
 function wheelswitch() {
     if (typeof(document.wheel) != 'undefined') {
@@ -610,7 +612,7 @@ ENDREMOTESTARTUP
 
 sub setflags() {
     return(<<ENDSETFLAGS);
-<script>
+<script type="text/javascript">
     menuloaded=0;
     tim=0;
 </script>
@@ -621,7 +623,7 @@ sub maincall() {
     if (($ENV{'browser.interface'} eq 'textual') ||
         ($ENV{'environment.remote'} eq 'off')) { return ''; }
     return(<<ENDMAINCALL);
-<script>
+<script type="text/javascript">
     main();
 </script>
 ENDMAINCALL
@@ -679,7 +681,7 @@ var menu=window.open("/res/adm/pages/men
 "height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
 self.name='loncapaclient';
 ENDOPEN
-    return '<script>'.$returnval.'</script>';
+    return '<script type="text/javascript">'.$returnval.'</script>';
 }
 
 
@@ -907,7 +909,7 @@ sub close {
         ($ENV{'environment.remote'} eq 'off')) { return ''; }
     my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     return(<<ENDCLOSE);
-<script>
+<script type="text/javascript">
 window.status='Accessing Remote Control';
 menu=window.open("/adm/rat/empty.html","$menuname",
                  "height=350,width=150,scrollbars=no,menubar=no");
@@ -1057,7 +1059,11 @@ sub handler {
     $r->send_http_header;
     return OK if $r->header_only;
 
-    my $form=&serverform();
+    my $form;
+    if ($ENV{'environment.remote'} ne 'off' &&
+	$ENV{'browser.interface'} ne 'textual') {
+	$form=&serverform();
+    }
     my $bodytag=&Apache::loncommon::bodytag('Main Menu');
     my $function='student';
     if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {