--- loncom/publisher/lonpubdir.pm 2014/04/21 21:26:41 1.152
+++ loncom/publisher/lonpubdir.pm 2023/07/13 21:41:40 1.179
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Authoring Space Directory Lister
#
-# $Id: lonpubdir.pm,v 1.152 2014/04/21 21:26:41 musolffc Exp $
+# $Id: lonpubdir.pm,v 1.179 2023/07/13 21:41:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,7 +40,7 @@ use Apache::lonlocal;
use Apache::lonmsg;
use Apache::lonmenu;
use Apache::lonnet;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
sub handler {
@@ -48,10 +48,7 @@ sub handler {
# Validate access to the construction space and get username:domain.
- my $uname;
- my $udom;
-
- ($uname,$udom)=&Apache::lonnet::constructaccess($r->uri);
+ my ($uname,$udom)=&Apache::lonnet::constructaccess($r->uri);
unless (($uname) && ($udom)) {
return HTTP_NOT_ACCEPTABLE;
}
@@ -63,22 +60,90 @@ sub handler {
my $thisdisfn=$fn;
my $docroot=$r->dir_config('lonDocRoot'); # Apache londocument root.
+ if ($thisdisfn eq "$docroot/priv/$udom") {
+ if ((-d "/home/$uname/public_html/") && (!-e "$docroot/priv/$udom/$uname")) {
+ my ($version) = ($r->dir_config('lonVersion') =~ /^\'?(\d+\.\d+)\./);
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ $r->print(&Apache::loncommon::start_page('Authoring Space').
+ '<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>'.
+ '<p>'.
+ &mt('Please ask your Domain Coordinator to move your Authoring Space to the new location.').
+ '</p>'.
+ '</div>'.
+ &Apache::loncommon::end_page());
+ return OK;
+ }
+ }
$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.
- &dircontrols($r,$uname,$udom,$thisdisfn); # Put out actions for directory,
- # browse/upload + new file 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
+ # Put out the start of page.
+
+ &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor);
+
+ if (!-d $fn) {
+ if (-e $fn) {
+ $r->print('<p class="LC_info">'.&mt('Requested item is a file not a directory.').'</p>');
+ } else {
+ $r->print('<p class="LC_info">'.&mt('The requested subdirectory does not exist.').'</p>');
+ }
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+ my @files;
+ if (opendir(DIR,$fn)) {
+ @files = grep(!/^\.+$/,readdir(DIR));
+ closedir(DIR);
+ } else {
+ $r->print('<p class="LC_error">'.&mt('Could not open directory.').'</p>');
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+
+ # Put out actions for directory, browse/upload + new file page.
+ &dircontrols($r,$uname,$udom,$thisdisfn,$current_disk_usage,$disk_quota,$crsauthor);
&resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc.
my $numdir = 0;
my $numres = 0;
+ if ((@files == 0) && ($thisdisfn =~ m{^/$match_domain/$match_username})) {
+ if ($thisdisfn =~ m{^/$match_domain/$match_username$}) {
+ $r->print('<p class="LC_info">'.&mt('This Authoring Space is currently empty.').'</p>');
+ } else {
+ $r->print('<p class="LC_info">'.&mt('This subdirectory is currently empty.').'</p>');
+ }
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+
# Retrieving value for "sortby" and "sortorder" from QUERY_STRING
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['sortby','sortorder']);
@@ -86,51 +151,88 @@ sub handler {
# 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'};
- # Start off the directory table.
- $r->print(&Apache::loncommon::start_data_table()
- .&Apache::loncommon::start_data_table_header_row()
- .'<th><a href="'.$linkdir.'/?sortby=filetype&sortorder='
- .((($sortby eq "filetype") && ($sortorder ne 'rev')) ? 'rev' : '')
- .'">'.&mt('Type')
- .'<span class="LC_fontsize_small"> ▼</span></a></th>'
- .'<th>'.&mt('Actions').'</th>'
- .'<th><a href="'.$linkdir.'/?sortby=filename&sortorder='
- .((($sortby eq "filename") && ($sortorder ne 'rev')) ? 'rev' : '')
- .'">'.&mt('Name')
- .'<span class="LC_fontsize_small"> ▼</span></a></th>'
- .'<th><a href="'.$linkdir.'/?sortby=title&sortorder='
- .((($sortby eq "title") && ($sortorder ne 'rev')) ? 'rev' : '')
- .'">'.&mt('Title')
- .'<span class="LC_fontsize_small"> ▼</span></a></th>'
- .'<th colspan="2"><a href="'.$linkdir.'/?sortby=pubstatus&sortorder='
- .((($sortby eq "pubstatus") && ($sortorder ne 'rev')) ? 'rev' : '')
- .'">'.&mt('Status')
- .'<span class="LC_fontsize_small"> ▼</span></a></th>'
- .'<th><a href="'.$linkdir.'/?sortby=cmtime&sortorder='
- .((($sortby eq "cmtime") && ($sortorder ne 'rev')) ? 'rev' : '')
- .'">'.&mt('Last Modified')
- .'<span class="LC_fontsize_small"> ▼</span></a></th>'
- .'<th><a href="'.$linkdir.'/?sortby=size&sortorder='
- .((($sortby eq "size") && ($sortorder ne 'rev')) ? 'rev' : '')
- .'">'.&mt('Size').' (kB)'
- .'<span class="LC_fontsize_small"> ▼</span></a></th>'
+ # Order in which columns are displayed from left to right
+ my @order = ('filetype','actions','filename','title',
+ 'pubstatus','cmtime','size');
+
+ # Up and down arrows to indicate sort order
+ my @arrows = (' ▲',' ▼','');
+
+ # Default sort order and column title
+ my %columns = (
+ filetype => {
+ order => 'ascending',
+ text => &mt('Type'),
+ },
+ actions => {
+ # Not sortable
+ text => &mt('Actions'),
+ },
+ filename => {
+ order => 'ascending',
+ text => &mt('Name'),
+ },
+ title => {
+ order => 'ascending',
+ text => &mt('Title'),
+ },
+ pubstatus => {
+ order => 'ascending',
+ text => &mt('Status'),
+ colspan => '2',
+ },
+ cmtime => {
+ order => 'descending',
+ text => &mt('Last Modified'),
+ },
+ size => {
+ order => 'ascending',
+ text => &mt('Size').' (kB)',
+ },
+ );
+
+ # Print column headers
+ my $output = '';
+ foreach my $key (@order) {
+ my $idx;
+ # Append an up or down arrow to sorted column
+ if ($sortby eq $key) {
+ $idx = ($columns{$key}{order} eq 'ascending') ? 0:1;
+ if ($sortorder eq 'rev') { $idx ++; }
+ $idx = $idx%2;
+ } else { $idx = 2; } # No arrow if column is not sorted
+ $output .= (($columns{$key}{order}) ?
+ '<th'.($columns{$key}{colspan} ? ' colspan="'.$columns{$key}{colspan}.'"' : '')
+ .'><a href="'.$linkdir.'/?sortby='.$key.'&sortorder='
+ .((($sortby eq $key) && ($sortorder ne 'rev')) ? 'rev' : '').'">'
+ .$columns{$key}{text}.$arrows[$idx].'</a></th>' :
+ '<th>'.$columns{$key}{text}.'</th>');
+ }
+
+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()
);
my $dirptr=16384; # Mask indicating a directory in stat.cmode.
-
- opendir(DIR,$fn);
my $filehash = {};
- my @files= readdir(DIR);
foreach my $filename (@files) {
- # Skip .DS_Store and hidden files
+ # Skip .DS_Store, .DAV and hidden files
my ($extension) = ($filename=~/\.(\w+)$/);
- next if (($filename eq '.DS_Store')
- || &Apache::loncommon::fileembstyle($extension) eq 'hdn');
+ next if (($filename eq '.DS_Store')
+ || ($filename eq '.DAV')
+ || (&Apache::loncommon::fileembstyle($extension) eq 'hdn')
+ || ($filename =~ /^\._/));
my ($cmode,$csize,$cmtime)=(stat($fn.'/'.$filename))[2,7,9];
my $linkfilename = &HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"');
@@ -145,8 +247,13 @@ sub handler {
if (!($cmode&$dirptr)) {
($status, $pubstatus) = &getStatus($resdir, $targetdir, $cstr_dir,
$filename, $linkfilename, $cmtime, $meta_same);
- ($fulltitle, $title) = &getTitle($resdir, $targetdir, $filename,
- $linkfilename, $meta_same, \%bombs);
+ if (($crsauthor) && ($extension eq 'rights')) {
+ $title = &getTitleString($targetdir.'/'.$filename);
+ $fulltitle = $title;
+ } else {
+ ($fulltitle, $title) = &getTitle($resdir, $targetdir, $filename,
+ $linkfilename, $meta_same, \%bombs);
+ }
} else {
($status, $pubstatus) = ('','');
($fulltitle, $title) = ('','');
@@ -215,7 +322,8 @@ sub handler {
$targetdir, \%bombs, \$numdir);
} else { # Files
&putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir,
- $targetdir, $linkdir, $filehash->{$filename}->{"cmtime"},
+ $targetdir, $linkdir, $crsauthor,
+ $filehash->{$filename}->{"cmtime"},
$filehash->{$filename}->{"size"}, \$numres,
$filehash->{$filename}->{"linkfilename"},
$filehash->{$filename}->{"fulltitle"},
@@ -224,12 +332,23 @@ sub handler {
}
}
- closedir(DIR);
-
- $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;
}
@@ -238,45 +357,59 @@ 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).
+# $crstype - Course type, if this is for "course author"
sub startpage {
- my ($r, $uname, $udom, $thisdisfn) = @_;
+ 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
# in start_page->bodytag->innerregister
$env{'request.noversionuri'}=$formaction;
- $r->print(&Apache::loncommon::start_page('Authoring Space',undef));
-
- 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
-
+ my $js = '<script type="text/javascript"
+ src="/res/adm/includes/file_upload.js"></script>';
+ $r->print(&Apache::loncommon::start_page($title, $js));
+
+ $disk_quota = 1024 * $disk_quota; # convert from MB to kB
+
+ my $headertext = &mt('Directory');
+ if ($crsauthor) {
+ $headertext = &mt('Course Authoring Directory');
+ }
$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)
+ .&Apache::lonhtmlcommon::display_usage($current_disk_usage,
+ $disk_quota,'authoring')
.'</div>'
- .&Apache::loncommon::CSTR_pageheader()));
+ .&Apache::loncommon::CSTR_pageheader('','',$headertext)));
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">
@@ -287,25 +420,6 @@ 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")
@@ -389,19 +503,16 @@ ENDPUBDIRSCRIPT
}
sub dircontrols {
- my ($r,$uname,$udom,$thisdisfn) = @_;
+ my ($r,$uname,$udom,$thisdisfn,$current_disk_usage,$disk_quota,$crsauthor) = @_;
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',
@@ -418,51 +529,80 @@ 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',
- acti => 'Actions for current directory',
+ crea => 'Create a new subdirectory or document',
+ qs => 'Quick name search',
+ cs => 'Case Sensitive',
+ re => 'Regular Expression',
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
- $r->print(<<END);
+ # 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,&Apache::loncommon::help_open_topic('Quicksearch'));
<div class="LC_columnSection">
- <div>
- <form name="curractions" method="post" action="">
- <fieldset>
- <legend>$lt{'acti'}</legend>
- <select name="dirtask" onchange="currdiract(this.form)">
- <option>$lt{'sela'}</option>
- <option value="publish">$lt{'pubd'}</option>
- <option value="editmeta">$lt{'edit'}</option>
- <option value="printdir">$lt{'prnt'}</option>
- <option value="delete">$lt{'dedr'}</option>
- </select>
- <input type="hidden" name="filename" value="/priv$thisdisfn/" />
- </fieldset>
- </form>
- <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" target="_parent">
- <input type="hidden" name="postdata" value="" />
- </form>
+ <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>
- <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
+END
+ my %fileoptions = (
+ none => "$lt{'sela'}:",
+ newfile => "$lt{'nfil'}:",
+ newhtmlfile => "$lt{'nhtm'}:",
+ newproblemfile => "$lt{'nprb'}:",
+ newdir => "$lt{'nsub'}:",
+ );
+ $fileoptions{'select_form_order'} = ['none','newfile','newhtmlfile','newproblemfile'];
+ if ($crsauthor) {
+ push(@{$fileoptions{'select_form_order'}},'newdir');
+ } else {
+ my %extraoptions = (
+ newpagefile => "$lt{'npag'}:",
+ newsequencefile => "$lt{'nseq'}:",
+ newrightsfile => "$lt{'ncrf'}:",
+ newstyfile => "$lt{'nsty'}:",
+ newtaskfile => "$lt{'nbt'}:",
+ newlibraryfile => "$lt{'nlib'}:",
+ );
+ %fileoptions = (%fileoptions,%extraoptions);
+ push(@{$fileoptions{'select_form_order'}},('newpagefile','newsequencefile',
+ 'newrightsfile','newstyfile',
+ 'newtaskfile','newlibraryfile',
+ 'newdir'));
+ }
+ my $selectbox = &Apache::loncommon::select_form('none','action',\%fileoptions);
+ $r->print(<<END);
+ <div style="padding-bottom: 2px">
+ <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload">
<fieldset>
<legend>$lt{'updc'}</legend>
<input type="hidden" name="filename" value="/priv$thisdisfn/" />
- <input type="file" name="upfile" size="20" />
+ <input type="file" name="upfile" class="LC_flUpload" />
+ <input type="hidden" id="LC_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" target="_parent">
+ <form name="fileaction" method="post" action="/adm/cfile">
<fieldset>
<legend>$lt{'crea'}</legend>
<span class="LC_nobreak">
@@ -477,23 +617,58 @@ sub dircontrols {
}
}
</script>
- <select name="action">
- <option value="none">$lt{'sela'}</option>
- <option value="newfile">$lt{'nfil'}:</option>
- <option value="newhtmlfile">$lt{'nhtm'}:</option>
- <option value="newproblemfile">$lt{'nprb'}:</option>
- <option value="newpagefile">$lt{'npag'}:</option>
- <option value="newsequencefile">$lt{'nseq'}:</option>
- <option value="newrightsfile">$lt{'ncrf'}:</option>
- <option value="newstyfile">$lt{'nsty'}:</option>
- <option value="newtaskfile">$lt{'nbt'}:</option>
- <option value="newlibraryfile">$lt{'nlib'}:</option>
- <option value="newdir">$lt{'nsub'}:</option>
- </select> <input type="text" name="newfilename" value="$lt{'type'}" onfocus="if (this.value == '$mytype') this.value=''" /> <input type="button" value="Go" onclick="validate_go();" />
+ $selectbox <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'}:
+ <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" alt="file icon" /></a>
+ <a href="javascript:void(0)" onclick="javascript:validate_action('problemtempl')">
+ <img src="/adm/lonIcons/problem.gif" title="Create new problem from template" alt="problem icon" /></a>
+ <a href="javascript:void(0)" onclick="javascript:validate_action('blankhtml')">
+ <img src="/adm/lonIcons/html.gif" title="Create new blank HTML file" alt="web page icon" /></a>
+ <a href="javascript:void(0)" onclick="javascript:validate_action('folder')">
+ <img src="/adm/lonIcons/navmap.folder.closed.gif" title="Create new subdirectory" alt="folder icon" /></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'}");
+ }
+ }
+ }
+ </script>
</span>
</fieldset>
</form>
- </div>
+ </div>
</div>
END
}
@@ -501,26 +676,26 @@ END
sub resourceactions {
my ($r,$uname,$udom,$thisdisfn) = @_;
$r->print(<<END);
- <form name="moveresource" action="/adm/cfile" target="_parent" method="post">
+ <form name="moveresource" action="/adm/cfile" 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" target="_parent" method="post">
+ <form name="delresource" action="/adm/cfile" method="post">
<input type="hidden" name="filename" value="" />
<input type="hidden" name="action" value="delete" />
</form>
- <form name="pubresource" action="/adm/publish" target="_parent" method="post">
+ <form name="pubresource" action="/adm/publish" method="post">
<input type="hidden" name="filename" value="" />
<input type="hidden" name="makeobsolete" value="0" />
</form>
- <form name="printresource" action="/adm/printout" target="_parent" method="post">
+ <form name="printresource" action="/adm/printout" method="post">
<input type="hidden" name="postdata" value="" />
</form>
- <form name="retrieveres" action="/adm/retrieve" target="_parent" method="post">
+ <form name="retrieveres" action="/adm/retrieve" method="post">
<input type="hidden" name="filename" value="" />
</form>
- <form name="cleanup" action="/adm/cleanup" target="_parent" method="post">
+ <form name="cleanup" action="/adm/cleanup" method="post">
<input type="hidden" name="filename" value="" />
</form>
END
@@ -598,7 +773,7 @@ sub putdirectory {
} else {
$actionitem =
'<form name="dirselect_'.$$numdir.
- '" action="/adm/publish" target="_parent">'.
+ '" action="/adm/publish">'.
'<select name="diraction" onchange="SetPubDir(this.form,document)">'.
'<option selected="selected">'.&mt('Select action').'</option>'.
'<option value="open">'.&mt('Open').'</option>'.
@@ -617,7 +792,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,'<>&"').'/" target="_parent">'.
+ '<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/">'.
$disfilename.'</a></span></td>'.
'<td colspan="3">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($targetdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});
if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {
@@ -630,7 +805,7 @@ sub putdirectory {
'<td></td>'.
"</tr>\n");
}
- return OK;
+ return;
}
sub getTitle {
@@ -676,7 +851,7 @@ sub isMetaSame {
sub getStatus {
my ($resdir, $targetdir, $cstr_dir, $filename,
- $linkfilename, $cmtime, $meta_same) = @_;
+ $linkfilename, $crsauthor, $cmtime, $meta_same) = @_;
my $pubstatus = 'unpublished';
my $status = &mt('Unpublished');
@@ -702,7 +877,9 @@ sub getStatus {
);
$rights_status .=
$lt_SourceRight{&getSourceRightString($targetdir.'/'.$filename)};
-
+ if (($crsauthor) && ($filename =~ /\.rights$/)) {
+ $rights_status =~ s/,\s+$//;
+ }
if ($same) {
if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
$pubstatus = 'obsolete';
@@ -720,17 +897,21 @@ sub getStatus {
$pubstatus = 'modified';
$status=&mt('Modified').
'<br />'. $rights_status;
- if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
- $status.='<br />'.
- &Apache::loncommon::modal_link(
- '/adm/diff?filename='.$linkfilename.'&versiontwo=priv',
- &mt('Diffs'),600,500);
+ unless (($crsauthor) && ($filename =~ /\.rights$/)) {
+ if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
+ $status.='<br />'.
+ &Apache::loncommon::modal_link(
+ '/adm/diff?filename='.$linkfilename.'&versiontwo=priv',
+ &mt('Diffs'),600,500);
+ }
}
- }
+ }
- $status.="\n".'<br />'.
- &Apache::loncommon::modal_link(
- '/adm/retrieve?filename='.$linkfilename.'&inhibitmenu=yes&add_modal=yes',&mt('Retrieve'),600,500);
+ unless (($crsauthor) && ($filename =~ /\.rights$/)) {
+ $status.="\n".'<br />'.
+ &Apache::loncommon::modal_link(
+ '/adm/retrieve?filename='.$linkfilename.'&inhibitmenu=yes&add_modal=yes',&mt('Retrieve'),600,500);
+ }
}
return ($status, $pubstatus);
@@ -741,9 +922,9 @@ sub getStatus {
# Put a table row for a file resource.
#
sub putresource {
- my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir,
- $linkdir, $cmtime, $size, $numres, $linkfilename, $title,
- $status, $pubstatus) = @_;
+ my ($r, $udom, $uname, $filename, $thisdisfn, $resdir,
+ $targetdir, $linkdir, $crsauthor, $cmtime, $size,
+ $numres, $linkfilename, $title, $status, $pubstatus) = @_;
&Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
my $editlink='';
@@ -755,31 +936,39 @@ sub putresource {
$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=~/\.(xml|html|htm|xhtml|xhtm)$/ || $filename=~/$LONCAPA::assess_re/) {
+ if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) {
+ my $daxeurl = '/daxepage'.$linkdir.'/'.$filename;
+ $editlink .= ' (<a href="'.$daxeurl.'" target="_blank">Daxe</a>)';
+ }
+ }
if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) {
- $editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'" target="_parent">'.&mt('Clean Up').')</a>';
+ $editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'">'.&mt('Clean Up').')</a>';
}
if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
- $editlink=' (<a target="_parent" href="/adm/cfile?decompress='.$linkfilename.'">'.&mt('Decompress').'</a>)';
+ $editlink=' (<a href="/adm/cfile?decompress='.$linkfilename.'">'.&mt('Decompress').'</a>)';
}
my $publish_button = (-e $resdir.'/'.$filename) ? &mt('Re-publish') : &mt('Publish');
my $pub_select = '';
- &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
+ unless (($crsauthor) && ($filename=~ /\.rights$/)) {
+ &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
+ }
$r->print(&Apache::loncommon::start_data_table_row().
'<td>'.($filename=~/[\#\~]$/?' ':
'<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.
'<td>'.$pub_select.'</td>'.
'<td><span class="LC_filename">'.
- '<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.
+ '<a href="'.$linkdir.'/'.$filename.'">'.
$filename.'</a></span>'.$editlink2.$editlink.
'</td>'.
'<td>'.$title.'</td>'.
'<td class="LC_browser_file_'.$pubstatus.'"> </td>'. # Display publication status
'<td>'.$status.'</td>'.
'<td>'.&Apache::lonlocal::locallocaltime($cmtime).'</td>'.
- '<td>'.sprintf "%.1f", $size.'</td>'.
+ '<td>'.sprintf("%.1f",$size).'</td>'.
&Apache::loncommon::end_data_table_row()
);
- return OK;
+ return;
}
sub create_pubselect {
@@ -832,9 +1021,138 @@ sub check_for_versions {
$versions ++;
}
}
+ closedir(DIR);
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__