--- loncom/homework/structuretags.pm	2006/04/14 20:16:23	1.343
+++ loncom/homework/structuretags.pm	2007/04/06 21:22:24	1.375
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.343 2006/04/14 20:16:23 albertel Exp $
+# $Id: structuretags.pm,v 1.375 2007/04/06 21:22:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,9 @@ use Apache::lonlocal;
 use Apache::lonxml;
 use Apache::lonenc();
 use Time::HiRes qw( gettimeofday tv_interval );
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 BEGIN {
     &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
 }
@@ -70,7 +73,8 @@ sub end_tex {
 }
 
 sub page_start {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name,
+	$extra_head)=@_;
     my %found;
     foreach my $taginside (@$tagstack) {
 	foreach my $taglookedfor ('html','body','form') {
@@ -78,17 +82,26 @@ sub page_start {
 	}
     }
 
-
     if ($target eq 'tex') {
 	return
 	    &Apache::londefdef::start_html($target,$token,$tagstack,
 					   $parstack,$parser,$safeeval);
     }
 
-    my $page_start;
-    if (!defined($found{'html'})) {
+    $extra_head.= '
+<script type="text/javascript">
+function setSubmittedPart (part) {
+   this.document.lonhomework.submitted.value="part_"+part;
+}
+</script>
+';
+
+    my %body_args;
+    if (defined($found{'html'})) {
+	$body_args{'skip_phases'}{'head'}=1;
+    } else {
 	
-	my $extra_head = &Apache::lonhtmlcommon::spellheader();
+	$extra_head .= &Apache::lonhtmlcommon::spellheader();
 
 	my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');
 	if ($css_href =~ /\S/) {
@@ -102,18 +115,15 @@ sub page_start {
 		"if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".
 		&Apache::loncommon::browser_and_searcher_javascript().
                 "\n</script>\n";
-	    
 	}
-	$page_start .=
-	    &Apache::loncommon::head($name,$extra_head,
-				     {'force_register' => 
-					  ($target ne 'edit') });
     }
 
-    if (!defined($found{'body'}) && $env{'request.state'} eq 'construct') {
+    if (defined($found{'body'})) {
+	$body_args{'skip_phases'}{'body'}=1;
+    } elsif (!defined($found{'body'}) 
+	     && $env{'request.state'} eq 'construct') {
 	if ($target eq 'web' || $target eq 'edit') {
-	    $page_start.=&Apache::loncommon::bodytag();
-	    $page_start.=&Apache::lonxml::message_location();
+	    # no extra args to bodytag
 	}
     } elsif (!defined($found{'body'})) {
 	my %add_entries;
@@ -122,27 +132,36 @@ sub page_start {
 	if ($background ne '' ) {
 	    $add_entries{'background'} = $background;
 	}
+
 	my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
 					       $safeeval);
-	
-	if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; }
-	$page_start .=
-	    &Apache::loncommon::bodytag(undef,undef,\%add_entries,undef,undef,
-					1,undef,undef,$bgcolor,$target,1);
-
-	if ( ($target eq 'web' || $target eq 'webgrade')
-	     && $env{'request.state'} ne 'construct') {
-	    my ($symb,undef,undef,undef,$publicuser)=
-		&Apache::lonxml::whichuser();
-	    if ($symb eq '' && !$publicuser) {
-		my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
-		$help=&mt("Browsing resource, all submissions are temporary.")."<br />";
-		$page_start .= $help;
-	    }
+       	if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; }
+
+	$body_args{'bgcolor'}        = $bgcolor;
+	$body_args{'no_title'}       = 1;
+	$body_args{'force_register'} = 1;
+	$body_args{'add_entries'}    = \%add_entries;	
+    }
+    $body_args{'no_auto_mt_title'} = 1;
+    my $page_start = &Apache::loncommon::start_page($name,$extra_head,
+						    \%body_args);
+
+    if (!defined($found{'body'}) 
+	&& $env{'request.state'} ne 'construct'
+	&& ($target eq 'web' || $target eq 'webgrade')) {
+
+	my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();
+	if ($symb eq '' && !$publicuser) {
+	    my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
+	    $help=&mt("Browsing resource, all submissions are temporary.")."<br />";
+	    $page_start .= $help;
 	}
-	$page_start .= &Apache::lonxml::message_location();
     }
 
+    if (!defined($found{'body'})) {
+	$page_start .= &Apache::lonxml::message_location();
+    }
+    
     my $form_tag_start;
     if (!defined($found{'form'})) {
 	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';
@@ -151,7 +170,15 @@ sub page_start {
 	if ($target eq 'edit') {
 	    $form_tag_start.=&Apache::edit::form_change_detection();
 	}
-	$form_tag_start.='>';
+	$form_tag_start.='>'."\n";
+
+	my $symb=&Apache::lonnet::symbread();
+	if ($symb =~ /\S/) {
+	    $symb=
+		&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb));
+	    $form_tag_start.=
+		"\t".'<input type="hidden" name="symb" value="'.$symb.'" />'."\n";
+	}
     }
     return ($page_start,$form_tag_start);
 }
@@ -162,7 +189,7 @@ sub get_resource_name {
     if (defined($Apache::lonhomework::name)) {
 	return $Apache::lonhomework::name;
     }
-    my ($symb)=&Apache::lonxml::whichuser();
+    my ($symb)=&Apache::lonnet::whichuser();
     my $name=&Apache::lonnet::gettitle($symb);
     if ($name eq '') {
 	$name=&Apache::lonnet::EXT('resource.title');
@@ -179,7 +206,7 @@ sub get_resource_name {
 sub setup_rndseed {
     my ($safeeval)=@_;
     my $rndseed;
-    my ($symb)=&Apache::lonxml::whichuser();
+    my ($symb)=&Apache::lonnet::whichuser();
     if ($env{'request.state'} eq "construct" 
 	|| $symb eq '' 
 	|| $Apache::lonhomework::type eq 'practice'
@@ -194,7 +221,8 @@ sub setup_rndseed {
 	    }
 	    $env{'form.rndseed'}=$rndseed;
 	}
-	if ($env{'form.resetdata'} eq &mt('New Problem Variation') ||
+	if ( ($env{'form.resetdata'} eq &mt('New Problem Variation')
+	      && $env{'form.submitted'} eq 'yes')  ||
 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    srand(time);
 	    $rndseed=int(rand(2100000000));
@@ -232,7 +260,7 @@ sub problem_edit_header {
        <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr />
        <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" />
        <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.
-       &Apache::loncommon::help_open_menu('','Problem Editing Help','Problem_Editor_XML_Index','',5,'Authoring',undef,undef,undef,'Problem Editing Help')
+       &Apache::loncommon::help_open_menu('Problem Editing Help','Problem_Editor_XML_Index',5,'Authoring',undef,undef,undef,'Problem Editing Help')
        .'</td></tr></table>'.
        '<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">';
 }
@@ -240,7 +268,7 @@ sub problem_edit_header {
 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).
+    &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).
     "\n</form>\n".&Apache::loncommon::end_page();
 }
 
@@ -257,9 +285,7 @@ sub option {
 sub problem_web_to_edit_header {
     my ($rndseed)=@_;
     my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />';
-    if (!$Apache::lonhomework::parsing_a_task) {
-	$result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />';
-    }
+    $result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />';
     $result .= '<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
              <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
              <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
@@ -274,9 +300,9 @@ sub problem_web_to_edit_header {
 	: &mt('&nbsp;Show&nbsp;All&nbsp;Foils');
 
     if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }
-    $result.= ' />'.$show_all_foils_text.
+    $result.= ' />'.$show_all_foils_text.'</label>'.
 	&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
-	'</label><hr />';
+	'<hr />';
     if (!$Apache::lonhomework::parsing_a_task) {
 	$result.="
 <nobr>
@@ -323,16 +349,26 @@ Feedback Mode:
 }
 
 sub initialize_storage {
-    %Apache::lonhomework::results=();
-    %Apache::lonhomework::history=();
-    my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+    my ($given_symb) = @_;
+    undef(%Apache::lonhomework::results);
+    undef(%Apache::lonhomework::history);
+    my ($symb,$courseid,$domain,$name) = 
+	&Apache::lonnet::whichuser($given_symb);
+    
+    # anonymous users (CODEd exams) have no data
+    if ($name eq 'anonymous' 
+	&& !defined($domain)) {
+	return;
+    }
+
     if ($env{'request.state'} eq 'construct' 
 	|| $symb eq ''
 	|| $Apache::lonhomework::type eq 'practice') {
 	
 	my $namespace = $symb || $env{'request.uri'};
 	if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
-	    $env{'form.resetdata'} eq &mt('New Problem Variation') ||
+	    ($env{'form.resetdata'} eq &mt('New Problem Variation')
+	     && $env{'form.submitted'} eq 'yes') ||
 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    &Apache::lonnet::tmpreset($namespace,'',$domain,$name);
 	    &Apache::lonxml::debug("Attempt reset");
@@ -345,6 +381,7 @@ sub initialize_storage {
 	%Apache::lonhomework::history=
 	    &Apache::lonnet::restore($symb,$courseid,$domain,$name);
     }
+
     #ignore error conditions
     my ($temp)=keys %Apache::lonhomework::history ;
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
@@ -357,11 +394,13 @@ sub initialize_storage {
 # Will increment totals for attempts, students, and corrects
 # if running user has student role.  
 sub finalize_storage {
+    my ($given_symb) = @_;
     my $result;
     if (%Apache::lonhomework::results) {
 	my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results));
 	delete(@Apache::lonhomework::results{@remove});
-	my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+	my ($symb,$courseid,$domain,$name) = 
+	    &Apache::lonnet::whichuser($given_symb);
 	if ($env{'request.state'} eq 'construct' 
 	    || $symb eq ''
 	    || $Apache::lonhomework::type eq 'practice') {
@@ -432,13 +471,14 @@ sub checkout_msg {
                 'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',
                 'checkout'=>'Check out Exam for Viewing',
 		'checkout?'=>'Check out Exam?');
+    my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     return (<<ENDCHECKOUT);
 <h2>$lt{'resource'}</h2>
     <p>$lt{'id_expln'}</p>
 <font color="red">
 <p>$lt{'warning'}</p>
 </font>
-<form name="checkout" method="POST" action="$env{'request.uri'}">
+<form name="checkout" method="POST" action="$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>
@@ -450,9 +490,10 @@ sub firstaccess_msg {
     my ($map)=&Apache::lonnet::decode_symb($symb);
     my $foldertitle=&Apache::lonnet::gettitle($map);
     &Apache::lonxml::debug("map is $map title is $foldertitle");
+    my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     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="$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>
@@ -493,7 +534,8 @@ sub init_problem_globals {
     @Apache::structuretags::whileline=();
     $Apache::lonhomework::scantronmode=0;
     undef($Apache::lonhomework::name);
-
+    undef($Apache::lonhomework::default_type);
+    undef($Apache::lonhomework::type);
 }
 
 sub reset_problem_globals {
@@ -505,6 +547,11 @@ sub reset_problem_globals {
 #detect if we try to do 2 problems in one file
 #   undef($Apache::lonhomework::parsing_a_problem);
     undef($Apache::lonhomework::name);
+    undef($Apache::lonhomework::default_type);
+    undef($Apache::lonhomework::type);
+    undef($Apache::lonhomework::scantronmode);
+    undef($Apache::lonhomework::problemstatus);
+    undef($Apache::lonhomework::ignore_response_errors);
 }
 
 sub set_problem_state {
@@ -554,11 +601,7 @@ sub start_problem {
 	$Apache::lonhomework::scantronmode=1;
     }
 
-    &initialize_storage();
     if ($target ne 'analyze') {
-	if ($target eq 'web') {
-	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
-	}
        	if ($env{'request.state'} eq 'construct') { &set_problem_state('0'); }
 	$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
 	if (($env{'request.state'} eq 'construct') &&
@@ -579,6 +622,12 @@ sub start_problem {
     }
     $Apache::lonhomework::default_type = $Apache::lonhomework::type;
 
+    &initialize_storage();
+    if ($target eq 'web') {
+	&Apache::lonxml::debug(" grading history ");
+	&Apache::lonhomework::showhash(%Apache::lonhomework::history);
+    }
+
     #added vars to the scripting enviroment
     my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
     $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
@@ -586,11 +635,15 @@ sub start_problem {
     my $status;
     my $accessmsg;
 
-    #should get back a <html> or the neccesary stuff to start XML/MathML
     my $name= &get_resource_name($parstack,$safeeval);
-    my ($result,$form_tag_start)=
-	&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
-		    $name);
+    my ($result,$form_tag_start);
+    if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
+	|| $target eq 'edit') {
+	($result,$form_tag_start) =
+	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
+			$name);
+    }
+
     if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}
 
     if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }
@@ -612,7 +665,7 @@ sub start_problem {
 	}
 	#handle rand seed in construction space
 	my $rndseed=&setup_rndseed($safeeval);
-	my ($symb)=&Apache::lonxml::whichuser();
+	my ($symb)=&Apache::lonnet::whichuser();
 	if ($env{'request.state'} ne "construct" && 
 	    ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
@@ -686,13 +739,21 @@ sub start_problem {
 	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
 						       $style);
 	    if ($target eq 'web') {
-		$result .= &Apache::bridgetask::proctor_validation_screen();
+		$result .= 
+		    &Apache::bridgetask::proctor_validation_screen($slot);
 	    } elsif ($target eq 'grade') {
 		&Apache::bridgetask::proctor_check_auth($slot_name,$slot,
 							'problem');
 	    }
 	} elsif ($target eq 'web') {
-	    $result.="\n $form_tag_start".	
+	    if ($status eq 'CAN_ANSWER' 
+		&& $slot_name ne ''
+		&& $Apache::lonhomework::history{'resource.0.checkedin'} eq '') {
+		# unproctored slot access, self checkin
+		&Apache::bridgetask::check_in('problem',undef,undef,
+					      $slot_name);
+	    }
+	    $result.="\n $form_tag_start \t".	
 	      '<input type="hidden" name="submitted" value="yes" />';
 	    # create a page header and exit
 	    if ($env{'request.state'} eq "construct") {
@@ -735,7 +796,6 @@ sub end_problem {
     }
 
     if ($target eq 'tex') {
-
 	# Figure out the front matter and replace the
 	# INSERTTEXFRONTMATTERHERE in result with it.  note that we do
 	# this in end_problem because whether or not we display due
@@ -852,10 +912,10 @@ sub end_problem {
 	    if ($target ne 'tex' &&
 		$env{'form.answer_output_mode'} ne 'tex') {
 		$result.="</form>";
-		$result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
+		$result.= &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields());
 	    }
 	    if ($target eq 'web') {
-		$result.=&Apache::lonxml::xmlend().'</html>';
+		$result.= &Apache::loncommon::end_page({'discussion' => 1});
 	    } elsif ($target eq 'tex') {
 		my $endminipage = '';
 		if (not $env{'form.problem_split'}=~/yes/) {
@@ -863,7 +923,6 @@ sub end_problem {
 		}
                 if ($env{'form.print_discussions'} eq 'yes') {
 		    $result.=&Apache::lonxml::xmlend($target,$parser);
-		    $result=~s/<\/html>//;
 		} else {
 		    $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
 		    if (not $env{'request.symb'} =~ m/\.page_/) {
@@ -880,7 +939,7 @@ sub end_problem {
 	}
 	if ($target eq 'answer' && ($env{'request.state'} eq 'construct')
 	    && $env{'form.answer_output_mode'} ne 'tex') {
-	    $result.=&Apache::lonxml::xmlend().'</html>';
+	    $result.=&Apache::loncommon::end_page({'discussion' => 1});
 	                        # normally we get it from above, but in CSTR
 	                        # we always show answer mode too.
 	}
@@ -912,7 +971,7 @@ sub end_problem {
 sub start_library {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my ($result,$form_tag_start);
-    if ($$tagstack[0] eq 'library') {
+    if ($#$tagstack eq 0 && $$tagstack[0] eq 'library') {
 	&init_problem_globals('library');
 	$Apache::lonhomework::type='problem';
     }
@@ -927,7 +986,7 @@ sub start_library {
 	$result=$token->[4];
 	$result.=&Apache::edit::handle_insert();
     } elsif (($target eq 'web' || $target eq 'webgrade')
-	     && $$tagstack[0] eq 'library' 
+	     && ($#$tagstack eq 0 && $$tagstack[0] eq 'library')
 	     && $env{'request.state'} eq "construct" ) {
 	my $name=&get_resource_name($parstack,$safeeval);
 	($result,$form_tag_start)=
@@ -946,11 +1005,14 @@ sub end_library {
     my $result='';
     if ($target eq 'edit') {
 	$result=&problem_edit_footer();
-    } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
-	     $env{'request.state'} eq "construct") {
-	$result.='</form>'.&Apache::lonxml::xmlend();
+    } elsif ($target eq 'web' 
+	     && ($#$tagstack eq 0 && $$tagstack[0] eq 'library') 
+	     && $env{'request.state'} eq "construct") {
+	$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});
+    }
+    if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {
+	&reset_problem_globals('library');
     }
-    if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };
     return $result;
 }
 
@@ -1351,7 +1413,7 @@ sub start_part {
 		    }
 		    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).'" />';
+		    $result.='<a name="'.&escape($Apache::inputtags::part).'" />';
 		}
 	    }
 	}
@@ -1434,15 +1496,21 @@ sub end_preduedate {
     return '';
 }
 
+# In all the modes where <postanswerdate> text is 
+# displayable,  all we do is eat up the text between the start/stop
+# tags if the conditions are not right to display it.
 sub start_postanswerdate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade') {
+    my $pav = &Apache::lonnet::allowed('pav', $env{'request.course.id'}) ||
+	&Apache::lonnet::allowed('pav',
+			   $env{'request.course.id'}.'/'.$env{'request.course.sec'});
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade' ||
+	$target eq 'tex' ) {
 	if ($Apache::lonhomework::scantronmode ||
-	    $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
+	    $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER' ||
+	    (($target eq 'tex') && !$pav)) {
 	    &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);
 	}
-    } elsif ($target eq 'tex') {
-	&Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);
     }
     return '';
 }
@@ -1549,9 +1617,10 @@ sub end_startouttext {
 		 ."</td>
 <td>".
                  &Apache::edit::insertlist($target,$token).
+		 '</td><td align="right" valign="top">' .
+		 &Apache::loncommon::helpLatexCheatsheet().
 		 &Apache::edit::end_row().
-                 &Apache::edit::start_spanning_row()."\n"
-		 . &Apache::loncommon::helpLatexCheatsheet () .
+                 &Apache::edit::start_spanning_row()."\n".
 		 &Apache::edit::editfield($token->[1],$text,"",80,8,1);
     }
     if ($target eq 'modified') {
@@ -1602,9 +1671,9 @@ sub start_simpleeditbutton {
         (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
         my $url=$env{'request.noversionuri'};
         $url=~s/\?.*$//;
-	my ($symb) = &Apache::lonxml::whichuser();
+	my ($symb) = &Apache::lonnet::whichuser();
 	$result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
-                '<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.').
+                '<a href="'.$url.'/smpedit?symb='.&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;