--- loncom/homework/structuretags.pm	2007/10/16 23:20:25	1.404
+++ loncom/homework/structuretags.pm	2007/10/17 00:22:51	1.405
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.404 2007/10/16 23:20:25 albertel Exp $
+# $Id: structuretags.pm,v 1.405 2007/10/17 00:22:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -360,7 +360,7 @@ sub problem_web_to_edit_header {
     if (!$Apache::lonhomework::parsing_a_task) {
 	$result.="
 <nobr>
-Problem Status:
+".&mt("Problem Status:")."
 <select name='problemstate'>
   <option value=''></option>
   ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>
@@ -371,7 +371,7 @@ Problem Status:
 </select>
 </nobr>
 <nobr>
-Problem Type:
+".&mt("Problem Type:")."
 <select name='problemtype'>
   <option value=''></option>
   ".&option('exam'   ,'problemtype').&mt("Exam Problem")."</option>
@@ -380,11 +380,12 @@ Problem Type:
 </select>
 </nobr>
 <nobr>
-Feedback Mode:
+".&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")."' />
@@ -401,7 +402,7 @@ Feedback Mode:
     } elsif ($Apache::lonhomework::parsing_a_task) {
 	$result.="
 <nobr>
-Problem Status:
+".&mt("Problem Status:")."
 <select name='problemstate'>
   <option value=''></option>
   ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>
@@ -576,19 +577,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 = ();
@@ -617,8 +618,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 {
@@ -1488,7 +1489,7 @@ 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);