--- loncom/interface/lonmenu.pm	2005/01/31 19:20:47	1.141
+++ loncom/interface/lonmenu.pm	2005/02/17 08:29:42	1.147
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.141 2005/01/31 19:20:47 albertel Exp $
+# $Id: lonmenu.pm,v 1.147 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -108,8 +108,9 @@ 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<br />
@@ -154,9 +155,16 @@ ENDMAINMENU
 <td bgcolor="$tabbg">
 <a href="$link"><font color="$font">$lt{'nav'}</font></a></td>
 ENDNAV
-	    if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
-                ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
-         ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
+	    if (
+		($ENV{'request.noversionuri'}=~m[^/(res|public)/] &&
+		 $ENV{'request.symb'} eq '')
+		||
+		(($ENV{'request.noversionuri'}=~/^\/adm\//) &&
+		 ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
+		 ($ENV{'request.noversionuri'}!~
+		        m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
+		  )
+		 ) {
                 my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);
 <td bgcolor="$tabbg">
@@ -170,10 +178,12 @@ ENDRELOAD
         }
         my $form=&serverform();
 	my $utility=&utilityfunctions();
+	my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
 	return (<<ENDINLINEMENU);
 <script type="text/javascript">
-// BEGIN LON-CAPA Internal
+<!-- // BEGIN LON-CAPA Internal
 $utility
+-->
 </script>
 <font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
 <tr>
@@ -186,7 +196,7 @@ $navmaps
 <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" />
+<img align="right" src="$logo" />
 <b>LON-CAPA</b></td>
 $form
 </tr>
@@ -295,7 +305,7 @@ sub innerregister {
     my $tableend=($noremote?'</table></font>':'').($textinter?'<a name="content" />':'');
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
-    if (($ENV{'request.noversionuri'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
+    if (($ENV{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) {
 # -- This applies to homework problems for users with grading privileges
 	my $crs='/'.$ENV{'request.course.id'};
 	if ($ENV{'request.course.sec'}) {
@@ -304,7 +314,8 @@ sub innerregister {
 	$crs=~s/\_/\//g;
 
         my $hwkadd='';
-        if ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+        if ($ENV{'request.symb'} ne '' &&
+	    $ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 	    if (&Apache::lonnet::allowed('vgr',$crs)) {
 		$hwkadd.=&switch('','',7,1,'subm.gif','view sub-[_1]','missions[_1]',
                        "gocmd('/adm/grades','submission')",
@@ -316,7 +327,8 @@ sub innerregister {
                        'Modify user grades for this assessment resource');
             }
 	}
-	if (&Apache::lonnet::allowed('opa',$crs)) {
+	if ($ENV{'request.symb'} ne '' &&
+	    &Apache::lonnet::allowed('opa',$crs)) {
 	    $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]',
 			     "gocmd('/adm/parmset','set')",
 			     'Modify deadlines, etc, for this resource');
@@ -401,7 +413,8 @@ s&7&1&del.gif&delete[_1]&resource[_2]&go
 s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document
 ENDMENUITEMS
             }
-        } elsif (defined($ENV{'request.course.id'})) {
+        } elsif (defined($ENV{'request.course.id'}) && 
+		 $ENV{'request.symb'} ne '') {
 	    $menuitems=(<<ENDMENUITEMS);
 c&3&1
 s&2&1&back.gif&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
@@ -430,7 +443,9 @@ ENDREALRES
                 $buttons.=&clear(@rest);
             }
         }
-        if ($textual) {
+	my $addremote=0;
+	foreach (@inlineremote) { if ($_ ne '') { $addremote=1; } }
+        if ($textual && $addremote) {
 # Registered, textual output
 	    my $inlinebuttons='';
 
@@ -979,7 +994,8 @@ sub utilityfunctions {
     my $caller = shift;
     unless (($ENV{'browser.interface'} eq 'textual')  ||
         ($ENV{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; }
-    my $currenturl=&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'});
+    my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$ENV{'request.noversionuri'}))[0]));
+    $currenturl=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($currenturl));
     
     my $currentsymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'});
     my $nav_control=&nav_control_js();
@@ -1147,7 +1163,7 @@ sub handler {
     $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
     $font=&Apache::loncommon::designparm($function.'.font',$domain);
     my $script_tag;
-    if ($ENV{'environment.remote'} eq 'on') {
+    if ($ENV{'environment.remote'} ne 'off') {
         my $utility=&utilityfunctions('/adm/menu');
         $script_tag=(<<ENDSCRIPT);
 <script type="text/javascript">
@@ -1160,8 +1176,10 @@ ENDSCRIPT
 	$ENV{'browser.interface'}='faketextual';
 	$ENV{'environment.remote'}='off';
     }
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEADER);
-<html><head>
+$html
+<head>
 <title>LON-CAPA Main Menu</title>
 $script_tag
 </head>