--- loncom/xml/lonxml.pm	2023/12/29 23:40:37	1.531.2.24.2.1
+++ loncom/xml/lonxml.pm	2024/07/07 21:43:24	1.531.2.26
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.531.2.24.2.1 2023/12/29 23:40:37 raeburn Exp $
+# $Id: lonxml.pm,v 1.531.2.26 2024/07/07 21:43:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1633,6 +1633,21 @@ sub renderingoptions {
     return $output;
 }
 
+sub setmode_javascript {
+    return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function setmode(form,probmode) {
+    var initial = form.problemmode.value;
+    form.problemmode.value = probmode;
+    form.submit();
+    form.problemmode.value = initial;
+}
+// ]]>
+</script>
+ENDSCRIPT
+}
+
 sub inserteditinfo {
       my ($filecontents,$filetype,$filename,$symb,$itemtitle,$folderpath,$uri,$action) = @_;
       $filecontents = &HTML::Entities::encode($filecontents,'<>&"');
@@ -1717,7 +1732,7 @@ FULLPAGE
       if ($filetype eq 'html') {
           $htmlerror=&verify_html($filecontents);
           if ($htmlerror) {
-              $htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
+              $htmlerror=('&nbsp;'x3).' <span class="LC_error">'.$htmlerror.'</span>';
           }
           if (&Apache::lonhtmlcommon::htmlareabrowser()) {
               unless ($textareaclass) {
@@ -1726,15 +1741,15 @@ FULLPAGE
           }
       }
       my ($undo,%onclick);
-      foreach my $item ('discard','undo','daxe') {
+      foreach my $item ('discard','undo') {
           $onclick{$item} = 'onclick="still_ask=true;setmode(this.form,'."'$item'".')"';
       }
       foreach my $item ('saveedit','saveview') {
           $onclick{$item} = 'onclick="is_submit=true;setmode(this.form,'."'$item'".')"';
       }
       unless ($uri =~ m{^/uploaded/}) {
-          $undo = '<input type="button" name="Undo" accesskey="u" value="'.$lt{'un'}.'" '.
-                  $onclick{'undo'}.' />'."\n";
+          $undo = '<input type="submit" name="Undo" accesskey="u" value="'.$lt{'un'}.'" '.
+                  $onclick{'undo'}.' />'."\n"; 
       }
       $initialize .= &setmode_javascript();
       my $editfooter=(<<ENDFOOTER);
@@ -1755,7 +1770,7 @@ $initialize
     </div>
     <div>
       <input type="button" name="discardview" accesskey="d" value="$lt{'dv'}" $onclick{'discard'} />
-      $undo $htmlerror $deps_button $dragmath_button
+      $undo $deps_button $dragmath_button $htmlerror
     </div>
   </div>
   <textarea $textarea_events style="width:100%" cols="80" rows="44" name="filecont" id="filecont" $textareaclass>$filecontents</textarea><br />$spelllink
@@ -1768,34 +1783,6 @@ ENDFOOTER
       return ($editfooter,$add_to_onload,$add_to_onresize);
 }
 
-sub setmode_javascript {
-    return <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
-function setmode(form,probmode) {
-    var initial = form.problemmode.value;
-    form.problemmode.value = probmode;
-    form.submit();
-    form.problemmode.value = initial;
-}
-// ]]>
-</script>
-ENDSCRIPT
-}
-
-sub seteditor_javascript {
-    return <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
-function seteditmode(form,editor) {
-    form.editmode.value = editor;
-    form.submit();
-}
-// ]]>
-</script>
-ENDSCRIPT
-}
-
 sub get_target {
   my $viewgrades=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
   if ( $env{'request.state'} eq 'published') {
@@ -1945,7 +1932,7 @@ ENDNOTFOUND
             &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 						    ['editmode']);
 	}
-	if ((!$env{'form.editmode'}) ||
+        if ((!$env{'form.editmode'}) ||
             ($env{'form.problemmode'} eq 'saveview') ||
             ($env{'form.problemmode'} eq 'discard')) {
             if ($filetype eq 'html' || $filetype eq 'sty') {
@@ -2015,7 +2002,7 @@ ENDNOTFOUND
 # Edit action? Insert editing commands
 #
     unless (($env{'request.state'} eq 'published') || ($inhibit_menu)) {
-	if (($env{'form.editmode'}) &&
+        if (($env{'form.editmode'}) &&
             (!($env{'form.problemmode'} eq 'saveview')) &&
             (!($env{'form.problemmode'} eq 'discard'))) {
             my ($displayfile,$url,$symb,$itemtitle,$action);