--- loncom/homework/structuretags.pm	2007/10/16 23:20:25	1.404
+++ loncom/homework/structuretags.pm	2007/10/30 00:09:30	1.406
@@ -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.406 2007/10/30 00:09:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -332,35 +332,44 @@ sub option {
 
 sub problem_web_to_edit_header {
     my ($rndseed)=@_;
-    my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />';
+    my $result .= '<div class="LC_edit_problem_header">';
+
+    $result.='<div class="LC_edit_problem_header_edit_row">';
+    $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" ';
+    $result .= '<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />';
+    $result.='</div>';
+
+    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>
@@ -369,39 +378,35 @@ 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('survey' ,'problemtype').&mt("Survey Question")."</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>
@@ -409,10 +414,45 @@ 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>
+     <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 .= &mt('[_1] for [_2] versions of this problem.',
+		       '<input type="submit" name="problemmode" value='.&mt('"Calculate answers').'" />',
+		       '<input type="text" name="numtoanalyze" value="'.
+		       $numtoanalyze.'" size="5" />').
+		       &Apache::loncommon::help_open_topic("Analyze_Problem",
+							   '',undef,undef,300);
     }
+
+    $result.='
+   </div>
+   <hr class="LC_edit_problem_divide" />
+</div>';
     return $result;
 }
 
@@ -576,19 +616,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 +657,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 +1528,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);