--- loncom/homework/structuretags.pm	2007/10/31 01:37:52	1.408
+++ loncom/homework/structuretags.pm	2007/11/13 23:05:32	1.412
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.408 2007/10/31 01:37:52 albertel Exp $
+# $Id: structuretags.pm,v 1.412 2007/11/13 23:05:32 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();
     }
     
@@ -317,14 +317,30 @@ sub problem_edit_header {
        <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">';
 }
 
 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" />
+  <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').'" />
+  </div>
+  <div class="LC_edit_problem_saves">
+    <input type="submit" name="submit" value="'.&mt('Save and Edit').'" />
+    <input type="submit" name="submit" value="'.&mt('Save and View').'" />
+  </div>
+  <hr class="LC_edit_problem_divide" />
+</div>
+'.
+
     &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).
     "\n</form>\n".&Apache::loncommon::end_page();
 }
@@ -460,9 +476,9 @@ $show_all
     $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;
 }
@@ -722,7 +738,7 @@ sub start_problem {
     if ($target ne 'analyze') {
 	$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.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:");