--- loncom/homework/structuretags.pm	2007/10/30 00:17:09	1.407
+++ loncom/homework/structuretags.pm	2007/10/31 17:40:01	1.409
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.407 2007/10/30 00:17:09 albertel Exp $
+# $Id: structuretags.pm,v 1.409 2007/10/31 17:40:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -199,7 +199,7 @@ sub page_start {
 	}
     }
 
-    if (!defined($found{'body'})) {
+    if (!defined($found{'body'}) && $env{'request.state'} ne 'construct') {
 	$page_start .= &Apache::lonxml::message_location();
     }
     
@@ -302,16 +302,24 @@ sub remember_problem_state {
 sub problem_edit_header {
     return '<input type="hidden" name="submitted" value="edit" />'.
 	&Apache::structuretags::remember_problem_state().'
+<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>
+<div class="LC_edit_problem_discards">
        <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 class="LC_edit_problem_divide" />
-       <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').'" />
-       <div>'.
-       &Apache::loncommon::help_open_menu('Problem Editing Help','Problem_Editor_XML_Index',5,'Authoring',undef,undef,undef,'Problem Editing Help')
-       .'</div>'.
+</div>
+<div class="LC_edit_problem_saves">
+       <input type="submit" name="submit" accesskey="s" value="'.&mt('Save and Edit').'" />
+       <input type="submit" name="submit" accesskey="v" value="'.&mt('Save and View').'" />
+  </div>
+<hr class="LC_edit_problem_divide" />
+'.&Apache::lonxml::message_location().'
+</div>
+'.
        '<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">';
 }
 
@@ -336,12 +344,6 @@ sub problem_web_to_edit_header {
     my ($rndseed)=@_;
     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').'" />';
-    $result.='</div>';
-
     if (!$Apache::lonhomework::parsing_a_task) {
 	$result .= 
 	    '<div class="LC_edit_problem_header_title">'.
@@ -443,17 +445,25 @@ $show_all
     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 .= '<span class="LC_nobreak">'.
+	    &mt('[_1] for [_2] versions.',
+		'<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).
+		'</span>';
+						    
     }
 
     $result.='
    </div>
-   <hr class="LC_edit_problem_divide" />
+   <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').'" />';
+    $result.='
+   </div>
+   '.&Apache::lonxml::message_location().'
 </div>';
     return $result;
 }