'. &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).'
'. @@ -87,7 +89,14 @@ sub handler { 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, + 'author'); # expressed in MB + + # Put out the start of page. + &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota); if (!-d $fn) { if (-e $fn) { @@ -108,24 +117,13 @@ 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; my $numres = 0; - # Retrieving value for "sortby" and "sortorder" from QUERY_STRING - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['sortby','sortorder']); - - # Sort by name as default, not reversed - if (! exists($env{'form.sortby'})) { $env{'form.sortby'} = 'filename' } - if (! exists($env{'form.sortorder'})) { $env{'form.sortorder'} = '' } - - my $sortby = $env{'form.sortby'}; - my $sortorder = $env{'form.sortorder'}; - if ((@files == 0) && ($thisdisfn =~ m{^/$match_domain/$match_username})) { if ($thisdisfn =~ m{^/$match_domain/$match_username$}) { $r->print(''.&mt('This Authoring Space is currently empty.').'
'); @@ -136,43 +134,93 @@ sub handler { return OK; } - # Start off the directory table. - $r->print(&Apache::loncommon::start_data_table() - .&Apache::loncommon::start_data_table_header_row() - .''.&Apache::loncommon::start_data_table()
+ .'
'
+ .&Apache::loncommon::end_page()
+ );
+ return OK;
}
@@ -280,14 +341,16 @@ sub handler {
# - The HTML header
# - The H1/H3 stuff which includes the directory.
#
-# startpage($r, $uame, $udom, $thisdisfn);
+# startpage($r, $uame, $udom, $thisdisfn, $current_disk_usage, $disk_quota);
# $r - The apache request object.
# $uname - User name.
# $udom - Domain name the user is logged in under.
# $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).
sub startpage {
- my ($r, $uname, $udom, $thisdisfn) = @_;
+ my ($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota) = @_;
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -304,12 +367,11 @@ 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 = 1000 * $disk_quota; # convert from MB to kB
+ $disk_quota = 1024 * $disk_quota; # convert from MB to kB
$r->print(&Apache::loncommon::head_subbox(
''
@@ -431,7 +493,7 @@ ENDPUBDIRSCRIPT
}
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',
@@ -462,12 +524,18 @@ sub dircontrols {
go => 'Go',
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',
);
my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript
- $r->print(<printf(<
+
END
@@ -796,6 +914,10 @@ sub putresource {
if ($filename=~/$LONCAPA::assess_re/) {
$editlink=' ('.&mt('EditXML').')';
$editlink2=' 
+
('.&mt('Edit').')'; + if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) { + my $daxeurl = '/adm/daxe/daxe.html?config=config/loncapa_config.xml&file=/daxeopen'.$linkdir.'/'.$filename.'&save=/daxesave'; + $editlink .= ' (Daxe)'; + } } if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) { $editlink.=' ('.&mt('Clean Up').')'; @@ -878,6 +1000,134 @@ sub check_for_versions { return $versions; } +sub prepareJsonTranslations { + my $json = + '{"translations":{'. + '"edit":"'.&mt('Edit').'",'. + '"editxml":"'.&mt('EditXML').'",'. + '"editmeta":"'.&mt('Edit Metadata').'",'. + '"obsolete":"'.&mt('Obsolete').'",'. + '"modified":"'.&mt('Modified').'",'. + '"published":"'.&mt('Published').'",'. + '"unpublished":"'.&mt('Unpublished').'",'. + '"diff":"'.&mt('Diff').'",'. + '"retrieve":"'.&mt('Retrieve').'",'. + '"directory":"'.&mt('Directory').'",'. + '"results":"'.&mt('Show results for keyword:').'"'. + '}}'; +} + +# gathers all files in the working directory except the ones that are already on screen +sub prepareJsonData { + my ($uname, $udom, $pathToSkip) = @_; + my $path = "/home/httpd/html/priv/$udom/$uname/"; + + # maximum number of entries, to limit workload and required storage space + my $entries = 100; + my $firstfile = 1; + my $firstdir = 1; + + my $json = '{"resources":['; + $json .= &prepareJsonData_rec($path, \$entries, \$firstfile, \$firstdir, $pathToSkip); + $json .= ']}'; + + # if the json string is invalid the whole search breaks. + # so we want to make sure that the string is valid in any case. + $json =~ s/,\s*,/,/g; + $json =~ s/\}\s*\{/\},\{/g; + $json =~ s/\}\s*,\s*\]/\}\]/g; + return $json; +} + +# recursive part of json file gathering +sub prepareJsonData_rec { + my ($path, $entries, $firstfile, $firstdir, $pathToSkip) = @_; + my $json; + my $skipThisFolder = $path =~ m/$pathToSkip\/$/?1:0; + + my @dirs; + my @resources; + my @ignored = qw(bak log meta save . ..); + +# Phase 1: Gathering + opendir(DIR,$path); + my @files=sort {uc($a) cmp uc($b)} (readdir(DIR)); + foreach my $filename (@files) { + next if ($filename eq '.DS_Store'); + + # gather all resources + if ($filename !~ /\./) { + # its a folder + push(@dirs, $filename); + } else { + # only push files we dont want to ignore + next if ($skipThisFolder); + + $filename =~ /\.(\w+?)$/; + unless (grep /$1/, @ignored) { + push(@resources, $filename); + } + } + } + closedir(DIR); + # nothing to do here if both lists are empty + return unless ( @dirs || @resources ); + +# Phase 2: Working + $$firstfile = 1; + + foreach (@dirs) { + $json .= '{"name":"'.$_.'",'. + '"path":"'.$path.$_.'",'. + '"title":"",'. + '"status":"",'. + '"cmtime":""},'; + } + + foreach (@resources) { + last if ($$entries < 1); + my $title = &getTitleString($path.$_); + + my $privpath = $path.$_; + my $respath = $privpath; + $respath =~ s/httpd\/html\/priv\//httpd\/html\/res\//; + + my $cmtime = (stat($privpath))[9]; + my $rmtime = (stat($respath))[9]; + + unless ($$firstfile) { $json .= ','; } else { $$firstfile = 0; } + + my $status = 'unpublished'; + + # if a resource is published, the published version (/html/res/filepath) gets its own modification time + # this is newer or equal then the version in your authoring space (/html/priv/filepath) + if ($rmtime >= $cmtime) { + # obsolete + if (&Apache::lonnet::metadata($respath, 'obsolete')) { + $status = 'obsolete'; + }else{ + $status = 'published'; + } + } else { + $status = 'modified'; + } + + $json .= '{"name":"'.$_.'",'. + '"path":"'.$path.'",'. + '"title":"'.$title.'",'. + '"status":"'.$status.'",'. + '"cmtime":"'.&Apache::lonlocal::locallocaltime($cmtime).'"}'; + $$entries--; + } + + foreach(@dirs) { + next if ($$entries < 1); + $json .= ','; + $json .= &prepareJsonData_rec + ($path.$_.'/', $entries, $firstfile, $firstdir, $pathToSkip); + } + return $json; +} 1; __END__