--- loncom/homework/structuretags.pm	2007/09/12 07:59:51	1.398
+++ loncom/homework/structuretags.pm	2008/11/25 13:16:17	1.435
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.398 2007/09/12 07:59:51 www Exp $
+# $Id: structuretags.pm,v 1.435 2008/11/25 13:16:17 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,6 +27,29 @@
 #
 ###
 
+=pod
+
+=head1 NAME
+
+Apache::structuretags
+
+=head1 SYNOPSIS
+
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=head1 NOTABLE SUBROUTINES
+
+=over
+
+=item 
+
+=back
+
+=cut
+
 
 package Apache::structuretags; 
 
@@ -36,6 +59,7 @@ use Apache::File();
 use Apache::lonmenu;
 use Apache::lonlocal;
 use Apache::lonxml;
+use Apache::londefdef;
 use Apache::lonenc();
 use Time::HiRes qw( gettimeofday tv_interval );
 use lib '/home/httpd/lib/perl/';
@@ -74,7 +98,14 @@ sub start_tex {
     if ($target ne 'edit' && $target ne 'modified') {
 	my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);
 	if ($target eq 'tex') {
-	    return $bodytext.' ';
+	    
+	    # If inside a table, occurrences of \\ must be removed;
+	    # else the table blows up.
+
+	    if (&Apache::londefdef::is_inside_of($tagstack, "table")) {
+		$bodytext =~ s/\\\\//g;
+	    }
+	    return $bodytext.'{}';
 	}
     } elsif ($target eq "edit" ) {
 	my $bodytext = 
@@ -92,6 +123,44 @@ sub end_tex {
     return '';
 }
 
+sub homework_js {
+    return &Apache::loncommon::resize_textarea_js().
+           &setmode_javascript().
+	<<'JS';
+<script type="text/javascript">
+function setSubmittedPart (part) {
+   this.document.lonhomework.submitted.value="part_"+part;
+}
+
+function image_response_click (which, e) {
+    init_geometry();
+    if (!e) { e = window.event; } //IE
+    var input_element = document.lonhomework.elements[which];
+    var token_element = document.lonhomework.elements[which+'_token'];
+    var token = token_element.value;
+    var img_element   = document.getElementById(which+'_imageresponse');
+    var x= e.clientX-getX(img_element)+Geometry.getHorizontalScroll();
+    var y= e.clientY-getY(img_element)+Geometry.getVerticalScroll();
+    var click = x+':'+y;
+    input_element.value = click;
+    img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;
+}
+
+</script>
+JS
+}
+
+sub setmode_javascript {
+    return <<"ENDSCRIPT";
+<script type="text/javascript">
+function setmode(form,probmode) {
+    form.problemmode.value = probmode;
+    form.submit();
+}
+</script>
+ENDSCRIPT
+}
+
 sub page_start {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name,
 	$extra_head)=@_;
@@ -108,13 +177,13 @@ sub page_start {
 					   $parstack,$parser,$safeeval);
     }
 
-    $extra_head.= '
-<script type="text/javascript">
-function setSubmittedPart (part) {
-   this.document.lonhomework.submitted.value="part_"+part;
-}
-</script>
-';
+    $extra_head .= &homework_js();
+
+    if ($env{'environment.wysiwygeditor'} eq 'on') {
+	$extra_head .= &Apache::lonhtmlcommon::dragmath_js("FCKEditMathPopup");
+    } else {
+        $extra_head .= &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
+    }
 
     my %body_args;
     if (defined($found{'html'})) {
@@ -139,7 +208,9 @@ function setSubmittedPart (part) {
     } elsif (!defined($found{'body'}) 
 	     && $env{'request.state'} eq 'construct') {
 	if ($target eq 'web' || $target eq 'edit') {
-	    # no extra args to bodytag
+	    if ($env{'environment.remote'} ne 'off') {
+		$body_args{'only_body'}  = 1;
+	    }
 	}
     } elsif (!defined($found{'body'})) {
 	my %add_entries;
@@ -178,7 +249,7 @@ function setSubmittedPart (part) {
 	}
     }
 
-    if (!defined($found{'body'})) {
+    if (!defined($found{'body'}) && $env{'request.state'} ne 'construct') {
 	$page_start .= &Apache::lonxml::message_location();
     }
     
@@ -278,23 +349,44 @@ sub remember_problem_state {
        <input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />';
 }
 
+sub problem_edit_buttons {
+   return  '
+<div class="LC_edit_problem_discards">
+       <input type="button" name="submitmode" accesskey="d" value="'.&mt('Discard Edits and View').'" '.
+       ' onclick="javscript:setmode(this.form,'."'discard'".')"  />
+       <input '.&Apache::edit::submit_ask_anyway('setmode(this.form,'."'editxml'".')').' type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" />
+       <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
+</div>
+<div class="LC_edit_problem_saves">
+       <input type="submit" name="submitbutton" accesskey="s" value="'.&mt('Save and Edit').'" />
+       <input type="submit" name="submitbutton" accesskey="v" value="'.&mt('Save and View').'" />
+</div>';
+}
+
 sub problem_edit_header {
-    return '<input type="hidden" name="submitted" value="edit" />'.
+    return '<input type="hidden" name="submitted" value="edit" /><input type="hidden" name="problemmode" value="edit" />'.
 	&Apache::structuretags::remember_problem_state().'
-       <input type="hidden" name="problemmode" value="'.&mt('Edit').'" />
-       <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
-       <input '.&Apache::edit::submit_ask_anyway().' type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
-       <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')
-       .'</td></tr></table>'.
+<div class="LC_edit_problem_header">
+<div class="LC_edit_problem_header_title">
+'.&mt('Problem Editing').&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
+</div>'.
+&problem_edit_buttons().'
+<hr class="LC_edit_problem_divide" />
+'.&Apache::lonxml::message_location().'
+</div>
+'.
        '<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">';
 }
 
 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').'" />'.
+    return '</td></tr></table><br />
+<div class="LC_edit_problem_footer">
+  <hr class="LC_edit_problem_divide" />'.
+&problem_edit_buttons().'
+  <hr class="LC_edit_problem_divide" />
+</div>
+'.
+
     &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).
     "\n</form>\n".&Apache::loncommon::end_page();
 }
@@ -311,35 +403,38 @@ sub option {
 
 sub problem_web_to_edit_header {
     my ($rndseed)=@_;
-    my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />';
-    $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').'" />
-             <nobr><input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
-              <input type="text" name="rndseed" size="10" value="'.
-	       $rndseed.'"
-           onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr>
-             <span class="LC_nobreak"><label><input type="checkbox" name="showallfoils" ';
+    my $result .= '<div class="LC_edit_problem_header">';
+
+    if (!$Apache::lonhomework::parsing_a_task) {
+	$result .= 
+	    '<div class="LC_edit_problem_header_title">'.
+	    &mt('Problem Testing').
+	    &Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area').
+	    '</div>';
+    } else {
+	$result .= 
+	    '<div class="LC_edit_problem_header_title">'.
+	    &mt('Task Testing').
+	    '</div>';
+    }
+    
     my $show_all_foils_text = 
 	($Apache::lonhomework::parsing_a_task) ?
 	&mt('&nbsp;Show&nbsp;All&nbsp;Instances')
 	: &mt('&nbsp;Show&nbsp;All&nbsp;Foils');
 
-    if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }
-    $result.= ' />'.$show_all_foils_text.'</label></span>'.
-	&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
-	'<hr />';
-    $result.=&mt('Apply style file: ').'
-<input type="text" name="style_file" value="'.&HTML::Entities::encode($env{'construct.style'},'"<>&').'" />
- <a href="javascript:openbrowser(\'lonhomework\',\'style_file\',\'sty\')">'.&mt('Select').'</a>
-<input type="submit" name="clear_style_file" value="'.&mt('Clear').'" />
-<br />';
+    my $show_all= '<span class="LC_nobreak"><label><input type="checkbox" name="showallfoils" ';
+    if (defined($env{'form.showallfoils'})) { $show_all.='checked="checked"'; }
+    $show_all.= ' />'.$show_all_foils_text.'</label></span>';
 
+
+
+    $result .= '<div class="LC_edit_problem_header_status_row">';
     if (!$Apache::lonhomework::parsing_a_task) {
 	$result.="
-<nobr>
-Problem Status:
+<div class='LC_edit_problem_header_row1'>
+<span class=\"LC_nobreak\">
+".&mt("Problem Status:")."
 <select name='problemstate'>
   <option value=''></option>
   ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>
@@ -348,39 +443,36 @@ Problem Status:
   ".&option('CANNOT_ANSWER_correct','problemstate').&mt("Open and correct")."</option>
   ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Answer")."</option>
 </select>
-</nobr>
-<nobr>
-Problem Type:
+</span>
+<span class=\"LC_nobreak\">
+".&mt("Problem Type:")."
 <select name='problemtype'>
   <option value=''></option>
   ".&option('exam'   ,'problemtype').&mt("Exam Problem")."</option>
-  ".&option('problem','problemtype').&mt("Homework problem")."</option>
+  ".&option('problem','problemtype').&mt("Homework Problem")."</option>
   ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
+  ".&option('practice' ,'problemtype').&mt("Practice Problem")."</option>
 </select>
-</nobr>
-<nobr>
-Feedback Mode:
+</span>
+$show_all
+</div>
+<div class='LC_edit_problem_header_row2'>
+<span class=\"LC_nobreak\">
+".&mt("Feedback Mode:")."
 <select name='problemstatus'>
   <option value=''></option>
   ".&option('yes','problemstatus').&mt("Show Feedback")."</option>
-  ".&option('no', 'problemstatus').&mt("Don't Show Feedback")."</option>
+  ".&option('no', 'problemstatus').&mt("Don't Show Incorect/Correct Feedback")."</option>
+  ".&option('no_feedback_ever', 'problemstatus').&mt("Don't Show Any Feedback")."</option>
 </select>
-</nobr>
-<input type='submit' name='changeproblemmode' value='".&mt("Change")."' />
-<hr />";
-	my $numtoanalyze=$env{'form.numtoanalyze'};
-	if (!$numtoanalyze) { $numtoanalyze=20; }
-	$result.= '<input type="submit" name="problemmode" value='.
-	    &mt('"Calculate answers').'" /> for
-             <input type="text" name="numtoanalyze" value="'.
-	     $numtoanalyze.'" size="5" /> '.&mt('versions of this problem').
-	     '.'.&Apache::loncommon::help_open_topic("Analyze_Problem",
-						     '',undef,undef,300).
-						     '<hr />';
+</span>
+";
+
     } elsif ($Apache::lonhomework::parsing_a_task) {
 	$result.="
-<nobr>
-Problem Status:
+<div class='LC_edit_problem_header_row1'>
+<span class=\"LC_nobreak\">
+".&mt("Problem Status:")."
 <select name='problemstate'>
   <option value=''></option>
   ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>
@@ -388,10 +480,58 @@ Problem Status:
   ".&option('WEB_GRADE'            ,'problemstate').&mt("Criteria Grading")."</option>
   ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Feedback")."</option>
 </select>
-</nobr>
-<input type='submit' name='changeproblemmode' value='".&mt("Change")."' />
-<hr />";
-    }
+</span>
+$show_all
+";
+    }
+    $result.='
+       <span class="LC_nobreak">
+       '.&mt('Apply style file: ').'
+         <input type="text" name="style_file" value="'.&HTML::Entities::encode($env{'construct.style'},'"<>&').'" />
+         <a href="javascript:openbrowser(\'lonhomework\',\'style_file\',\'sty\')">'.&mt('Select').'</a>
+       </span>
+     </div>
+     <div class="LC_edit_problem_header_row1">'.
+       &Apache::lonxml::renderingoptions().'
+     </div>
+     <input type="submit" name="changeproblemmode" value="'.&mt("Change View").'" />
+     <input type="submit" name="clear_style_file" accesskey="d" value="'.&mt('Show Default View').'" />
+     <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
+   </div>
+   <hr class="LC_edit_problem_divide" />
+   <div class="LC_edit_problem_header_randomize_row">
+     <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
+     <input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
+     <input type="text" name="rndseed" size="10" value="'.
+	       $rndseed.'"
+             onchange="javascript:document.lonhomework.changerandseed.click()" />';
+
+    if (!$Apache::lonhomework::parsing_a_task) {
+	my $numtoanalyze=$env{'form.numtoanalyze'};
+	if (!$numtoanalyze) { $numtoanalyze=20; }
+	$result .= '<span class="LC_nobreak">'.
+	    &mt('[_1] for [_2] versions.',
+		'<input type="button" name="submitmode" value="'.&mt('Calculate answers').'" '.
+                'onclick="javascript:setmode(this.form,'."'calcanswers'".')" />'
+               ,'<input type="text" name="numtoanalyze" value="'.
+		$numtoanalyze.'" size="5" />').
+		&Apache::loncommon::help_open_topic("Analyze_Problem",'',undef,undef,300).
+		'</span>';
+						    
+    }
+
+    $result.='
+   </div>
+   <div class="LC_edit_problem_header_edit_row">';
+    $result.='<input type="hidden" name="problemmode" value="view" />';
+    $result .= '<input type="button" name="submitmode" accesskey="e" value="'.&mt('Edit').'" '.
+               'onclick="javascript:setmode(this.form,'."'edit'".')" />';
+    $result .= '<input type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" '.
+               'onclick="javascript:setmode(this.form,'."'editxml'".')" />';
+    $result.='
+   </div>
+   '.&Apache::lonxml::message_location().'
+</div>';
     return $result;
 }
 
@@ -434,12 +574,19 @@ sub initialize_storage {
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
 }
 
-# -------------------------------------------------------------finalize_storage
-# Stores away the result has to a student's environment
-# checks form.grade_ for specific values, other wises stores
-# to the running users environment
-# Will increment totals for attempts, students, and corrects
-# if running user has student role.  
+=pod
+
+=item finalize_storage()
+
+	Stores away the result has to a student's environment
+	checks form.grade_ for specific values, other wises stores
+	to the running users environment
+	Will increment totals for attempts, students, and corrects
+	if running user has student role.
+	
+=cut
+
+
 sub finalize_storage {
     my ($given_symb) = @_;
     my $result;
@@ -470,10 +617,16 @@ sub finalize_storage {
     return $result;
 }
 
-# -------------------------------------------------------------store_aggregates
-# Sends hash of values to be incremented in nohist_resourcetracker.db
-# for the course. Increments total number of attempts, unique students 
-# and corrects for each part for an instance of a problem, as appropriate.
+=pod
+
+item store_aggregates()
+
+	Sends hash of values to be incremented in nohist_resourcetracker.db
+	for the course. Increments total number of attempts, unique students 
+	and corrects for each part for an instance of a problem, as appropriate.
+	
+=cut
+
 sub store_aggregates {
     my ($symb,$courseid) = @_;
     my %aggregate;
@@ -533,17 +686,37 @@ ENDCHECKOUT
 
 sub firstaccess_msg {
     my ($time,$symb)=@_;
-    my ($map)=&Apache::lonnet::decode_symb($symb);
-    my $foldertitle=&Apache::lonnet::gettitle($map);
-    &Apache::lonxml::debug("map is $map title is $foldertitle");
+    my $result;
+    my @interval=&Apache::lonnet::EXT("resource.0.interval");
+    if ($interval[1] eq 'map') {
+	my ($map)=&Apache::lonnet::decode_symb($symb);
+	my $foldertitle=&Apache::lonnet::gettitle($map);
+    
+	&Apache::lonxml::debug("map is $map title is $foldertitle");
+	$result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.'
+                             .' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
+                             ,$foldertitle,$time)."</h2>";
+    } elsif ($interval[1] eq 'course') {
+	my $course = $env{'course.'.$env{'request.course.id'}.'.description'};
+        $result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.'
+                             .' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
+                             ,$course,$time)."</h2>";
+    } else {
+	my $title=&Apache::lonnet::gettitle($symb);
+        $result .= "<h2>".&mt('This resource "[_1]" is open for a limited time.'
+                             .' Once you click the "Show Resource" button below you have [_2] to complete this resource "[_1]".'
+                             ,$title,$time)."</h2>";
+    }
     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>
+    my $buttontext = &mt('Show Resource');
+    my $timertext = &mt('Start Timer?');
+    $result .= (<<ENDCHECKOUT);
 <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(); }" />
+<input type="button" name="accessbutton" value="$buttontext" onClick="javascript:if (confirm('$timertext')) { document.markaccess.submit(); }" />
 </form>
 ENDCHECKOUT
+    return $result;
 }
 
 sub init_problem_globals {
@@ -555,19 +728,19 @@ sub init_problem_globals {
     if ($type eq 'problem') {
 	$Apache::inputtags::part='0';
 	@Apache::inputtags::partlist=('0');
-	$Apache::lonhomework::problemstatus=&get_problem_status('0');
+	&Apache::lonhomework::set_show_problem_status(&get_problem_status('0'));
 	$Apache::lonhomework::ignore_response_errors=0;
 
     } elsif ($type eq 'library') {
 	$Apache::inputtags::part='';
 	@Apache::inputtags::partlist=();
-	$Apache::lonhomework::problemstatus='';	
+	&Apache::lonhomework::reset_show_problem_status();
 	$Apache::lonhomework::ignore_response_errors=1;
 
     } elsif ($type eq 'Task') {
 	$Apache::inputtags::part='0';
 	@Apache::inputtags::partlist=('0');
-	$Apache::lonhomework::problemstatus='';	
+	&Apache::lonhomework::reset_show_problem_status();
 	$Apache::lonhomework::ignore_response_errors=1;
     }
     @Apache::inputtags::responselist = ();
@@ -596,8 +769,8 @@ sub reset_problem_globals {
     undef($Apache::lonhomework::default_type);
     undef($Apache::lonhomework::type);
     undef($Apache::lonhomework::scantronmode);
-    undef($Apache::lonhomework::problemstatus);
     undef($Apache::lonhomework::ignore_response_errors);
+    &Apache::lonhomework::reset_show_problem_status();
 }
 
 sub set_problem_state {
@@ -648,9 +821,10 @@ sub start_problem {
     }
 
     if ($target ne 'analyze') {
-	$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
+        my $type = &Apache::lonnet::EXT('resource.0.type');
+	$Apache::lonhomework::type=$type;
 	if (($env{'request.state'} eq 'construct') &&
-	    defined($env{'form.problemtype'})) {
+	    $env{'form.problemtype'} =~ /\S/) {
 	    $Apache::lonhomework::type=$env{'form.problemtype'};
 	}
 	&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
@@ -711,7 +885,8 @@ sub start_problem {
 	    $result.=&Apache::lonxml::printtokenheader($target,$token);
 	}
 	if ($env{'form.markaccess'}) {
-	    &Apache::lonnet::set_first_access('map');
+	    my @interval=&Apache::lonnet::EXT("resource.0.interval");
+	    &Apache::lonnet::set_first_access($interval[1]);
 	}
 	#handle rand seed in construction space
 	my $rndseed=&setup_rndseed($safeeval);
@@ -736,6 +911,9 @@ sub start_problem {
 		$form_tag_start.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
 		    '</label>';
 	    }
+            if ($Apache::lonhomework::type eq 'practice') {
+                $form_tag_start.=&practice_problem_header();
+            }
 	    $form_tag_start.='<hr />';
 	}
 
@@ -808,6 +986,11 @@ sub start_problem {
 	    # create a page header and exit
 	    if ($env{'request.state'} eq "construct") {
 		$result.= &problem_web_to_edit_header($env{'form.rndseed'});
+                if ($Apache::lonhomework::type eq 'practice') {
+                    $result.= '<input type="submit" name="resetdata" '.
+                              'value="'.&mt('New Problem Variation').'" />'.
+                              &practice_problem_header().'<hr />';
+                }
 	    }
 	    # if we are viewing someone else preserve that info
 	    if (defined $env{'form.grade_symb'}) {
@@ -1043,6 +1226,11 @@ sub start_library {
 	$result.=" \n $form_tag_start".	
 		  '<input type="hidden" name="submitted" value="yes" />';
 	$result.=&problem_web_to_edit_header($rndseed);
+        if ($Apache::lonhomework::type eq 'practice') {
+            $result.= '<input type="submit" name="resetdata" '.
+                      'value="'.&mt('New Problem Variation').'" />'.
+                      &practice_problem_header().'<hr />';
+        }
     }
     return $result;
 }
@@ -1149,29 +1337,31 @@ sub start_languageblock {
 # Now loop over all languages in order of preference
         foreach my $preferred_language (@preferred_languages) {
 # If the languageblock has no arguments, show the contents
-           $result='1';
+           $result=1;
+           my $found=0;
 # Do we have an include argument?
 	   if ($include) {
 # If include is specified, by default, don't render the block
-              $result='';
+              $result=0;
               foreach my $included_language (split(/\,/,$include)) {
 # ... but if my preferred language is included, render it
                  if ($included_language eq $preferred_language) {
-                    $result='1'; 
-                    last; 
+                    $result=1; 
+                    $found=1; 
                  }
               }
 	   }
 # Do we have an exclude argument?
            if ($exclude) {
-              $result='1';
+              $result=1;
               foreach my $excluded_language (split(/\,/,$exclude)) {
                  if ($excluded_language eq $preferred_language) {
-                    $result='0';
-                    last; 
+                    $result=0;
+                    $found=1;
                  }
               }
 	   }
+           if ($found) { last; }
         }
 	if ( ! $result ) {
 	    my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser,
@@ -1248,7 +1438,17 @@ sub end_languageblock {
 	    my $result = &Apache::lonxml::endredirection();
 	    my $which = &Apache::lonxml::get_param('which',$parstack,
 						   $safeeval);
-	    $available_texts{$which} = $result;
+            if ($which=~/\w/) {
+                $available_texts{$which} = $result;
+            }
+            my $otherlangs = &Apache::lonxml::get_param('other',$parstack,
+                                                        $safeeval);
+            foreach my $language (split(/\s*\,\s*/,$otherlangs)) {
+                if ($language=~/\w/) {
+                    $available_texts{$language} = $result;
+                }
+            }
+
 	}
 	return '';
     }
@@ -1345,7 +1545,7 @@ sub end_while {
 	    $return = &Apache::run::run($code,$safeeval);
 	}
 	if ($error) {
-	    &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occured while running &lt;while&gt; on line').' '.$line.'</pre>');
+	    &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running &lt;while&gt; on line').' '.$line.'</pre>');
 	}
     } elsif ($target eq "edit") {
 	$result.= &Apache::edit::tag_end($target,$token,'');
@@ -1465,7 +1665,9 @@ sub start_part {
     @Apache::inputtags::response=();
     @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();
-    $Apache::lonhomework::problemstatus=&get_problem_status($id);
+    &Apache::lonhomework::set_show_problem_status(&get_problem_status($id));
+    &Apache::response::reset_params();
+
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
     my $newtype=&Apache::lonnet::EXT("resource.$id.type");
     if ($newtype) { $Apache::lonhomework::type=$newtype; }
@@ -1703,7 +1905,8 @@ sub start_problemtype {
 	$result .=&Apache::edit::checked_arg('When used as type(s):','for',
 					     [ ['exam','Exam/Quiz Problem'],
 					       ['survey','Survey'],
-					       ['problem','Homework Problem'] ]
+					       ['problem','Homework Problem'],
+                                               ['practice','Practice Problem'] ]
 					     ,$token);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
@@ -1722,6 +1925,13 @@ sub start_startouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my @result=(''.'');
     if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); }
+    
+    my $nesting = 
+	&Apache::lonxml::set_state('outtext',
+				   &Apache::lonxml::get_state('outtext')+1);
+    if ($nesting > 1 && $env{'request.state'} eq 'construct') {
+	&Apache::lonxml::error("Nesting of &lt;startouttext /&gt; not allowed, on line ".$token->[5]);
+    }
     return (@result);
 }
 
@@ -1729,17 +1939,24 @@ sub end_startouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     my $text='';
-
     if ($target eq 'edit') {
+	my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth;
 	$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
+
 	$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>
 <td>".&mt('Delete:').
                  &Apache::edit::deletelist($target,$token)
-		 ."</td>
-<td>".
-                 &Apache::edit::insertlist($target,$token).
-		 '</td><td align="right" valign="top">' .
-		 &Apache::loncommon::helpLatexCheatsheet().
+		 ."</td>";
+        unless ($env{'environment.wysiwygeditor'} eq 'on') {
+	    $result .= '<td align="left">'
+		.&Apache::lonhtmlcommon::dragmath_button($areaid,1)
+		.'</td>'
+		.'<td>'
+		.&Apache::edit::insertlist($target,$token)
+		.'</td>';
+	}
+	$result.='<td align="right" valign="top">' .
+	    &Apache::loncommon::helpLatexCheatsheet().
 		 &Apache::edit::end_row().
                  &Apache::edit::start_spanning_row()."\n".
 		 &Apache::edit::editfield($token->[1],$text,"",80,8,1);
@@ -1761,6 +1978,14 @@ sub start_endouttext {
 	$result='<endouttext />'.
 	    &Apache::edit::handle_insertafter('startouttext');
     }
+
+    my $nesting = 
+	&Apache::lonxml::set_state('outtext',
+				   &Apache::lonxml::get_state('outtext')-1);
+    if ($nesting < 0 && $env{'request.state'} eq 'construct') {
+	&Apache::lonxml::error(" Extraneous &lt;endouttext /&gt; not allowed on line ".$token->[5]);
+	&Apache::lonxml::set_state('outtext', 0);
+    }
     return $result;
 }
 
@@ -1805,5 +2030,17 @@ sub end_simpleeditbutton {
     return '';
 }
 
+sub practice_problem_header {
+    return '<span class="LC_info"><h3>'.&mt('Practice Problem').'</h3></span>'.
+           '<span class="LC_info">'.&mt('Submissions are not permanently recorded').
+           '</span>';
+}
+
 1;
 __END__
+
+=pod
+
+=back
+
+=cut