--- loncom/interface/lonmenu.pm	2005/02/21 00:32:04	1.149
+++ loncom/interface/lonmenu.pm	2005/02/26 06:14:01	1.150
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.149 2005/02/21 00:32:04 www Exp $
+# $Id: lonmenu.pm,v 1.150 2005/02/26 06:14:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -112,9 +112,8 @@ ENDRELOAD
         my $utility=&utilityfunctions();
 	my $output=(<<ENDMAINMENU);
 <script type="text/javascript">
-<!-- // BEGIN LON-CAPA Internal
+// BEGIN LON-CAPA Internal
 $utility
--->
 </script>
 <a href="/adm/menu" target="_top">$lt{'main'}</a>
 $reloadlink $navmaps
@@ -188,9 +187,10 @@ ENDRELOAD
 	my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
 	return (<<ENDINLINEMENU);
 <script type="text/javascript">
-<!-- // BEGIN LON-CAPA Internal
+// BEGIN LON-CAPA Internal
+// <![CDATA[
 $utility
--->
+// ]]>
 </script>
 <font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
 <tr>
@@ -309,9 +309,10 @@ sub innerregister {
     }
     if ($ENV{'request.state'} eq 'construct') {
         $newmail = $titletable;
-    }
-    if ($noremote) {
-	$newmail.='</td></tr></table></font>';
+    } else {
+	if ($noremote) {
+	    $newmail.='</td></tr></table></font>';
+	}
     }
     my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
     my $tablestart=($noremote?'<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%">':'').($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':'');
@@ -503,7 +504,7 @@ ENDREGTEXT
 	    $result = (<<ENDREGTHIS);
      
 <script type="text/javascript">
-// <!-- BEGIN LON-CAPA Internal
+// BEGIN LON-CAPA Internal
 var swmenu=null;
 
     function LONCAPAreg() {
@@ -538,7 +539,7 @@ var swmenu=null;
 			  2000);
       }
 
-// END LON-CAPA Internal -->
+// END LON-CAPA Internal 
 </script>
 ENDREGTHIS
         }