--- loncom/homework/structuretags.pm	2004/12/11 18:10:49	1.277
+++ loncom/homework/structuretags.pm	2005/03/01 03:21:58	1.281
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.277 2004/12/11 18:10:49 banghart Exp $
+# $Id: structuretags.pm,v 1.281 2005/03/01 03:21:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -115,6 +115,12 @@ sub page_start {
 	    $body_tag_start.=' style="font-size: x-large;" ';
 	}
 	$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
+	if ($ENV{'environment.texengine'} eq 'jsMath') {
+	    $body_tag_start.='<script type="text/javascript">
+                     function NoFontMessage () {}
+                   </script>'."\n".
+		       '<script src="/adm/jsMath/jsMath.js"></script>'."\n";
+	}
 	if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
 	    my ($symb,undef,undef,undef,$publicuser)=
 		&Apache::lonxml::whichuser();
@@ -128,7 +134,7 @@ sub page_start {
     }
     my $form_tag_start;
     if (!defined($found{'form'})) {
-	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" 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.'">';
@@ -142,7 +148,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 = ''; }
@@ -216,7 +223,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 {
@@ -240,11 +247,11 @@ sub problem_web_to_edit_header {
               <input type="text" name="rndseed" size="10" value="'.
 	       $rndseed.'"
            onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr>
-             <input type="checkbox" name="showallfoils" ';
+             <label><input type="checkbox" name="showallfoils" ';
     if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
     $result.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
 	&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
-	'<hr />';
+	'</label><hr />';
     $result.="
 <nobr>
 Problem Status:
@@ -342,7 +349,7 @@ sub checkout_msg {
 <font color="red">
 <p>$lt{'warning'}</p>
 </font>
-<form name="checkout" method="post" action="$ENV{'request.uri'}">
+<form name="checkout" method="POST" action="$ENV{'request.uri'}">
 <input type="hidden" name="doescheckout" value="yes" />
 <input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />
 </form>
@@ -356,7 +363,7 @@ sub firstaccess_msg {
     &Apache::lonxml::debug("map is $map title is $foldertitle");
     return (<<ENDCHECKOUT);
 <h2>The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".</h2>
-<form name="markaccess" method="post" action="$ENV{'request.uri'}">
+<form name="markaccess" method="POST" action="$ENV{'request.uri'}">
 <input type="hidden" name="markaccess" value="yes" />
 <input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" />
 </form>
@@ -665,10 +672,9 @@ sub end_problem {
 		$ENV{'form.answer_output_mode'} ne 'tex') {
 		$result.="</form>";
 		$result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
-		$result.="</body>\n";
 	    }
 	    if ($target eq 'web') {
-		$result.=&Apache::lonxml::xmlend();
+		$result.=&Apache::lonxml::xmlend().'</html>';
 	    } elsif ($target eq 'tex') {
 		my $endminipage = '';
 		if (not $ENV{'form.problem_split'}=~/yes/) {
@@ -756,7 +762,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;
@@ -1375,8 +1382,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;