--- loncom/xml/lonxml.pm	2024/03/31 01:50:18	1.569
+++ loncom/xml/lonxml.pm	2024/04/14 17:12:28	1.570
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.569 2024/03/31 01:50:18 raeburn Exp $
+# $Id: lonxml.pm,v 1.570 2024/04/14 17:12:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1702,14 +1702,60 @@ ENDSCRIPT
 }
 
 sub seteditor_javascript {
+    my ($is_course_doc,$is_supp,$supp_path,$supp_title) = @_;
+    my $symb;
+    if ($is_course_doc) {
+        if (!$is_supp) {
+            ($symb) = &Apache::lonnet::whichuser();
+            if ($symb) {
+                $symb = &escape($symb);
+            }
+        }
+    }
     return <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
 function seteditmode(form,editor) {
+    var querystr = '';
+    var supplemental = '$is_supp';
+    var coursedoc = '$is_course_doc';
+    if (coursedoc)  {
+        if (supplemental) {
+            var supppath = '$supp_path';
+            var supptitle = '$supp_title';
+            if (supppath) {
+                querystr = 'folderpath='+supppath;
+            }
+            if (supptitle) {
+                if (querystr) {
+                    querystr += '&';
+                }
+                querystr += 'title='+supptitle;
+            }
+        }
+    }
     if (editor == 'daxe') {
         var url = new URL(document.location.href);
-        window.location = url.protocol+'//'+url.hostname+'/daxepage'+url.pathname;
+        var newloc = url.protocol+'//'+url.hostname+'/daxepage'+url.pathname;
+        if (querystr) {
+            if (/\\?/.test(url.pathname)) {
+                newloc += '&';
+            } else {
+                newloc += '?';
+            }
+            newloc += querystr;
+        }
+        window.location = newloc;
     } else {
+        if (coursedoc) {
+            form.action += '?forceedit=1';
+            if (!supplemental) {
+                form.action += '&register=1';
+            }
+            if (querystr) {
+                form.action += '&'+querystr;
+            }
+        }
         if (editor == 'edit') {
             form.editmode.value = editor;
         } else {
@@ -1961,6 +2007,10 @@ ENDNOTFOUND
                     if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/supplemental/\E}) {
                         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                                                 ['folderpath','title']);
+                        if (($env{'request.state'} eq 'edit') && ($env{'form.editmode'} eq 'edit') &&
+                            ($filetype eq 'html')) {
+                            &Apache::lonhtmlcommon::clear_breadcrumbs();
+                        }
                     } elsif ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E(.+)$}) {
                         my $filename = $1;
                         if ($1 eq 'loncapa.html') {
@@ -2058,6 +2108,7 @@ sub get_courseupload_hierarchy {
             }
             if ($title) {
                 push(@pathitems,&unescape($title));
+                $itemtitle = $title;
             }
             $displaypath = join(' &raquo; ',@pathitems);
         } else {