--- loncom/publisher/lonpubdir.pm	2016/06/10 22:31:34	1.168
+++ loncom/publisher/lonpubdir.pm	2016/06/19 04:27:58	1.169
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Authoring Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.168 2016/06/10 22:31:34 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.169 2016/06/19 04:27:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,21 +82,33 @@ sub handler {
         }
     }
     $thisdisfn=~s/^\Q$docroot\E\/priv//;
-    
+
     my $resdir=$docroot.'/res'.$thisdisfn; # Resource directory
     my $targetdir='/res'.$thisdisfn; # Publication target directory.
     my $linkdir='/priv'.$thisdisfn;      # Full URL name of constr space.
 
+    my $cstr = 'author';
+    my ($crsauthor,$crstype);
+    if ($env{'request.course.id'}) {
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        if ($thisdisfn =~ m{^/\Q$cdom/$cnum\E}) {
+            $crsauthor = 1;
+            $cstr = 'course';
+            $crstype = &Apache::loncommon::course_type();
+        }
+    }
+
     my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
 
     my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
     my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,
                                 "$londocroot/priv/$udom/$uname"); # expressed in kB
     my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,
-                                'author'); # expressed in MB
+                                                 $cstr,$crstype); # expressed in MB
 
     # Put out the start of page.
-    &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota); 
+    &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor); 
 
     if (!-d $fn) {
         if (-e $fn) {
@@ -348,19 +360,27 @@ my $result = "<script type=\"text/javasc
 #      $thisdisfn - Displayable version of the filename.
 #      $current_disk_usage - User's current disk usage (in kB).
 #      $disk_quota - Disk quota for user's authoring space (in MB).
+#      $crstype - Course type, if this is for "course author"
 
 sub startpage {
-    my ($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota) = @_;
+    my ($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor) = @_;
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
     my $formaction='/priv'.$thisdisfn.'/';
     $formaction=~s|/+|/|g;
-    &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
+
+    my $title;
+    if ($crsauthor) {
+        $title = 'Course Authoring';
+    } else {
+        $title = 'Authoring Space';
+        &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
+    }
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({
-        'text'  => 'Authoring Space',
+        'text'  => $title,
         'href'  => &Apache::loncommon::authorspace($formaction),
     });
     # breadcrumbs (and tools) will be created 
@@ -369,7 +389,7 @@ sub startpage {
     $env{'request.noversionuri'}=$formaction;
     my $js = '<script type="text/javascript" 
                 src="/res/adm/includes/file_upload.js"></script>';
-    $r->print(&Apache::loncommon::start_page('Authoring Space', $js));
+    $r->print(&Apache::loncommon::start_page($title, $js));
 
     $disk_quota = 1024 * $disk_quota; # convert from MB to kB
 
@@ -381,7 +401,7 @@ sub startpage {
                     .&Apache::loncommon::CSTR_pageheader()));
 
     my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
-    my $doctitle = 'LON-CAPA '.&mt('Authoring Space');
+    my $doctitle = 'LON-CAPA '.&mt($title);
     my $newname = &mt('New Name');
     my $pubdirscript=(<<ENDPUBDIRSCRIPT);
 <script type="text/javascript">
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 root@localhost to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>
