--- loncom/publisher/lonpubdir.pm 2015/01/19 15:36:11 1.163
+++ loncom/publisher/lonpubdir.pm 2023/06/10 23:55:41 1.176
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Authoring Space Directory Lister
#
-# $Id: lonpubdir.pm,v 1.163 2015/01/19 15:36:11 goltermann Exp $
+# $Id: lonpubdir.pm,v 1.176 2023/06/10 23:55:41 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -80,14 +80,38 @@ 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);
- &startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page.
+ 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,
+ $cstr,$crstype); # expressed in MB
+ my $diraction;
+ if (-d $fn) {
+ $diraction = &diractions($thisdisfn);
+ }
+
+ # Put out the start of page.
+
+ &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor, $diraction);
if (!-d $fn) {
if (-e $fn) {
@@ -108,8 +132,8 @@ sub handler {
return OK;
}
- &dircontrols($r,$uname,$udom,$thisdisfn); # Put out actions for directory,
- # browse/upload + new file page.
+ # Put out actions for directory, browse/upload + new file page.
+ &dircontrols($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota);
&resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc.
my $numdir = 0;
@@ -332,45 +356,56 @@ my $result = "';
+ $r->print(&Apache::loncommon::start_page($title, $js));
- my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
- my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,"$londocroot/priv/$udom/$uname");
- my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,'author'); #expressed in MB
- $disk_quota = 1000 * $disk_quota; # convert from MB to kB
+ $disk_quota = 1024 * $disk_quota; # convert from MB to kB
+ my $heading = &mt('Directory');
$r->print(&Apache::loncommon::head_subbox(
''
- .&Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota)
+ .&Apache::lonhtmlcommon::display_usage($current_disk_usage,
+ $disk_quota,'authoring')
.'
'
- .&Apache::loncommon::CSTR_pageheader()));
+ .&Apache::loncommon::CSTR_pageheader('','',$heading,$diraction)));
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=(<
@@ -482,20 +517,52 @@ ENDPUBDIRSCRIPT
$r->print($pubdirscript);
}
+sub diractions {
+ my ($thisdisfn) = @_;
+ my %lt=&Apache::lonlocal::texthash(
+ acti => 'Actions for current directory',
+ sela => 'Select Action',
+ pubd => 'Publish this Directory',
+ prnt => 'Print contents of directory',
+ edit => 'Edit Metadata',
+ dedr => 'Delete Directory',
+ );
+ return <
+$lt{'acti'}
+
+
+
+
+END
+
+}
+
sub dircontrols {
- my ($r,$uname,$udom,$thisdisfn) = @_;
+ my ($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota) = @_;
my %lt=&Apache::lonlocal::texthash(
cnpd => 'Cannot publish directory',
cnrd => 'Cannot retrieve directory',
mcdi => 'Must create new subdirectory inside a directory',
pubr => 'Publish this Resource',
- pubd => 'Publish this Directory',
- dedr => 'Delete Directory',
rtrv => 'Retrieve Old Version',
list => 'List Directory',
uplo => 'Upload file',
dele => 'Delete',
- edit => 'Edit Metadata',
sela => 'Select Action',
nfil => 'New file',
nhtm => 'New HTML file',
@@ -512,54 +579,54 @@ sub dircontrols {
copy => 'Copy current file to',
type => 'Type Name Here',
go => 'Go',
- prnt => 'Print contents of directory',
- crea => 'Create a new directory or LON-CAPA document',
- qs => 'Quick Search',
+ crea => 'Create a new subdirectory or document',
+ qs => 'Quick name search',
cs => 'Case Sensitive',
re => 'Regular Expression',
- acti => 'Actions for current directory',
updc => 'Upload a new document',
pick => 'Please select an action to perform using the new filename',
+ shcu => 'Shortcuts',
);
+ my %js_lt = &Apache::lonlocal::texthash(
+ nanf => 'Name of New File',
+ nans => 'Name of New Subdirectory',
+ psfn => 'Please specify file name',
+ );
+ &js_escape(\%js_lt);
my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript
+ # Calculate free space in bytes.
+ # $disk_quota is in MB and $current_disk_usage is in kB
+ my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage);
$r->printf(<
-
END
}
@@ -647,26 +712,26 @@ END
sub resourceactions {
my ($r,$uname,$udom,$thisdisfn) = @_;
$r->print(<
+
-
-
-
-
-
END
@@ -744,7 +809,7 @@ sub putdirectory {
} else {
$actionitem =
'