--- loncom/homework/lonhomework.pm	2023/06/04 05:27:28	1.377
+++ loncom/homework/lonhomework.pm	2023/11/07 12:26:00	1.379
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.377 2023/06/04 05:27:28 raeburn Exp $
+# $Id: lonhomework.pm,v 1.379 2023/11/07 12:26:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -942,8 +942,17 @@ sub analyze_header {
     my $js = &Apache::structuretags::setmode_javascript();
 
     # Breadcrumbs
-    my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
-                   'text' => 'Authoring Space'},
+    my $text = 'Authoring Space';
+    my $href = &Apache::loncommon::authorspace($request->uri);
+    if ($env{'request.course.id'}) {
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        if ($href eq "/priv/$cdom/$cnum/") {
+            $text = 'Course Authoring Space';
+        }
+    }
+    my $brcrum = [{'href' => $href,
+                   'text' => $text},
                   {'href' => '',
                    'text' => 'Problem Testing'},
                   {'href' => '',
@@ -1175,8 +1184,17 @@ sub editxmlmode {
             &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
 
     # Breadcrumbs
-    my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
-                   'text' => 'Authoring Space'},
+    my $text = 'Authoring Space';
+    my $href = &Apache::loncommon::authorspace($request->uri);
+    if ($env{'request.course.id'}) {
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        if ($href eq "/priv/$cdom/$cnum/") {
+            $text = 'Course Authoring Space';
+        }
+    }
+    my $brcrum = [{'href' => $href,
+                   'text' => $text},
                   {'href' => '',
                    'text' => 'Problem Editing'}];
 
@@ -1209,7 +1227,8 @@ sub editxmlmode {
 
     $result .= '<ol class="LC_primary_menu" style="display:inline-block;font-size:90%;vertical-align:middle;">';
 
-    unless ($env{'environment.nocodemirror'}) {
+    my $nocodemirror = &Apache::loncommon::nocodemirror();
+    unless ($nocodemirror) {
         # dropdown menus
         $result .= Apache::lonmenu::create_submenu("#", "",
             &mt("Problem Templates"), template_dropdown_datastructure());
@@ -1241,7 +1260,7 @@ sub editxmlmode {
         '</textarea> <div id="LC_aftertextarea"> </div> </form>';
 
     my $resource = $env{'request.ambiguous'};
-    unless($env{'environment.nocodemirror'}){
+    unless ($nocodemirror) {
         $result .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined-xml.css">
         <script src="/adm/codemirror/codemirror-compressed-xml.js"></script>
         <script>
@@ -1524,8 +1543,17 @@ sub newproblem {
 	my $url=&HTML::Entities::encode($request->uri,'<>&"');
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	my $instructions;
-        my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
-                       'text' => 'Authoring Space'},
+        my $text = 'Authoring Space';
+        my $href = &Apache::loncommon::authorspace($request->uri);
+        if ($env{'request.course.id'}) {
+            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            if ($href eq "/priv/$cdom/$cnum/") {
+                $text = 'Course Authoring Space';
+            }
+        }
+        my $brcrum = [{'href' => $href,
+                       'text' => $text},
                       {'href' => '',
                        'text' => "Create New $extension"}];
 	my $start_page =