--- loncom/homework/structuretags.pm	2007/10/31 17:40:01	1.409
+++ loncom/homework/structuretags.pm	2007/11/13 23:33:01	1.413
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.409 2007/10/31 17:40:01 albertel Exp $
+# $Id: structuretags.pm,v 1.413 2007/11/13 23:33:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -324,8 +324,22 @@ sub problem_edit_header {
 }
 
 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="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();
 }
@@ -723,7 +737,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:");