--- loncom/interface/lonmenu.pm	2005/06/08 02:14:29	1.154
+++ loncom/interface/lonmenu.pm	2005/12/01 19:00:46	1.164
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.154 2005/06/08 02:14:29 www Exp $
+# $Id: lonmenu.pm,v 1.164 2005/12/01 19:00:46 albertel 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
@@ -157,6 +157,24 @@ ENDMAINMENU
         my $alink=&Apache::loncommon::designparm($function.'.alink',$domain);
         my $vlink=&Apache::loncommon::designparm($function.'.vlink',$domain);
         my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain);
+	if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
+	    my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
+	    return (<<ENDINLINEMENU);
+<font face="Arial,Helvetica,sans-serif">
+   <table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
+    <tr>
+      <td bgcolor="$tabbg">
+        <a href="/adm/logout" target="_top"><font color="$font">$lt{'exit'}</font></a>
+     </td>
+     <td align="right" bgcolor="$tabbg">
+       <img align="right" src="$logo" alt="Logo" />
+       <b>LON-CAPA</b>&nbsp;
+     </td>
+   </tr>
+  </table>
+</font>
+ENDINLINEMENU
+        }
 # Do we have a NAV link?
         if ($env{'request.course.id'}) {
 	    my $link='/adm/navmaps?postdata='.$escurl.'&amp;postsymb='.
@@ -166,12 +184,12 @@ ENDMAINMENU
 	    }
 	    $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 (
@@ -187,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);
@@ -198,6 +223,7 @@ 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
@@ -205,30 +231,29 @@ ENDRELOAD
 $utility
 // ]]>
 </script>
-<font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
+<table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
 <tr>
 <td bgcolor="$tabbg">
-<a href="/adm/menu" target="_top"><font color="$font">$lt{'main'}</font></a>
+<a href="/adm/menu" target="_top"><font $face color="$font">$lt{'main'}</font></a>
 </td>
 $reloadlink
 $navmaps
 $docs
 <td bgcolor="$tabbg">
 <a href="/adm/remote?action=launch&amp;url=$escurl" target="_top">
-<font color="$font">$lt{'launch'}</font></a></td>
+<font $face color="$font">$lt{'launch'}</font></a></td>
 <td bgcolor="$tabbg">
-<a href="/adm/roles" target="_top"><font color="$font">$lt{'roles'}</font></a>
+<a href="/adm/roles" target="_top"><font $face color="$font">$lt{'roles'}</font></a>
 </td>
 <td bgcolor="$tabbg">
-<a href="/adm/logout" target="_top"><font color="$font">$lt{'exit'}</font></a>
+<a href="/adm/logout" target="_top"><font $face color="$font">$lt{'exit'}</font></a>
 </td>
 <td bgcolor="$tabbg">
-<img align="right" src="$logo" />
+<img align="right" src="$logo" alt="Logo" />
 <b>LON-CAPA</b></td>
 $form
 </tr>
 </table>
-</font>
 <script type="text/javascript">
 // END LON-CAPA Internal
 </script>
@@ -301,7 +326,7 @@ sub innerregister {
 
     my $newmail='';
     if ($noremote) {
-	$newmail='<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'">';
+	$newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'"><font face="Arial,Helvetica,sans-serif">';
     }
     if (($textual) && ($env{'request.symb'}) && ($env{'request.course.id'})) {
 	my ($mapurl,$rid,$resurl)=
@@ -326,7 +351,7 @@ sub innerregister {
         $newmail = $titletable;
     } else {
 	if ($noremote) {
-	    $newmail.='</td></tr></table></font>';
+	    $newmail.='</font></td></tr></table>';
 	}
     }
     my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
@@ -344,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')",
@@ -418,7 +443,10 @@ sub innerregister {
                     ('','',6,1,'cstr.gif','edit[_1]','resource[_2]',
                      "go('".$cfile."');","Edit this resource");
             } elsif ($editbutton eq '') {
-                $editbutton=&clear(6,1);
+                $editbutton=&switch('','',6,1,'port.gif',
+				    'port-[_1]','folio[_1]',
+				    "go('/adm/portfolio');",
+				    "Enter my portfolio space");
             }
         }
         ###
@@ -1080,15 +1108,20 @@ function gocstr(url,filename) {
                 this.document.cstrprint.curseed.value = this.document.lonhomework.rndseed.value
             }
             if (this.document.lonhomework.problemtype) {
-                for (var i=0; i<this.document.lonhomework.problemtype.options.length; i++) {
-                    if (this.document.lonhomework.problemtype.options[i].selected) {
-                        if (this.document.lonhomework.problemtype.options[i].value != null && this.document.lonhomework.problemtype.options[i].value != '') { 
-                            this.document.cstrprint.problemtype.value = this.document.lonhomework.problemtype.options[i].value
-                        }
-                    }
-                }
-            }
-        }
+		if (this.document.lonhomework.problemtype.value) {
+		    this.document.cstrprint.problemtype.value = 
+			this.document.lonhomework.problemtype.value;
+		} else if (this.document.lonhomework.problemtype.options) {
+		    for (var i=0; i<this.document.lonhomework.problemtype.options.length; i++) {
+			if (this.document.lonhomework.problemtype.options[i].selected) {
+			    if (this.document.lonhomework.problemtype.options[i].value != null && this.document.lonhomework.problemtype.options[i].value != '') { 
+				this.document.cstrprint.problemtype.value = this.document.lonhomework.problemtype.options[i].value
+				}
+			}
+		    }
+		}
+	    }
+	}
         this.document.cstrprint.submit();
         return;
     }
@@ -1121,7 +1154,6 @@ ENDUTILITY
 
 sub serverform {
     return(<<ENDSERVERFORM);
-
 <form name="server" action="/adm/logout" method="post" target="_top">
 <input type="hidden" name="postdata" value="none" />
 <input type="hidden" name="command" value="none" />
@@ -1165,6 +1197,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;