--- loncom/homework/structuretags.pm	2011/01/18 21:45:32	1.486
+++ loncom/homework/structuretags.pm	2011/02/06 18:43:10	1.487
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.486 2011/01/18 21:45:32 www Exp $
+# $Id: structuretags.pm,v 1.487 2011/02/06 18:43:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -464,27 +464,48 @@ sub remember_problem_state {
        <input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />';
 }
 
+sub problem_edit_action_button {
+    my ($name,$action,$accesskey,$text,$flag)=@_;
+    my $actionscript="setmode(this.form,'$action')";
+    return "\n<input type='button' name='$name' accesskey='$accesskey' value='".&mt($text)."'".
+           ($flag?&Apache::edit::submit_ask_anyway($actionscript):&Apache::edit::submit_dont_ask($actionscript))." />";
+}
+
 sub problem_edit_buttons {
-   return  '
-<div class="LC_edit_problem_discards">
-       <input type="button" name="submitmode" accesskey="d" value="'.&mt('Discard Edits and View').'" '.
-       ' onclick="javscript:setmode(this.form,'."'discard'".')"  />
-       <input '.&Apache::edit::submit_ask_anyway('setmode(this.form,'."'editxml'".')').' type="button" name="submitmode" 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="submitbutton" accesskey="s" value="'.&mt('Save and Edit').'" />
-       <input type="submit" name="submitbutton" accesskey="v" value="'.&mt('Save and View').'" />
-</div>';
+   my ($mode)=@_;
+# Buttons that do not save
+   my $result='<div class="LC_edit_problem_discards">'.
+              &problem_edit_action_button('subdiscview','discard','d','Discard Edits and View',1);
+   if ($mode eq 'editxml') {
+       $result.=&problem_edit_action_button('subedit','edit','e','Edit',1);
+       $result.=&problem_edit_action_button('subundo','undoxml','u','Undo',1);
+       $result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
+   } else {
+       $result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1);
+       $result.=&problem_edit_action_button('subundo','undo','u','Undo',1);
+   }
+   $result.="\n</div>";
+# Buttons that save
+   $result.='<div class="LC_edit_problem_saves">';
+   if ($mode eq 'editxml') {
+       $result.=&problem_edit_action_button('subsaveedit','saveeditxml','s','Save and EditXML');
+       $result.=&problem_edit_action_button('subsaveview','saveviewxml','v','Save and View');
+   } else {
+       $result.=&problem_edit_action_button('subsaveedit','saveedit','s','Save and Edit');
+       $result.=&problem_edit_action_button('subsaveview','saveview','v','Save and View');
+   }
+   $result.="\n</div>\n";
+   return $result;
 }
 
 sub problem_edit_header {
-    return '<input type="hidden" name="submitted" value="edit" /><input type="hidden" name="problemmode" value="edit" />'.
-	&Apache::structuretags::remember_problem_state().'
+    return '<input type="hidden" name="submitted" value="edit" />'.
+	&remember_problem_state('edit').'
 <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>'.
+'<input type="hidden" name="problemmode" value="saveedit" />'.
 &problem_edit_buttons().'
 <hr style="clear:both;" />
 '.&Apache::lonxml::message_location().'