--- loncom/homework/structuretags.pm	2004/11/30 23:28:57	1.273
+++ loncom/homework/structuretags.pm	2005/02/25 04:56:05	1.280
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.273 2004/11/30 23:28:57 albertel Exp $
+# $Id: structuretags.pm,v 1.280 2005/02/25 04:56:05 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 = ''; }
@@ -215,7 +217,7 @@ sub problem_edit_footer {
     return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />
     <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />'.
     &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields).
-    "\n</form>\n</body>\n</html>";
+    "\n</form>\n".&Apache::loncommon::endbodytag()."\n</html>";
 }
 
 sub option {
@@ -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;
@@ -662,7 +666,7 @@ sub end_problem {
 		$ENV{'form.answer_output_mode'} ne 'tex') {
 		$result.="</form>";
 		$result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
-		$result.="</body>\n";
+		$result.=&Apache::loncommon::endbodytag();
 	    }
 	    if ($target eq 'web') {
 		$result.=&Apache::lonxml::xmlend();
@@ -753,7 +757,8 @@ sub end_library {
 	$result=&problem_edit_footer();
     } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
 	     $ENV{'request.state'} eq "construct") {
-	$result.='</form></body>'.&Apache::lonxml::xmlend();
+	$result.='</form>'.&Apache::loncommon::endbodytag().
+	    &Apache::lonxml::xmlend();
     }
     if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };
     return $result;
@@ -1126,6 +1131,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).'" />';
@@ -1368,8 +1377,9 @@ sub start_simpleeditbutton {
         (&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('Edit').'</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;
