'.
'
'.
&mt('Your Authoring Space is currently in the location used by LON-CAPA version 2.10 and older, but your domain is using a newer LON-CAPA version ([_1]).',$version).'
'.
@@ -80,7 +82,7 @@ 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.
@@ -91,10 +93,10 @@ sub handler {
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
+ 'author'); # 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);
if (!-d $fn) {
if (-e $fn) {
@@ -199,7 +201,15 @@ sub handler {
.$columns{$key}{text}.$arrows[$idx].'' :
'
'.$columns{$key}{text}.' | ');
}
- $r->print(&Apache::loncommon::start_data_table()
+
+my $result = "";
+ $r->print($result);
+
+ $r->print('
'.&Apache::loncommon::start_data_table()
+ .'
|
|---|
'
.&Apache::loncommon::start_data_table_header_row() . $output
.&Apache::loncommon::end_data_table_header_row()
);
@@ -290,7 +300,6 @@ sub handler {
}
# Print the sorted resources
- my %editors = &Apache::loncommon::permitted_editors();
foreach my $filename (@sorted_files) {
if ($filehash->{$filename}->{"cmode"}&$dirptr) { # Directories
&putdirectory($r, $thisdisfn, $linkdir, $filename,
@@ -303,15 +312,27 @@ sub handler {
$filehash->{$filename}->{"linkfilename"},
$filehash->{$filename}->{"fulltitle"},
$filehash->{$filename}->{"status"},
- $filehash->{$filename}->{"pubstatus"},
- \%editors);
+ $filehash->{$filename}->{"pubstatus"});
}
}
- $r->print( &Apache::loncommon::end_data_table()
- .&Apache::loncommon::end_page() );
-
- return OK;
+ $r->print(&Apache::loncommon::end_data_table()
+ .''
+ .&Apache::loncommon::start_data_table()
+ .'
| '.&mt('Results in other directories:').' |
|---|
'
+ .''
+ .&Apache::loncommon::end_data_table()
+ .''
+ .&Apache::loncommon::end_page()
+ );
+ return OK;
}
@@ -327,7 +348,6 @@ sub handler {
# $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) = @_;
@@ -347,21 +367,18 @@ sub startpage {
# in start_page->bodytag->innerregister
$env{'request.noversionuri'}=$formaction;
- $r->print(&Apache::loncommon::start_page('Authoring Space'));
+ my $js = '';
+ $r->print(&Apache::loncommon::start_page('Authoring Space', $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 = 1024 * $disk_quota; # convert from MB to kB
- my $headertext = &mt('Directory');
-
$r->print(&Apache::loncommon::head_subbox(
'
'
.&Apache::lonhtmlcommon::display_usage($current_disk_usage,
$disk_quota,'authoring')
.'
'
- .&Apache::loncommon::CSTR_pageheader('','',$headertext)));
+ .&Apache::loncommon::CSTR_pageheader()));
my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
my $doctitle = 'LON-CAPA '.&mt('Authoring Space');
@@ -375,6 +392,25 @@ parent.lastknownpriv='/priv$esc_thisdisf
// Confirmation dialogues
+ function currdiract(theform) {
+ if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publish') {
+ document.publishdir.filename.value = theform.filename.value;
+ document.publishdir.submit();
+ }
+ if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editmeta') {
+ top.location=theform.filename.value+'default.meta'
+ }
+ if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'printdir' ) {
+ document.printdir.postdata.value=theform.filename.value
+ document.printdir.submit();
+ }
+ if (theform.dirtask.options[theform.dirtask.selectedIndex].value == "delete") {
+ var delform = document.delresource
+ delform.filename.value = theform.filename.value
+ delform.submit()
+ }
+ }
+
function checkUpload(theform) {
if (theform.file == '') {
alert("Please use 'Browse..' to choose a file first, before uploading")
@@ -458,16 +494,19 @@ ENDPUBDIRSCRIPT
}
sub dircontrols {
- my ($r,$uname,$udom,$thisdisfn,$current_disk_usage,$disk_quota) = @_;
+ 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',
@@ -484,58 +523,62 @@ sub dircontrols {
copy => 'Copy current file to',
type => 'Type Name Here',
go => 'Go',
- crea => 'Create a new subdirectory or document',
+ prnt => 'Print contents of directory',
+ crea => 'Create a new directory or LON-CAPA document',
+ qs => 'Quick 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->print("\n".'
'."\n");
- my %fileoptions = (
- none => "$lt{'sela'}:",
- newfile => "$lt{'nfil'}:",
- newhtmlfile => "$lt{'nhtm'}:",
- newproblemfile => "$lt{'nprb'}:",
- newdir => "$lt{'nsub'}:",
- newpagefile => "$lt{'npag'}:",
- newsequencefile => "$lt{'nseq'}:",
- newrightsfile => "$lt{'ncrf'}:",
- newstyfile => "$lt{'nsty'}:",
- newtaskfile => "$lt{'nbt'}:",
- newlibraryfile => "$lt{'nlib'}:",
- );
- $fileoptions{'select_form_order'} = ['none','newfile','newhtmlfile','newproblemfile',
- 'newpagefile','newsequencefile','newrightsfile',
- 'newstyfile','newtaskfile','newlibraryfile','newdir'];
- my $selectbox = &Apache::loncommon::select_form('none','action',\%fileoptions);
- $r->print(<
-
END
}
@@ -605,26 +662,26 @@ END
sub resourceactions {
my ($r,$uname,$udom,$thisdisfn) = @_;
$r->print(<
+
-
-
-
-
-
END
@@ -702,7 +759,7 @@ sub putdirectory {
} else {
$actionitem =
'