--- loncom/homework/lonhomework.pm	2007/10/05 18:08:40	1.275
+++ loncom/homework/lonhomework.pm	2007/10/31 17:40:00	1.281
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.275 2007/10/05 18:08:40 albertel Exp $
+# $Id: lonhomework.pm,v 1.281 2007/10/31 17:40:00 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,6 +63,28 @@ BEGIN {
 }
 
 
+=pod
+
+=item set_bubble_lines()
+
+Called at analysis time to set the bubble lines
+hash for the problem.. This should be called in the
+end_problemtype tag in analysis mode.
+
+We fetch the hash of part id counters from lonxml
+    and push them into analyze:{part_id.bubble_lines}.
+
+=cut
+
+sub set_bubble_lines {
+    my %bubble_counters = &Apache::lonxml::get_bubble_line_hash();
+
+    foreach my $key (keys(%bubble_counters)) {
+	$Apache::lonhomework::analyze{"$key.bubble_lines"} =
+	    $bubble_counters{"$key"};
+    }
+}
+
 #
 # Decides what targets to render for.
 # Implicit inputs:
@@ -127,7 +149,7 @@ sub get_target {
 	    } elsif ( $env{'form.problemmode'} eq &mt('Edit') ||
 		      $env{'form.problemmode'} eq 'Edit') {
 		if ( $env{'form.submitted'} eq 'edit' ) {
-		    if ( $env{'form.submit'} eq &mt('Submit Changes and View') ) {
+		    if ( $env{'form.submit'} eq &mt('Save and View') ) {
 			return ('modified','web','answer');
 		    } else {
 			return ('modified','no_output_web','edit');
@@ -376,8 +398,8 @@ sub check_access {
     if ($env{'request.state'} eq "construct") {
 	if ($env{'form.problemstate'}) {
 	    if ($env{'form.problemstate'} =~ /^CANNOT_ANSWER/) {
-		if ( ! ($env{'form.problemstate'} eq 'CANNOT_ANSWER_correct' &&
-			lc($Apache::lonhomework::problemstatus) eq 'no')) {
+		if ( ! ($env{'form.problemstate'} eq 'CANNOT_ANSWER_correct' 
+			&& &hide_problem_status())) {
 		    return ('CANNOT_ANSWER',
 			    &mt('is in this state due to author settings.'));
 		}
@@ -467,7 +489,7 @@ sub check_access {
 	# if (correct and show prob status) or excused then CANNOT_ANSWER
 	if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
 	    &&
-	    lc($Apache::lonhomework::problemstatus) ne 'no')
+	    &show_problem_status())
 	   ||
 	   $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
 	    $status = 'CANNOT_ANSWER';
@@ -724,11 +746,14 @@ sub analyze_header {
             <form name="lonhomework" method="POST" action="'.
 	    &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
 	    &Apache::structuretags::remember_problem_state().'
+            <div class="LC_edit_problem_analyze_header">
             <input type="submit" name="problemmode" value="'.&mt("EditXML").'" />
             <input type="submit" name="problemmode" value="'.&mt('Edit').'" />
-            <hr />
+            <hr class="LC_edit_problem_divide" />
+
             <input type="submit" name="submit" value="'.&mt("View").'" />
-            <hr />
+            <hr class="LC_edit_problem_divide" />
+            </div>
             </form>';
     &Apache::lonxml::add_messages(\$result);
     $request->print($result);
@@ -801,7 +826,7 @@ sub analyze {
     }
     &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,
 					  &mt('Analyzing Results'));
-    $request->print('<hr />'.&mt('List of possible answers').': ');
+    $request->print('<hr class="LC_edit_problem_divide" />'.&mt('List of possible answers').': ');
     foreach my $part (sort(keys(%allparts))) {
 	if (defined(@{ $overall{$part.'.answer'} })) {
 	    for (my $i=0;$i<scalar(@{ $overall{$part.'.answer'} });$i++) {
@@ -839,6 +864,36 @@ sub analyze {
     return $result;
 }
 
+{
+    my $show_problem_status;
+    sub reset_show_problem_status {
+	undef($show_problem_status);
+    }
+
+    sub set_show_problem_status {
+	my ($new_status) = @_;
+	$show_problem_status = lc($new_status);
+    }
+
+    sub hide_problem_status {
+	return ($show_problem_status eq 'no'
+		|| $show_problem_status eq 'no_feedback_ever');
+    }
+
+    sub show_problem_status {
+	return ($show_problem_status eq 'yes'
+		|| $show_problem_status eq '');
+    }
+    
+    sub show_some_problem_status {
+	return ($show_problem_status eq 'no');
+    }
+
+    sub show_no_problem_status {
+	return ($show_problem_status eq 'no_feedback_ever');
+    }
+}
+
 sub editxmlmode {
     my ($request,$file) = @_;
     my $result;
@@ -854,7 +909,7 @@ sub editxmlmode {
 	if (!$error) { $problem=&Apache::lonnet::getfile($file); }
     }
     &Apache::lonhomework::showhashsubset(\%env,'^form');
-    if ( $env{'form.submit'} eq &mt('Submit Changes and View') ) {
+    if ( $env{'form.submit'} eq &mt('Save and View') ) {
 	&Apache::lonhomework::showhashsubset(\%env,'^form');
 	$env{'form.problemmode'}='View';
 	&renderpage($request,$file);
@@ -884,26 +939,35 @@ sub editxmlmode {
 
 	$result.=$start_page.
 	    &renderpage($request,$file,['no_output_web'],1).
-	    &Apache::lonxml::message_location().'
-            <form '.&Apache::edit::form_change_detection().' name="lonhomework" method="POST" action="'.
+            '<form '.&Apache::edit::form_change_detection().' name="lonhomework" method="POST" action="'.
 	    &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
 	    &Apache::structuretags::remember_problem_state().'
-            <input type="hidden" name="problemmode" value="'.&mt('EditXML').'" />
-            <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
-            <input type="submit" '.&Apache::edit::submit_ask_anyway().'name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
-            <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
-            <hr />
-            <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />
-            <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
-            <hr />
-            ' . $xml_help . '
+            <div class="LC_edit_problem_editxml_header">
+              <table class="LC_edit_problem_header_title"><tr><td>
+               '.&mt('Problem Editing').&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index').'
+                </td><td align="right">
+                  '.&Apache::loncommon::helpLatexCheatsheet().'
+                </td></tr>
+              </table>
+              <div class="LC_edit_problem_discards">
+                <input type="hidden" name="problemmode" value="'.&mt('EditXML').'" />
+                <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
+                <input type="submit" '.&Apache::edit::submit_ask_anyway().'name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
+                <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
+              </div>
+              <div class="LC_edit_problem_saves">
+                <input type="submit" name="submit" accesskey="s" value="'.&mt('Save').'" />
+                <input type="submit" name="submit" accesskey="v" value="'.&mt('Save and View').'" />
+              </div>
+              <hr class="LC_edit_problem_divide" />
+	      '.&Apache::lonxml::message_location().'
+            </div>
+            '  . '
             <textarea '.&Apache::edit::element_change_detection().
 	              ' rows="'.$rows.'" cols="'.$cols.'" style="width:100%" '.
 		      ' name="editxmltext" id="LC_editxmltext">'.
 		      &HTML::Entities::encode($problem,'<>&"').'</textarea>
             <div id="LC_aftertextarea">
-                <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />
-                <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
             </div>
             </form>'.&Apache::loncommon::end_page();
 	&Apache::lonxml::add_messages(\$result);