--- loncom/publisher/lonpubdir.pm 2024/08/18 22:25:36 1.160.2.5.2.4
+++ loncom/publisher/lonpubdir.pm 2015/06/18 20:19:27 1.164
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Authoring Space Directory Lister
#
-# $Id: lonpubdir.pm,v 1.160.2.5.2.4 2024/08/18 22:25:36 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.164 2015/06/18 20:19:27 musolffc Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -67,7 +67,9 @@ sub handler {
$r->send_http_header;
&Apache::lonhtmlcommon::clear_breadcrumbs();
- $r->print(&Apache::loncommon::start_page('Authoring Space').
+ my $js = '<script type="text/javascript"
+ src="/res/adm/includes/file_upload.js"></script>';
+ $r->print(&Apache::loncommon::start_page('Authoring Space', $js).
'<div class="LC_error">'.
'<br /><p>'.
&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).'</p>'.
@@ -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].'</a></th>' :
'<th>'.$columns{$key}{text}.'</th>');
}
- $r->print(&Apache::loncommon::start_data_table()
+
+my $result = "<script type=\"text/javascript\">
+ sessionStorage.setItem('CSTRcache','".&prepareJsonData($uname,$udom,$thisdisfn)."');
+ localStorage.setItem('CSTRtrans', '".&prepareJsonTranslations()."');
+</script>";
+ $r->print($result);
+
+ $r->print('<div id="currentFolder">'.&Apache::loncommon::start_data_table()
+ .'<tr><th colspan="8" id="searchtitle" style="display:none"></th></tr>'
.&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()
+ .'</div><div id="otherplaces" style="display:none">'
+ .&Apache::loncommon::start_data_table()
+ .'<tr><th colspan="7">'.&mt('Results in other directories:').'</th></tr>'
+ .'<tr class="LC_header_row" id="otherplacestable">'
+ .'<th>'.&mt('Type').'</th>'
+ .'<th>'.&mt('Directory').'</th>'
+ .'<th>'.&mt('Name').'</th>'
+ .'<th>'.&mt('Title').'</th>'
+ .'<th colspan="2">'.&mt('Status').'</th>'
+ .'<th>'.&mt('Last Modified').'</th>'
+ .'</tr>'
+ .&Apache::loncommon::end_data_table()
+ .'</div>'
+ .&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,17 +367,15 @@ sub startpage {
# in start_page->bodytag->innerregister
$env{'request.noversionuri'}=$formaction;
- $r->print(&Apache::loncommon::start_page('Authoring Space'));
+ my $js = '<script type="text/javascript"
+ src="/res/adm/includes/file_upload.js"></script>';
+ $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
$r->print(&Apache::loncommon::head_subbox(
'<div style="float:right;padding-top:0;margin-top;0">'
- .&Apache::lonhtmlcommon::display_usage($current_disk_usage,
- $disk_quota,'authoring')
+ .&Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota)
.'</div>'
.&Apache::loncommon::CSTR_pageheader()));
@@ -506,22 +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',
- 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(<<END);
+ $r->printf(<<END,&Apache::loncommon::help_open_topic('Quicksearch'));
<div class="LC_columnSection">
<div>
<form name="curractions" method="post" action="">
@@ -537,29 +551,29 @@ sub dircontrols {
<input type="hidden" name="filename" value="/priv$thisdisfn/" />
</fieldset>
</form>
- <form name="publishdir" method="post" action="/adm/publish">
+ <form name="publishdir" method="post" action="/adm/publish" target="_parent">
<input type="hidden" name="pubrec" value="" />
<input type="hidden" name="filename" value="" />
</form>
- <form name="printdir" method="post" action="/adm/printout">
+ <form name="printdir" method="post" action="/adm/printout" target="_parent">
<input type="hidden" name="postdata" value="" />
</form>
</div>
- <div style="padding-bottom: 2px">
- <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload">
+ <div>
+ <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
<fieldset>
<legend>$lt{'updc'}</legend>
<input type="hidden" name="filename" value="/priv$thisdisfn/" />
- <input type="file" name="upfile" class="LC_flUpload" />
- <input type="hidden" id="LC_free_space" value="$free_space" />
+ <input type="file" name="upfile" class="flUpload testclass" size="20" />
+ <input type="hidden" id="free_space" value=$free_space />
<input type="button" value="$lt{'uplo'}" onclick="checkUpload(this.form)" />
</fieldset>
</form>
</div>
<div>
- <form name="fileaction" method="post" action="/adm/cfile">
+ <form name="fileaction" method="post" action="/adm/cfile" target="_parent">
<fieldset>
<legend>$lt{'crea'}</legend>
<span class="LC_nobreak">
@@ -586,57 +600,59 @@ sub dircontrols {
<option value="newtaskfile">$lt{'nbt'}:</option>
<option value="newlibraryfile">$lt{'nlib'}:</option>
<option value="newdir">$lt{'nsub'}:</option>
- </select> <input type="text" id="newnameid" name="newfilename" placeholder="$lt{'type'}" value="" onfocus="if (this.value == is.empty()) this.value=''" /> <input type="button" value="Go" onclick="validate_go();" />
- <br />
- <span>$lt{'shcu'}:
+ </select> <input type="text" name="newfilename" placeholder="$lt{'type'}" value="" onfocus="if (this.value == is.empty()) this.value=''" /> <input type="button" value="Go" onclick="validate_go();" />
+ <br />
+ <span>Quickactions:
<input type="hidden" name="mode"/>
<a href="javascript:void(0)" onclick="javascript:validate_action('blank')">
- <img src="/adm/lonIcons/unknown.gif" title="Create blank problem file"></a>
- <a href="javascript:void(0)" onclick="javascript:validate_action('problemtempl')">
+ <img src="/adm/lonIcons/unknown.gif" title="Create blank problem file"></a>
+ <a href="javascript:void(0)" onclick="javascript:validate_action('problemtempl')">
<img src="/adm/lonIcons/problem.gif" title="Create new problem from template"></a>
- <a href="javascript:void(0)" onclick="javascript:validate_action('blankhtml')">
+ <a href="javascript:void(0)" onclick="javascript:validate_action('blankhtml')">
<img src="/adm/lonIcons/html.gif" title="Create new blank HTML file"></a>
- <a href="javascript:void(0)" onclick="javascript:validate_action('folder')">
- <img src="/adm/lonIcons/navmap.folder.closed.gif" title="Create new subdirectory"></a>
+ <a href="javascript:void(0)" onclick="javascript:validate_action('folder')">
+ <img src="/adm/lonIcons/navmap.folder.closed.gif" title="Create new subdirectory"></a>
</span>
<script type="text/javascript">
function validate_action(action){
- if (document.getElementById('newnameid')) {
- if (document.getElementById('newnameid').value == '') {
- var newname;
- var prompttext = "$js_lt{'nanf'}";
- if (action == 'folder') {
- prompttext = "$js_lt{'nans'}";
- }
- newname=prompt(prompttext);
- if (newname != '') {
- document.getElementById('newnameid').value = newname;
- }
- }
- if (document.getElementById('newnameid').value != '') {
- if (action == 'blank') {
- document.fileaction.action.value='newproblemfile';
- document.fileaction.mode.value='blank';
- } else if (action == 'problemtempl') {
- document.fileaction.action.value='newproblemfile';
- validate_go();
- } else if (action == 'blankhtml') {
- document.fileaction.action.value='newhtmlfile';
- validate_go();
- } else if (action == 'folder') {
- document.fileaction.action.value='newdir';
- document.fileaction.mode.value='folder';
- }
- fileaction.submit();
- } else {
- alert("$js_lt{'psfn'}");
+
+ if (document.getElementsByName(\'newfilename\')[0].value != \'\'){
+ if (action == "blank") {
+ document.fileaction.action.value=\'newproblemfile\';
+ document.fileaction.mode.value=\'blank\';
+ } else if (action == "problemtempl") {
+ document.fileaction.action.value=\'newproblemfile\';
+ validate_go();
+ } else if (action == "blankhtml") {
+ document.fileaction.action.value=\'newhtmlfile\';
+ validate_go();
+ } else if (action == "folder") {
+ document.fileaction.action.value=\'newdir\';
+ document.fileaction.mode.value=\'folder\';
}
+ fileaction.submit();
+ } else {
+ alert(\'Please specify file name.\');
+ // TODO: ask for filename? if so, do some refactoring
+
}
}
</script>
</span>
</fieldset>
</form>
+ </div>
+ <div>
+ <fieldset style="display:inline">
+ <legend>$lt{'qs'}</legend>
+ <script type="text/javascript" src="/adm/quicksearch/quicksearch.js"></script>
+ <input type="text" id="quickfilter" placeholder="Enter search term" onkeyup="applyFilter()"/>
+ <input type="button" value="Clear" onclick="document.getElementById(\'quickfilter\').value=\'\'; applyFilter()" />
+ %s
+ <br />
+ <label><input type="checkbox" id="casesens" onchange="applyFilter()"/>$lt{'cs'} </label>
+ <label><input type="checkbox" id="regex" onchange="applyFilter()"/>$lt{'re'} </label>
+ </fieldset>
</div>
</div>
END
@@ -645,26 +661,26 @@ END
sub resourceactions {
my ($r,$uname,$udom,$thisdisfn) = @_;
$r->print(<<END);
- <form name="moveresource" action="/adm/cfile" method="post">
+ <form name="moveresource" action="/adm/cfile" target="_parent" method="post">
<input type="hidden" name="filename" value="" />
<input type="hidden" name="newfilename" value="" />
<input type="hidden" name="action" value="" />
</form>
- <form name="delresource" action="/adm/cfile" method="post">
+ <form name="delresource" action="/adm/cfile" target="_parent" method="post">
<input type="hidden" name="filename" value="" />
<input type="hidden" name="action" value="delete" />
</form>
- <form name="pubresource" action="/adm/publish" method="post">
+ <form name="pubresource" action="/adm/publish" target="_parent" method="post">
<input type="hidden" name="filename" value="" />
<input type="hidden" name="makeobsolete" value="0" />
</form>
- <form name="printresource" action="/adm/printout" method="post">
+ <form name="printresource" action="/adm/printout" target="_parent" method="post">
<input type="hidden" name="postdata" value="" />
</form>
- <form name="retrieveres" action="/adm/retrieve" method="post">
+ <form name="retrieveres" action="/adm/retrieve" target="_parent" method="post">
<input type="hidden" name="filename" value="" />
</form>
- <form name="cleanup" action="/adm/cleanup" method="post">
+ <form name="cleanup" action="/adm/cleanup" target="_parent" method="post">
<input type="hidden" name="filename" value="" />
</form>
END
@@ -742,7 +758,7 @@ sub putdirectory {
} else {
$actionitem =
'<form name="dirselect_'.$$numdir.
- '" action="/adm/publish">'.
+ '" action="/adm/publish" target="_parent">'.
'<select name="diraction" onchange="SetPubDir(this.form,document)">'.
'<option selected="selected">'.&mt('Select action').'</option>'.
'<option value="open">'.&mt('Open').'</option>'.
@@ -761,7 +777,7 @@ sub putdirectory {
'<td><img src="'.
$Apache::lonnet::perlvar{'lonIconsURL'}.'/navmap.folder.closed.gif" alt="folder" /></td>'.
'<td>'.$actionitem.'</td>'.
- '<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/">'.
+ '<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" target="_parent">'.
$disfilename.'</a></span></td>'.
'<td colspan="3">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($targetdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});
if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {
@@ -887,34 +903,23 @@ sub getStatus {
sub putresource {
my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir,
$linkdir, $cmtime, $size, $numres, $linkfilename, $title,
- $status, $pubstatus, $editors) = @_;
+ $status, $pubstatus) = @_;
&Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
my $editlink='';
my $editlink2='';
- if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty|txt|css|js)$/) {
+ if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) {
$editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=edit">'.&mt('Edit').'</a>)';
}
if ($filename=~/$LONCAPA::assess_re/) {
- if ($editors->{'xml'}) {
- $editlink=' (<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=editxml">'.&mt('EditXML').'</a>)';
- }
- if ($editors->{'edit'}) {
- $editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=edit">'.&mt('Edit').'</a>)';
- }
- }
- if ($filename=~/\.(xml|html|htm|xhtml|xhtm)$/ || $filename=~/$LONCAPA::assess_re/) {
- if (($editors->{'daxe'}) &&
- ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9)) {
- my $daxeurl = '/daxepage'.$linkdir.'/'.$filename;
- $editlink .= ' (<a href="'.$daxeurl.'">Daxe</a>)';
- }
+ $editlink=' (<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=editxml">'.&mt('EditXML').'</a>)';
+ $editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=edit">'.&mt('Edit').'</a>)';
}
if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) {
- $editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'">'.&mt('Clean Up').')</a>';
+ $editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'" target="_parent">'.&mt('Clean Up').')</a>';
}
if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
- $editlink=' (<a href="/adm/cfile?decompress='.$linkfilename.'">'.&mt('Decompress').'</a>)';
+ $editlink=' (<a target="_parent" href="/adm/cfile?decompress='.$linkfilename.'">'.&mt('Decompress').'</a>)';
}
my $publish_button = (-e $resdir.'/'.$filename) ? &mt('Re-publish') : &mt('Publish');
my $pub_select = '';
@@ -924,7 +929,7 @@ sub putresource {
'<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.
'<td>'.$pub_select.'</td>'.
'<td><span class="LC_filename">'.
- '<a href="'.$linkdir.'/'.$filename.'">'.
+ '<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.
$filename.'</a></span>'.$editlink2.$editlink.
'</td>'.
'<td>'.$title.'</td>'.
@@ -991,6 +996,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__