--- loncom/interface/lonmenu.pm	2005/07/12 15:55:06	1.157
+++ loncom/interface/lonmenu.pm	2005/11/08 17:57:41	1.163
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.157 2005/07/12 15:55:06 albertel Exp $
+# $Id: lonmenu.pm,v 1.163 2005/11/08 17:57:41 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,12 +78,13 @@ sub menubuttons {
 					    ['inhibitmenu']);
     if (($env{'form.inhibitmenu'} eq 'yes') ||
         ($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; }
-
+    my %lt=&initlittle();
     my $navmaps='';
     my $reloadlink='';
     my $docs='';
     my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'}));
     my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
+    my $face= 'face="Arial,Helvetica,sans-serif"';
     if ($env{'request.state'} eq 'construct') {
         if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) {
             my $returnurl = $env{'request.filename'};
@@ -93,7 +94,6 @@ sub menubuttons {
     }
     if ($env{'browser.interface'} eq 'textual') {
 # Textual display only
-	my %lt=&initlittle();
         $pgbg='#FFFFFF';
         $tabbg='#FFFFFF';
 	$font='#000000';
@@ -106,12 +106,12 @@ ENDNAV
          ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
                 my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);
-<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a>
+<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a>
 ENDRELOAD
             }
 	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
                $docs=(<<ENDDOCS);
-<a href="/adm/coursedocs" target="_top"><font color="$font">$lt{'docs'}</font></a>
+<a href="/adm/coursedocs" target="_top"><font $face color="$font">$lt{'docs'}</font></a>
 ENDDOCS
             }
 	}
@@ -124,8 +124,8 @@ $utility
 </script>
 <a href="/adm/menu" target="_top">$lt{'main'}</a>
 $reloadlink $navmaps $docs
-<a href="/adm/roles" target="_top"><font color="$font">$lt{'roles'}</font></a>
-<a href="/adm/logout" target="_top"><font color="$font">$lt{'exit'}</font></a>
+<a href="/adm/roles" target="_top"><font $face color="$font">$lt{'roles'}</font></a>
+<a href="/adm/logout" target="_top"><font $face color="$font">$lt{'exit'}</font></a>
 <br />
 <script type="text/javascript">
 // END LON-CAPA Internal
@@ -184,12 +184,12 @@ ENDINLINEMENU
 	    }
 	    $navmaps=(<<ENDNAV);
 <td bgcolor="$tabbg">
-<a href="$link"><font color="$font">$lt{'nav'}</font></a></td>
+<a href="$link" target="_top"><font $face color="$font">$lt{'nav'}</font></a></td>
 ENDNAV
 	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
 		$docs=(<<ENDDOCS);
 <td bgcolor="$tabbg">
-<a href="/adm/coursedocs"><font color="$font">$lt{'docs'}</font></a></td>
+<a href="/adm/coursedocs" target="_top"><font $face color="$font">$lt{'docs'}</font></a></td>
 ENDDOCS
             }
 	    if (
@@ -205,10 +205,17 @@ ENDDOCS
                 my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);
 <td bgcolor="$tabbg">
-<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a></td>
+<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a></td>
 ENDRELOAD
             }
         }
+	if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) {
+	    my $escreload=&Apache::lonnet::escape('return:');
+	    $reloadlink=(<<ENDCRELOAD);
+<td bgcolor="$tabbg">
+<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a></td>
+ENDCRELOAD
+        }
         my $reg='';
         if ($registration) {
            $reg=&innerregister($forcereg,$target,$titletable);
@@ -216,7 +223,6 @@ ENDRELOAD
         my $form=&serverform();
 	my $utility=&utilityfunctions();
 	my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
-	my $face= 'face="Arial,Helvetica,sans-serif"';
 
 	return (<<ENDINLINEMENU);
 <script type="text/javascript">
@@ -363,7 +369,7 @@ sub innerregister {
 
         my $hwkadd='';
         if ($env{'request.symb'} ne '' &&
-	    $env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+	    $env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
 	    if (&Apache::lonnet::allowed('mgr',$crs)) {
 		$hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_3]',
                        "gocmd('/adm/grades','gradingmenu')",
@@ -1186,6 +1192,7 @@ sub get_nav_status {
 
 sub handler {
     my $r = shift;
+    &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;