--- loncom/homework/structuretags.pm	2004/11/11 23:45:35	1.272
+++ loncom/homework/structuretags.pm	2005/02/12 02:18:08	1.279
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.272 2004/11/11 23:45:35 albertel Exp $
+# $Id: structuretags.pm,v 1.279 2005/02/12 02:18:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -91,6 +91,7 @@ sub page_start {
     if (!defined($found{'body'}) && $ENV{'request.state'} eq 'construct'
 	&& $ENV{'environment.remote'} eq 'off') {
 	$body_tag_start=&Apache::loncommon::bodytag();
+	$body_tag_start.=&Apache::lonxml::message_location();
     } elsif (!defined($found{'body'})) {
 	$body_tag_start='<body onload="'.&Apache::lonmenu::loadevents().'" '.
 	    'onunload="'.&Apache::lonmenu::unloadevents().'" ';
@@ -127,7 +128,7 @@ sub page_start {
     }
     my $form_tag_start;
     if (!defined($found{'form'})) {
-	$form_tag_start='<form name="lonhomework" method="post" action="';
+	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';
 	my $uri=$ENV{'request.uri'};
 	if ($ENV{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
 	$form_tag_start.=$uri.'">';
@@ -141,7 +142,8 @@ sub get_resource_name {
     if (defined($Apache::lonhomework::name)) {
 	return $Apache::lonhomework::name;
     }
-    my $name=&Apache::lonnet::gettitle();
+    my ($symb)=&Apache::lonxml::whichuser();
+    my $name=&Apache::lonnet::gettitle($symb);
     if ($name eq '') {
 	$name=&Apache::lonnet::EXT('resource.title');
 	if ($name eq 'con_lost') { $name = ''; }
@@ -580,6 +582,8 @@ sub start_problem {
 		    $allow_print_points=1;
 		}
 	    }
+	    my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
+	    if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; }
 	    my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); 
 	    $duedate = POSIX::strftime("%c",localtime($duedate));
 	    my $temp_file;
@@ -1126,6 +1130,10 @@ sub start_part {
 			    if ($1 ne '0') {$allow_print_points=1;}
 			}
 		    }
+		    my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
+		    if (defined($maxtries) && $maxtries < 0) {
+			$allow_print_points=0;
+		    }
 		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
 		} elsif ($target eq 'web') {
 		    $result.='<a name="'.&Apache::lonnet::escape($Apache::inputtags::part).'" />';
@@ -1363,12 +1371,14 @@ sub delete_startouttext {
 sub start_simpleeditbutton {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
-    if (($target eq 'web') &&
+    if (($ENV{'form.simple_edit_button'} ne 'off') &&
+	($target eq 'web') &&
         (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
         my $url=$ENV{'request.noversionuri'};
         $url=~s/\?.*$//;
+	my ($symb) = &Apache::lonxml::whichuser();
 	$result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
-                '<a href="'.$url.'/smpedit">'.&mt('Simple Problem Editor').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').
+                '<a href="'.$url.'/smpedit?symb='.&Apache::lonnet::escape($symb).'">'.&mt('Edit').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').
 &Apache::loncommon::help_open_topic('Caching').'</td></tr></table><br />';
     }
     return $result;
