--- loncom/publisher/lonpubdir.pm 2016/11/30 18:38:48 1.170
+++ loncom/publisher/lonpubdir.pm 2023/07/14 18:01:23 1.180
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Authoring Space Directory Lister
#
-# $Id: lonpubdir.pm,v 1.170 2016/11/30 18:38:48 damieng Exp $
+# $Id: lonpubdir.pm,v 1.180 2023/07/14 18:01:23 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -48,7 +48,7 @@ sub handler {
# Validate access to the construction space and get username:domain.
- my ($uname,$udom)=&Apache::lonnet::constructaccess($r->uri);
+ my ($uname,$udom)=&Apache::lonnet::constructaccess($r->uri);
unless (($uname) && ($udom)) {
return HTTP_NOT_ACCEPTABLE;
}
@@ -67,9 +67,7 @@ sub handler {
$r->send_http_header;
&Apache::lonhtmlcommon::clear_breadcrumbs();
- my $js = '<script type="text/javascript"
- src="/res/adm/includes/file_upload.js"></script>';
- $r->print(&Apache::loncommon::start_page('Authoring Space', $js).
+ $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>'.
@@ -106,9 +104,9 @@ sub handler {
"$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);
+
+ &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor);
if (!-d $fn) {
if (-e $fn) {
@@ -130,12 +128,12 @@ sub handler {
}
# Put out actions for directory, browse/upload + new file page.
- &dircontrols($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota);
+ &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>');
@@ -194,7 +192,7 @@ sub handler {
order => 'ascending',
text => &mt('Size').' (kB)',
},
- );
+ );
# Print column headers
my $output = '';
@@ -239,18 +237,23 @@ my $result = "<script type=\"text/javasc
my ($cmode,$csize,$cmtime)=(stat($fn.'/'.$filename))[2,7,9];
my $linkfilename = &HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"');
# Identify type of file according to icon used
- my ($filetype) = (&Apache::loncommon::icon($filename) =~ m{/(\w+).gif$});
+ my ($filetype) = (&Apache::loncommon::icon($filename) =~ m{/(\w+).gif$});
my $cstr_dir = $r->dir_config('lonDocRoot').'/priv'.$thisdisfn;
my $meta_same = &isMetaSame($cstr_dir, $resdir, $filename);
-
+
# Store size, title, and status for files but not directories
my $size = (!($cmode&$dirptr)) ? $csize/1024. : 0;
my ($status, $pubstatus, $title, $fulltitle);
if (!($cmode&$dirptr)) {
- ($status, $pubstatus) = &getStatus($resdir, $targetdir, $cstr_dir,
+ ($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) = ('','');
@@ -269,7 +272,7 @@ my $result = "<script type=\"text/javasc
"linkfilename" => $linkfilename,
}
}
-
+
my @sorted_files;
# Sorting by something other than "Name". Name is the secondary key.
if ($sortby =~ m{cmtime|size}) { # Numeric fields
@@ -303,7 +306,7 @@ my $result = "<script type=\"text/javasc
}
# Sort by "Name" is the default
- } else {
+ } else {
if ($sortorder eq "rev") {
@sorted_files = sort {uc($b) cmp uc($a)} (keys(%{$filehash}));
} else {
@@ -314,13 +317,14 @@ my $result = "<script type=\"text/javasc
# Print the sorted resources
foreach my $filename (@sorted_files) {
if ($filehash->{$filename}->{"cmode"}&$dirptr) { # Directories
- &putdirectory($r, $thisdisfn, $linkdir, $filename,
- $filehash->{$filename}->{"cmtime"},
+ &putdirectory($r, $thisdisfn, $linkdir, $filename,
+ $filehash->{$filename}->{"cmtime"},
$targetdir, \%bombs, \$numdir);
} else { # Files
&putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir,
- $targetdir, $linkdir, $filehash->{$filename}->{"cmtime"},
- $filehash->{$filename}->{"size"}, \$numres,
+ $targetdir, $linkdir, $crsauthor,
+ $filehash->{$filename}->{"cmtime"},
+ $filehash->{$filename}->{"size"}, \$numres,
$filehash->{$filename}->{"linkfilename"},
$filehash->{$filename}->{"fulltitle"},
$filehash->{$filename}->{"status"},
@@ -344,13 +348,13 @@ my $result = "<script type=\"text/javasc
.'</div>'
.&Apache::loncommon::end_page()
);
- return OK;
+ return OK;
}
# Output the header of the page. This includes:
-# - The HTML header
+# - The HTML header
# - The H1/H3 stuff which includes the directory.
#
# startpage($r, $uame, $udom, $thisdisfn, $current_disk_usage, $disk_quota);
@@ -383,22 +387,26 @@ sub startpage {
'text' => $title,
'href' => &Apache::loncommon::authorspace($formaction),
});
- # breadcrumbs (and tools) will be created
+ # breadcrumbs (and tools) will be created
# in start_page->bodytag->innerregister
$env{'request.noversionuri'}=$formaction;
- my $js = '<script type="text/javascript"
+ 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,'authoring')
.'</div>'
- .&Apache::loncommon::CSTR_pageheader()));
+ .&Apache::loncommon::CSTR_pageheader('','',$headertext)));
my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
my $doctitle = 'LON-CAPA '.&mt($title);
@@ -412,31 +420,12 @@ 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")
- return
+ return
}
- theform.submit()
+ theform.submit()
}
function SetPubDir(theform,printForm) {
@@ -514,19 +503,16 @@ ENDPUBDIRSCRIPT
}
sub dircontrols {
- my ($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota) = @_;
+ 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',
+ uplo => 'Upload file',
dele => 'Delete',
- edit => 'Edit Metadata',
sela => 'Select Action',
nfil => 'New file',
nhtm => 'New HTML file',
@@ -543,58 +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',
- 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,&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>
-
+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" target="_parent">
+ <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" class="flUpload testclass" size="20" />
- <input type="hidden" id="free_space" value=$free_space />
+ <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">
@@ -609,53 +617,51 @@ 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" placeholder="$lt{'type'}" value="" onfocus="if (this.value == is.empty()) 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>Quickactions:
+ <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"></a>
+ <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"></a>
+ <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"></a>
+ <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"></a>
+ <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.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\';
+ 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'}");
}
- fileaction.submit();
- } else {
- alert(\'Please specify file name.\');
- // TODO: ask for filename? if so, do some refactoring
-
}
}
</script>
@@ -663,18 +669,6 @@ sub dircontrols {
</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
}
@@ -682,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
@@ -752,9 +746,9 @@ sub putdirectory {
my ($r, $reqfile, $here, $dirname, $modtime, $targetdir, $bombs, $numdir) = @_;
# construct the display filename: the directory name unless ..:
-
+
my $actionitem;
-
+
my $disfilename = $dirname;
# Don't display directory itself, and there is no way up from root directory
unless ((($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) {
@@ -777,9 +771,9 @@ sub putdirectory {
$actionitem = &mt('Go to ...');
$disfilename = '<i>'.&mt('Parent Directory').'</i>';
} else {
- $actionitem =
+ $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>'.
@@ -798,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 '') {
@@ -831,7 +825,7 @@ sub getTitle {
&Apache::loncommon::modal_link(
'/adm/retrieve?filename='.$linkfilename.'.meta&inhibitmenu=yes&add_modal=yes',
&mt('Retrieve Metadata'),600,500);
- }
+ }
}
# Allow editing metadata of published and unpublished resources
$title .= "\n".'<br />' if ($title);
@@ -850,14 +844,13 @@ sub isMetaSame {
my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9];
my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
return (&Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta',
- $cstr_dir.'/'.$filename.'.meta') && $meta_rmtime < $meta_cmtime)
+ $cstr_dir.'/'.$filename.'.meta') && $meta_rmtime < $meta_cmtime)
? 0 : 1;
}
-
-sub getStatus {
- my ($resdir, $targetdir, $cstr_dir, $filename,
- $linkfilename, $cmtime, $meta_same) = @_;
+sub getStatus {
+ my ($resdir, $targetdir, $cstr_dir, $filename,
+ $linkfilename, $crsauthor, $cmtime, $meta_same) = @_;
my $pubstatus = 'unpublished';
my $status = &mt('Unpublished');
@@ -883,7 +876,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';
@@ -901,17 +896,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);
@@ -922,9 +921,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='';
@@ -943,20 +942,22 @@ sub putresource {
}
}
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>'.
@@ -977,7 +978,7 @@ sub create_pubselect {
<option>'.&mt('Select action').'</option>'.
'<option value="copy">'.&mt('Copy').'</option>';
if ($pubstatus eq 'obsolete' || $pubstatus eq 'unpublished') {
- $$pub_select .=
+ $$pub_select .=
'<option value="rename">'.&mt('Rename').'</option>'.
'<option value="move">'.&mt('Move').'</option>'.
'<option value="delete">'.&mt('Delete').'</option>';
@@ -1016,7 +1017,7 @@ sub check_for_versions {
opendir(DIR,$resdir);
while (my $filename=readdir(DIR)) {
if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) {
- $versions ++;
+ $versions ++;
}
}
closedir(DIR);
@@ -1024,7 +1025,7 @@ sub check_for_versions {
}
sub prepareJsonTranslations {
- my $json =
+ my $json =
'{"translations":{'.
'"edit":"'.&mt('Edit').'",'.
'"editxml":"'.&mt('EditXML').'",'.
@@ -1095,7 +1096,7 @@ sub prepareJsonData_rec {
closedir(DIR);
# nothing to do here if both lists are empty
return unless ( @dirs || @resources );
-
+
# Phase 2: Working
$$firstfile = 1;
@@ -1217,9 +1218,9 @@ run through list of files and attempt to
=item startpage($r, $uame, $udom, $thisdisfn)
Output the header of the page. This includes:
- - The HTML header
+ - The HTML header
- The H1/H3 stuff which includes the directory.
-
+
startpage($r, $uame, $udom, $thisdisfn);
$r - The apache request object.
$uname - User name.
@@ -1232,7 +1233,7 @@ Output the header of the page. This inc
Without the latter substitution, it's impossible to examine metadata for
untitled resources. Resources may be legitimately untitled, to prevent
searches from locating them.
-
+
$str = getTitleString($fullname);
$fullname - Fully qualified filename to check.
@@ -1240,7 +1241,7 @@ Output the header of the page. This inc
$numdir)
Put out a directory table row:
-
+
$r - Apache request object.
$reqfile - File in request.
$here - Where we are in directory tree.