--- loncom/interface/lonmenu.pm	2004/11/11 22:47:55	1.127
+++ loncom/interface/lonmenu.pm	2004/11/13 21:07:19	1.129
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.127 2004/11/11 22:47:55 albertel Exp $
+# $Id: lonmenu.pm,v 1.129 2004/11/13 21:07:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -98,13 +98,13 @@ ENDRELOAD
         }
         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>
 ENDMAINMENU
@@ -137,7 +137,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\//) &&
@@ -155,7 +155,7 @@ ENDRELOAD
         }
 	my $utility=&utilityfunctions();
 	return (<<ENDINLINEMENU);
-<script>
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 $utility
 </script>
@@ -167,7 +167,7 @@ $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" />
@@ -175,7 +175,7 @@ $navmaps
 </tr>
 </table>
 </font>
-<script>
+<script type="text/javascript">
 // END LON-CAPA Internal
 </script>
 $reg
@@ -227,12 +227,7 @@ sub innerregister {
     my $target = shift;
     my $result = '';
     my ($uname,$thisdisfn);
-    my $const_space = 0;
-    if ($ENV{'request.filename'} =~ /^\/home\/([^\/]+)\/public_html\/(.*)/) {
-        $const_space = 1;
-        $uname = $1;
-        $thisdisfn = $2;
-    }
+    my $const_space = ($ENV{'request.state'} eq 'construct');
 
     if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
 
@@ -252,38 +247,6 @@ sub innerregister {
     if ($noremote) {
 	$newmail='<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'">';
     }
-    if ($textual && $const_space) {
-        my $formaction='/priv/'.$uname.'/'.$thisdisfn;
-        $formaction=~s/\/+/\//g;
-        my $titleinfo = '<form name="dirs" method="post" action="'.$formaction
-              .'" target="_top">'.
-        &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn,'_top','/priv','','-1').
-        &Apache::lonhtmlcommon::select_recent('construct','recent',
-                 'this.form.action=this.form.recent.value;this.form.submit()').
-              '</form>';
-        &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
-        $newmail .= &constspaceform();
-# role and realm
-        my ($role,$realm) = &Apache::lonnet::plaintext((split(/\./,$ENV{'request.role'}))[0]);
-        unless ($realm) { $realm='&nbsp;'; }
-        $newmail .= <<END;
-<table width="100%" cellspacing="0" border="0" cellpadding="0">
-<tr>
-<td>
-$titleinfo
-</td>
-<td align="right">
-<font size="2" face="Arial, Helvetica, sans-serif">
-    $ENV{'environment.firstname'}
-    $ENV{'environment.middlename'}
-    $ENV{'environment.lastname'}
-    $ENV{'environment.generation'}
-    </font>&nbsp;<br />
-    <font size="2" face="Arial, Helvetica, sans-serif">$role</font>&nbsp;
-</td></tr>
-</table>
-END
-    }
     if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
 	my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($ENV{'request.symb'});
         $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
@@ -401,6 +364,8 @@ END
 # Prepare the rest of the buttons
         my $menuitems;
         if ($const_space) {
+	    my ($uname,$thisdisfn) =
+		($ENV{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|);
             my $currdir = '/priv/'.$uname.'/'.$thisdisfn;
             $currdir =~ s#[^/]+$##;
             $menuitems=(<<ENDMENUITEMS);
@@ -449,7 +414,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>
@@ -457,7 +422,7 @@ ENDREALRES
 ENDINLINE
 	    }
 	    $result =(<<ENDREGTEXT);
-<script>
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 </script>
 $timesync
@@ -466,7 +431,7 @@ $tablestart
 $inlinebuttons
 $tableend
 $form
-<script>
+<script type="text/javascript">
 // END LON-CAPA Internal
 </script>
 
@@ -479,7 +444,7 @@ ENDREGTEXT
 	    my $navstatus=&get_nav_status();
 	    $result = (<<ENDREGTHIS);
      
-<script language="JavaScript">
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -530,7 +495,7 @@ ENDDONOTREGTEXT
 # Not registered, graphical
            $result = (<<ENDDONOTREGTHIS);
 
-<script language="JavaScript">
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -588,7 +553,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') {
@@ -645,7 +610,7 @@ ENDREMOTESTARTUP
 
 sub setflags() {
     return(<<ENDSETFLAGS);
-<script>
+<script type="text/javascript">
     menuloaded=0;
     tim=0;
 </script>
@@ -656,7 +621,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
@@ -714,7 +679,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>';
 }
 
 
@@ -942,7 +907,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");