--- loncom/homework/structuretags.pm	2024/02/27 22:23:13	1.512.2.24.2.12
+++ loncom/homework/structuretags.pm	2024/02/28 00:19:04	1.512.2.24.2.13
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.512.2.24.2.12 2024/02/27 22:23:13 raeburn Exp $
+# $Id: structuretags.pm,v 1.512.2.24.2.13 2024/02/28 00:19:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -406,7 +406,7 @@ sub page_start {
     if (&Apache::lonhtmlcommon::htmlareabrowser()) {
         my %textarea_args;
         if (($env{'request.state'} ne 'construct') ||
-            ($env{'environment.nocodemirror'})) {
+            (&Apache::loncommon::nocodemirror())) {
             %textarea_args = (
                                 dragmath => 'math',
                               );
@@ -693,7 +693,7 @@ sub setup_rndseed {
             }
             $env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
         }
-	if ( ($env{'form.resetdata'} eq &mt('New Problem Variation')
+	if ( ($env{'form.resetdata'} eq 'new_problem_variation'
 	      && $env{'form.submitted'} eq 'yes')  ||
 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    srand(time);
@@ -776,13 +776,18 @@ sub problem_edit_action_button {
 
 sub problem_edit_buttons {
    my ($mode)=@_;
+   my %editors = &Apache::loncommon::permitted_editors();
 # Buttons that save
    my $result = '<div style="float:right">';
    if ($mode eq 'editxml') {
-       $result.=&problem_edit_action_button('subsaveedit','saveeditxml','s','Save and EditXML');
+       if ($editors{'xml'}) {
+           $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');
+       if ($editors{'edit'}) {
+           $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";
@@ -790,13 +795,23 @@ sub problem_edit_buttons {
    $result .= '<div>'.
               &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);
+       if ($editors{'edit'}) {
+           $result.=&problem_edit_action_button('subedit','edit','e','Edit',1);
+       }
+       if ($editors{'daxe'}) {
+           $result.=&problem_edit_action_button('subdaxe','daxe','w','Edit with Daxe',1);
+       }
        $result.=&problem_edit_action_button('subundo','undoxml','u','Undo',1);
-       if ($env{'environment.nocodemirror'}) {
+       if (&Apache::loncommon::nocodemirror()) {
            $result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
        }
    } else {
-       $result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1);
+       if ($editors{'xml'}) {
+           $result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1);
+       }
+       if ($editors{'daxe'}) {
+           $result.=&problem_edit_action_button('subdaxe','daxe','w','Edit with Daxe',1);
+       }
        $result.=&problem_edit_action_button('subundo','undo','u','Undo',1);
    }
    $result.="\n</div>";
@@ -810,9 +825,9 @@ sub problem_edit_header {
         <div class="LC_edit_problem_header">
         <div class="LC_edit_problem_header_title">
         '.&mt('Problem Editing').$mode.&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
-         </div><div class="LC_edit_actionbar" id="actionbar">'.
-         '<input type="hidden" name="problemmode" value="saveedit" />'.
-         &problem_edit_buttons();
+        </div><div class="LC_edit_actionbar" id="actionbar">'.
+        '<input type="hidden" name="problemmode" value="saveedit" />'.
+        &problem_edit_buttons();
 
     $return .= '</div></div>' . &Apache::lonxml::message_location();
     $return .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined.css" />
@@ -869,6 +884,7 @@ sub option {
 
 sub problem_web_to_edit_header {
     my ($rndseed)=@_;
+    my %editors = &Apache::loncommon::permitted_editors();
     my $result .= '<div class="LC_edit_problem_header">';
 
     if (!$Apache::lonhomework::parsing_a_task) {
@@ -968,7 +984,8 @@ $show_all
      </div>
      <input type="submit" name="changeproblemmode" value="'.&mt("Change View").'" />
      <input type="submit" name="clear_style_file" accesskey="d" value="'.&mt('Show Default View').'" />
-     <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
+     <button type="submit" name="resetdata" accesskey="r" value="reset_submissions">
+     '.&mt('Reset Submissions').'</button>
    </div>
    <hr />
    <div class="LC_edit_problem_header_randomize_row">
@@ -997,10 +1014,21 @@ $show_all
    <hr />
    <div>';
     $result.='<input type="hidden" name="problemmode" value="view" />';
-    $result .= '<input type="button" name="submitmode" accesskey="e" value="'.&mt('Edit').'" '.
-               'onclick="javascript:setmode(this.form,'."'edit'".')" />';
-    $result .= '<input type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" '.
-               'onclick="javascript:setmode(this.form,'."'editxml'".')" />';
+    if ($editors{'edit'}) {
+        $result .= '<input type="button" name="submitmode" accesskey="e" value="'.&mt('Edit').'" '.
+                   'onclick="javascript:setmode(this.form,'."'edit'".')" />';
+    }
+    if ($editors{'xml'}) {
+        $result .= '<input type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" '.
+                   'onclick="javascript:setmode(this.form,'."'editxml'".')" />';
+    }
+    if (($editors{'daxe'}) &&
+        ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9)) {
+        my $uri = $env{'request.uri'};
+        my $daxeurl = '/daxepage'.$uri;
+        $result .= '<input type="button" accesskey="w" value="'.&mt('Edit with Daxe').'" '.
+                   'onclick="javascript:setmode(this.form,'."'daxe'".')" />';
+    }
     $result.='
    </div>
    <hr />
@@ -1027,8 +1055,8 @@ sub initialize_storage {
 	|| $Apache::lonhomework::type eq 'practice') {
 	
 	my $namespace = $symb || $env{'request.uri'};
-	if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
-	    ($env{'form.resetdata'} eq &mt('New Problem Variation')
+        if ($env{'form.resetdata'} eq 'reset_submissions' ||
+            ($env{'form.resetdata'} eq 'new_problem_variation'
 	     && $env{'form.submitted'} eq 'yes') ||
 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    &Apache::lonnet::tmpreset($namespace,'',$domain,$name);
@@ -1919,8 +1947,8 @@ sub start_problem {
             }
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
 		$rndseedval.'" />'.
-		    '<input type="submit" name="resetdata"
-                             value="'.&mt('New Problem Variation').'" />';
+		    '<button type="submit" name="resetdata"
+                        value="new_problem_variation">'.&mt('New Problem Variation').'</button>';
 	    if (exists($env{'form.username'})) {
 		$form_tag_start.=
 		    '<input type="hidden" name="username"
@@ -2001,8 +2029,8 @@ sub start_problem {
 	    if ($env{'request.state'} eq "construct") {
 		$result.= &problem_web_to_edit_header($env{'form.rndseed'});
                 if ($Apache::lonhomework::type eq 'practice') {
-                    $result.= '<input type="submit" name="resetdata" '.
-                              'value="'.&mt('New Problem Variation').'" />'.
+                    $result.= '<button type="submit" name="resetdata" '.
+                              'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'.
                               &practice_problem_header().'<hr />';
                 } elsif ($Apache::lonhomework::type eq 'randomizetry') {
                     my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
@@ -2308,8 +2336,8 @@ sub start_library {
 		  '<input type="hidden" name="submitted" value="yes" />';
 	$result.=&problem_web_to_edit_header($rndseed);
         if ($Apache::lonhomework::type eq 'practice') {
-            $result.= '<input type="submit" name="resetdata" '.
-                      'value="'.&mt('New Problem Variation').'" />'.
+            $result.= '<button type="submit" name="resetdata" '.
+                      'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'.
                       &practice_problem_header().'<hr />';
         }
     }
@@ -3261,7 +3289,7 @@ sub end_startouttext {
                  .&Apache::edit::deletelist($target,$token)
                  .'</span></td>'
 	         .'<td><span id="math_'.$areaid.'">';
-	if ($env{'environment.nocodemirror'}) {
+	if (&Apache::loncommon::nocodemirror()) {
 	    $result.=&Apache::lonhtmlcommon::dragmath_button($areaid,1);
 	} else {
 	    $result.='&nbsp;';