--- loncom/publisher/lonpubdir.pm 2004/12/02 18:38:37 1.67
+++ loncom/publisher/lonpubdir.pm 2006/06/22 20:49:19 1.93
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Construction Space Directory Lister
#
-# $Id: lonpubdir.pm,v 1.67 2004/12/02 18:38:37 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.93 2006/06/22 20:49:19 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,6 +36,7 @@ use Apache::Constants qw(:common :http :
use Apache::loncacc;
use Apache::loncommon();
use Apache::lonhtmlcommon();
+use Apache::londiff();
use Apache::lonlocal;
use Apache::lonmsg;
use Apache::lonmenu;
@@ -61,7 +62,7 @@ sub handler {
$fn,$r->dir_config('lonDefDomain'));
unless (($uname) && ($udom)) {
$r->log_reason($uname.' at '.$udom.
- ' trying to list directory '.$ENV{'form.filename'}.
+ ' trying to list directory '.$env{'form.filename'}.
' ('.$fn.') - not authorized',
$r->filename);
return HTTP_NOT_ACCEPTABLE;
@@ -72,7 +73,7 @@ sub handler {
$fn=~s/\/$//;
unless ($fn) {
- $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+ $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
' trying to list empty directory', $r->filename);
return HTTP_NOT_FOUND;
}
@@ -91,9 +92,11 @@ sub handler {
my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
&startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page.
- if ($ENV{'environment.remote'} eq 'off') {
+ if ($env{'environment.remote'} eq 'off') {
&dircontrols($r,$uname,$udom,$thisdisfn); # Put out actions for directory,
# browse/upload + new file page.
+ } else {
+ &pubbuttons($r,$uname,$thisdisfn);
}
&resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc.
@@ -102,14 +105,14 @@ sub handler {
# Start off the directory table.
$r->print('<h3>Directory Contents:</h3>');
- $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr>'.
- '<th bgcolor="#DDDDDD">'.&mt('Type').'</th>'.
- '<th bgcolor="#DDDDDD">'.&mt('Actions').'</th>'.
- '<th bgcolor="#DDDDDD">'.&mt('Name').'</th>'.
- '<th bgcolor="#DDDDDD">'.&mt('Title').'</th>'.
- '<th bgcolor="#DDDDDD">'.&mt('Status').'</th>'.
- '<th bgcolor="#DDDDDD">'.&mt('Last Modified').
- '</th></tr>');
+ $r->print('<table id="LC_browser"><tr>'.
+ '<th>'.&mt('Type').'</th>'.
+ '<th>'.&mt('Actions').'</th>'.
+ '<th>'.&mt('Name').'</th>'.
+ '<th>'.&mt('Title').'</th>'.
+ '<th>'.&mt('Status').'</th>'.
+ '<th>'.&mt('Last Modified').
+ '</th></tr>'."\n");
my $filename;
my $dirptr=16384; # Mask indicating a directory in stat.cmode.
@@ -135,7 +138,7 @@ sub handler {
}
closedir(DIR);
- $r->print('</table></body></html>');
+ $r->print('</table>'.&Apache::loncommon::end_page());
return OK;
}
#
@@ -146,8 +149,8 @@ sub getEffectiveUrl {
my $r = shift;
my $fn;
- if ($ENV{'form.filename'}) { # If a form filename is defined.
- $fn=$ENV{'form.filename'};
+ if ($env{'form.filename'}) { # If a form filename is defined.
+ $fn=$env{'form.filename'};
#
# Replace the ~username of the URL with /home/username/public_html
# so that we don't have to worry about ~ expansion internally.
@@ -190,42 +193,40 @@ sub startpage {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
-
- my $pagetitle;
- my $formaction='/priv/'.$uname.'/'.$thisdisfn.'/';
- $formaction=~s/\/+/\//g;
- $pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring').
- '<font face="Arial, Helvetica, sans-serif"><b>Construction Space</b>:</font> '.
+ my $formaction='/priv/'.$uname.$thisdisfn.'/';
+ $formaction=~s|/+|/|g;
+ my $pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring').
+ '<font face="Arial, Helvetica, sans-serif" size="+1"><b>Construction Space</b>:</font> '.
'<form name="dirs" method="post" action="'.$formaction.
- '" target="_parent">'.
- &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv','','+1').
+ '" target="_parent"><tt><b>'.
+ &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />".
&Apache::lonhtmlcommon::select_recent('construct','recent',
'this.form.action=this.form.recent.value;this.form.submit()').
'</form>';
&Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
- if ($ENV{'environment.remote'} eq 'off') {
- $ENV{'request.noversionuri'}=$currdir;
- $r->print(&Apache::loncommon::bodytag('Construction Space',undef,undef,undef,undef,undef,$pagetitle));
+ if ($env{'environment.remote'} eq 'off') {
+ $env{'request.noversionuri'}=$currdir.'/';
+ $r->print(&Apache::loncommon::start_page('Construction Space',undef,
+ {'body_title' =>
+ $pagetitle,}));
} else {
+ $r->print(&Apache::loncommon::start_page('Construction Space',undef));
$r->print($pagetitle);
}
+
my $pubdirscript=(<<ENDPUBDIRSCRIPT);
-<script>
+<script type="text/javascript">
+top.document.title = '$thisdisfn/ - LON-CAPA Construction Space';
// Store directory location for menu bar to find
-parent.lastknownpriv='/~$uname/$thisdisfn/';
+parent.lastknownpriv='/~$uname$thisdisfn/';
// Confirmation dialogues
function currdiract(theform) {
if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publish') {
- document.publishdir.filename.value = theform.filename.value
- pubdir(document.publishdir)
- }
- if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publishsub') {
- document.publishdir.filename.value = theform.filename.value
- pubrecdir(document.publishdir)
+ document.publishdir.filename.value = theform.filename.value;
+ document.publishdir.submit();
}
if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') {
top.location=theform.filename.value+'default.meta'
@@ -234,28 +235,13 @@ parent.lastknownpriv='/~$uname/$thisdisf
document.printdir.postdata.value=theform.filename.value
document.printdir.submit();
}
- }
-
- function pubdir(theform) {
- if (confirm('Publish complete directory?')) {
- forcepub(theform)
- theform.submit();
- }
- }
- function pubrecdir(theform) {
- if (confirm('Publish directory and all subdirectories?')) {
- forcepub(theform);
- theform.pubrec.value='1';
- theform.submit();
+ if (theform.dirtask.options[theform.dirtask.selectedIndex].value == "delete") {
+ var delform = document.delresource
+ delform.filename.value = theform.filename.value
+ delform.submit()
}
}
-
- function forcepub(theform) {
- if (confirm('Force publication of unmodified files? - OK=yes; Cancel=No.')) {
- theform.forcerepub.value="ON";
- }
- }
-
+
function checkUpload(theform) {
if (theform.file == '') {
alert("Please use 'Browse..' to choose a file first, before uploading")
@@ -266,23 +252,25 @@ parent.lastknownpriv='/~$uname/$thisdisf
function SetPubDir(theform,printForm) {
if (theform.diraction.options[theform.diraction.selectedIndex].value == "open") {
- top.location = theform.filename.value
+ top.location = theform.openname.value
return
}
if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") {
- pubdir(theform)
- }
- if (theform.diraction.options[theform.diraction.selectedIndex].value == "publishsub") {
- pubrecdir(theform)
+ theform.submit();
}
if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") {
top.location=theform.filename.value+'default.meta'
}
- if (theform.diraction.options[theform.diraction.selectedIndex].value == "print") {
+ if (theform.diraction.options[theform.diraction.selectedIndex].value == "printdir") {
theform.action = '/adm/printout'
theform.postdata.value = theform.filename.value
theform.submit()
}
+ if (theform.diraction.options[theform.diraction.selectedIndex].value == "delete") {
+ var delform = document.delresource
+ delform.filename.value = theform.filename.value
+ delform.submit()
+ }
return
}
function SetResChoice(theform) {
@@ -298,22 +286,25 @@ parent.lastknownpriv='/~$uname/$thisdisf
if (activity == 'delete') {
var delform = document.delresource
delform.filename.value = theform.filename.value
- if (confirm("Are you sure you want to delete "+theform.filename.value+"?")) {
- delform.submit()
- }
+ delform.submit()
}
if (activity == 'obsolete') {
- alert("Mark as obsolete - still to be implemented")
+ var pubform = document.pubresource
+ pubform.filename.value = theform.filename.value
+ pubform.makeobsolete.value=1;
+ pubform.submit()
}
if (activity == 'print') {
- document.printresource.postdata = theform.filename.value
- document.printresource.curseed = getcurseed()
- document.printresource.problemtype = getproblemtype()
+ document.printresource.postdata.value = theform.filename.value
document.printresource.submit()
}
if (activity == 'retrieve') {
- retrieveres.filename.value = theform.filename.value
- retrieveres.submit()
+ document.retrieveres.filename.value = theform.filename.value
+ document.retrieveres.submit()
+ }
+ if (activity == 'cleanup') {
+ document.cleanup.filename.value = theform.filename.value
+ document.cleanup.submit()
}
return
}
@@ -327,39 +318,12 @@ parent.lastknownpriv='/~$uname/$thisdisf
document.moveresource.action.value = activity
document.moveresource.submit();
}
-
- function getcurseed() {
- if (parent.document.lonhomework
- &&
- parent.document.lonhomework.rndseed
- &&
- parent.document.lonhomework.rndseed.value) {
- return parent.document.lonhomework.rndseed.value;
- }
- return 0;
- }
-
- function getproblemtype() {
- if (parent.document.lonhomework) {
- var optionelement;
- var valueIndex=0;
- for (var optionIndex=0;
- optionIndex < parent.document.lonhomework.problemtype.options.length;
- optionIndex++)
- {
- optionElement=parent.document.lonhomework.problemtype.options[optionIndex];
- if (optionElement.selected) {
- return optionElement.value;
- }
- }
- }
- return 0;
- }
</script>
ENDPUBDIRSCRIPT
$r->print($pubdirscript);
- if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
+ if ((($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) &&
+ $env{'environment.remote'} ne 'off') {
$r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.
'</h3>');
}
@@ -367,68 +331,107 @@ ENDPUBDIRSCRIPT
sub dircontrols {
my ($r,$uname,$udom,$thisdisfn) = @_;
+ 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 Catalog Information',
+ sela => 'Select Action',
+ nfil => 'New file',
+ nhtm => 'New HTML file',
+ nprb => 'New problem',
+ npag => 'New assembled page',
+ nseq => 'New assembled sequence',
+ ncrf => 'New custom rights file',
+ nsty => 'New style file',
+ nlib => 'New library file',
+ nsub => 'New subdirectory',
+ renm => 'Rename current file to',
+ move => 'Move current file to',
+ 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',
+ updc => 'Upload a new document'
+ );
$r->print(<<END);
- <table cellspacing="4" cellpadding="4" width="100%">
+ <table id="LC_cstr_controls">
<tr>
- <td bgcolor="#DDDDDD" align="middle"><b>Actions for current directory</b></td>
- <td bgcolor="#DDDDDD" align="middle"><b>Upload a new document</b></td>
- <td bgcolor="#DDDDDD" align="middle"><b>Create a new directory or LON-CAPA document</b></td>
+ <th>$lt{'acti'}</th>
+ <th>$lt{'updc'}</th>
+ <th>$lt{'crea'}</th>
</tr>
<tr>
- <td bgcolor="#ccddaa" valign="top" align="center">
+ <td>
<form name="curractions" method="post" action="">
- <select name="dirtask" onChange="currdiract(this.form)">
- <option>Select action</option>
- <option value="publish">Publish directory</option>
- <option value="publishsub">Publish with subdirectories</option>
- <option value="editcat">Edit catalog information</option>
- <option value="printdir">Print contents of directory</option>
+ <select name="dirtask" onchange="currdiract(this.form)">
+ <option>$lt{'sela'}</option>
+ <option value="publish">$lt{'pubd'}</option>
+ <option value="editcat">$lt{'edit'}</option>
+ <option value="printdir">$lt{'prnt'}</option>
+ <option value="delete">$lt{'dedr'}</option>
</select>
<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
</form>
<form name="publishdir" method="post" action="/adm/publish" target="_parent">
<input type="hidden" name="pubrec" value="" />
<input type="hidden" name="filename" value="" />
- <input type="hidden" name="forcerepub" value="NO" />
</form>
<form name="printdir" method="post" action="/adm/printout" target="_parent">
<input type="hidden" name="postdata" value="" />
- <input type="hidden" name="curseed" value="0" />
- <input type="hidden" name="problemtype" value="0" />
</form>
</td>
- <td bgcolor="#ccddaa" valign="top" align="center">
+ <td>
<form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
<input type="file" name="upfile" size="20" />
- <input type="button" value="Upload file" onclick="checkUpload(this.form)" />
+ <input type="button" value="$lt{'uplo'}" onclick="checkUpload(this.form)" />
</form>
</td>
- <td bgcolor="#ccddaa" align="center">
+ <td>
<form name="fileaction" method="post" action="/adm/cfile" target="_parent">
- <nobr>
+ <span style="white-space: nowrap">
<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
- <select name="action">
- <option>Select action</option>
- <option value="newfile">New file:</option>
- <option value="newhtmlfile">New HTML file:</option>
- <option value="newproblemfile">New problem:</option>
- <option value="newpagefile">New assembled page:</option>
- <option value="newsequencefile">New assembled sequence:</option>
- <option value="newrightsfile">New custom rights file:</option>
- <option value="newstyfile">New style file:</option>
- <option value="newdir">New subdirectory:</option>
+ <select name="action">
+ <option value="Select Action">$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="newlibraryfile">$lt{'nlib'}:</option>
+ <option value="newdir">$lt{'nsub'}:</option>
</select> <input type="text" name="newfilename" value="Type Name Here" onfocus="if (this.value == 'Type Name Here') this.value=''" /> <input type="button" value="Go" onclick="document.fileaction.submit()" />
- </nobr>
+ </span>
</form>
</td>
</tr>
</table>
- <br />
- <br />
END
}
+sub pubbuttons {
+ my ($r,$uname,$thisdisfn) = @_;
+ $r->print('<form method="post" action="/adm/publish" target="_parent">'.
+ '<table><tr><td><input type="hidden" name="filename" value="/~'.
+ $uname.$thisdisfn.'/" />'.
+ '<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.
+'<input type="button" onclick="window.location='."'/~".
+ $uname.$thisdisfn."/default.meta'".'" value="'.
+&mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');
+}
+
sub resourceactions {
my ($r,$uname,$udom,$thisdisfn) = @_;
$r->print(<<END);
@@ -442,18 +445,18 @@ sub resourceactions {
<input type="hidden" name="action" value="delete" />
</form>
<form name="pubresource" action="/adm/publish" target="_parent" method="post">
- <input type="hidden" name="pubrec" value="" />
<input type="hidden" name="filename" value="" />
- <input type="hidden" name="forcerepub" value="NO" />
+ <input type="hidden" name="makeobsolete" value="0" />
</form>
<form name="printresource" action="/adm/printout" target="_parent" method="post">
<input type="hidden" name="postdata" value="" />
- <input type="hidden" name="curseed" value="" />
- <input type="hidden" name="problemtype" value="" />
</form>
<form name="retrieveres" action="/adm/retrieve" target="_parent" method="post">
<input type="hidden" name="filename" value="" />
</form>
+ <form name="cleanup" action="/adm/cleanup" target="_parent" method="post">
+ <input type="hidden" name="filename" value="" />
+ </form>
END
}
@@ -523,32 +526,33 @@ sub putdirectory {
$actionitem =
'<form name="dirselect_'.$$numdir.
'" action="/adm/publish" target="_parent">'.
- '<select name="diraction" onChange="SetPubDir(this.form,document)">'.
+ '<select name="diraction" onchange="SetPubDir(this.form,document)">'.
'<option selected="selected">'.&mt('Select action').'</option>'.
'<option value="open">'.&mt('Open').'</option>'.
'<option value="publish">'.&mt('Publish').'</option>'.
- '<option value="publishsub">'.&mt('Publish with subdirectories').'</option>'.
'<option value="editcat">'.&mt('Edit catalog information').'</option>'.
- '<option value="printdir">'.&mt('Print directory').
+ '<option value="printdir">'.&mt('Print directory').'</option>'.
+ '<option value="delete">'.&mt('Delete directory').'</option>'.
'</select>'.
- '<input type="hidden" name="filename" value="'.$dirpath.'/'.$dirname.'/" />'.
- '<input type="hidden" name="pubrec" value="" />'.
- '<input type="hidden" name="forcerepub" value="" />'.
- '<input type="hidden" name="curseed" value="0" />'.
- '<input type="hidden" name="problemtype" value="0" />'.
+ '<input type="hidden" name="filename" value="'.&HTML::Entities::encode($dirpath.'/'.$dirname,'<>&"').'/" />'.
+ '<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.
'<input type="hidden" name="postdata" value="" />'.
'</form>';
$$numdir ++;
}
- $r->print('<tr bgcolor="#CCCCFF">'.
+ $r->print('<tr class="LC_browser_folder">'.
'<td><img src="'.
- $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" /></td>'.
+ $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" alt="folder" /></td>'.
'<td>'.$actionitem.'</td>'.
- '<td><font face="arial"><a href="'.$here.'/'.$dirname.'/" target="_parent">'.
- $disfilename.'</a></font></td>'.
- '<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.
- $Apache::lonpublisher::metadatafields{'subject'}.'</i> '.
- $Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
+ '<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" target="_parent">'.
+ $disfilename.'</a></span></td>'.
+ '<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});
+ if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {
+ $r->print(' <i>'.
+ $Apache::lonpublisher::metadatafields{'subject'}.
+ '</i> ');
+ }
+ $r->print($Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
'<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
"</tr>\n");
}
@@ -561,9 +565,10 @@ sub putresource {
my ($r, $udom, $uname, $filename, $thisdisfn,
$resdir, $targetdir, $linkdir,
$cmtime,$bombs,$numres) = @_;
+ &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
my $pubstatus = 'unpublished';
my $status=&mt('Unpublished');
- my $bgcolor='#FFAA99';
+ my $css_class='LC_browser_file';
my $title=' ';
my $publish_button=&mt('Publish');
# my $action_buttons=
@@ -571,46 +576,54 @@ sub putresource {
# $uname.'/'.$thisdisfn.'/'.$filename.'">'.
# &mt('Delete').'</a>';
if (-e $resdir.'/'.$filename) {
+ my $same=0;
my ($rdev,$rino,$rmode,$rnlink,
$ruid,$rgid,$rrdev,$rsize,
$ratime,$rmtime,$rctime,
$rblksize,$rblocks)=stat($resdir.'/'.$filename);
+ if ($rmtime>=$cmtime) {
+ $same=1;
+ } else {
+ if (&Apache::londiff::are_different_files($resdir.'/'.$filename,
+ '/home/'.$uname.'/public_html/'.$thisdisfn.'/'.$filename)) {
+ $same=0;
+ } else {
+ $same=1;
+ }
+ }
$publish_button=&mt('Re-publish');
- if ($rmtime>=$cmtime) {
+ if ($same) {
$pubstatus = 'published';
$status=&mt('Published').'<br />'.
&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
&mt(&getSourceRightString($targetdir.'/'.$filename));
- $bgcolor='#CCFF88';
if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
$pubstatus = 'obsolete';
$status=&mt('Obsolete');
- $bgcolor='#AAAAAA';
}
# } else {
# $action_buttons='';
# }
$title='<a href="/res/'.$targetdir.'/'.$filename.
- '.meta" target=cat>'.
+ '.meta" target="cat">'.
&getTitleString($targetdir.'/'.$filename).'</a>';
} else {
$pubstatus = 'modified';
$status=&mt('Modified').'<br />'.
&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
&mt(&getSourceRightString($targetdir.'/'.$filename));
- $bgcolor='#FFFF77';
# $action_buttons='';
- $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
+ $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target="cat">'.
&getTitleString($targetdir.'/'.$filename).'</a>';
if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
$status.='<br /><a href="/adm/diff?filename=/~'.$uname.
$thisdisfn.'/'.$filename.
- '&versiontwo=priv" target=cat>'.&mt('Diffs').'</a>';
+ '&versiontwo=priv" target="cat">'.&mt('Diffs').'</a>';
}
}
- $title.='<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'.
- ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" />':'Edit Metadata').'</a>';
- $status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
+ $title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'.
+ ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="bomb" />':'Edit Metadata').'</a>';
+ $status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
$thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';
}
my $editlink='';
@@ -622,19 +635,23 @@ sub putresource {
$editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_parent">'.&mt('EditXML').'</a>)';
$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_parent">'.&mt('Edit').'</a>)';
}
+ if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) {
+ $editlink.=' (<a href="/adm/cleanup?filename=/~'.$uname.
+ $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Clean Up').')</a>';
+ }
if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
$editlink=' (<a target="_parent" href="/adm/cfile?decompress=/~'.
$uname.$thisdisfn.'/'.$filename.'">'.&mt('Decompress').'</a>)';
}
my $pub_select = '';
&create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
- $r->print('<tr bgcolor="'.$bgcolor.'">'.
+ $r->print('<tr class="LC_browser_file_'.$pubstatus.'">'.
'<td>'.($filename=~/[\#\~]$/?' ':
- '<img src="'.&Apache::loncommon::icon($filename).'" /></td>').
+ '<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.
'<td>'.$pub_select.'</td>'.
- '<td><font face="arial">'.
+ '<td><span class="LC_filename"> '.
'<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.
- $filename.'</a></font>'.$editlink2.$editlink.
+ $filename.'</a></span>'.$editlink2.$editlink.
'</td>'.
'<td>'.$title.'</td>'.
'<td>'.$status.'</td>'.
@@ -647,32 +664,31 @@ sub create_pubselect {
my ($r,$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres) = @_;
$$pub_select = '
<form name="resselect_'.$$numres.'" action="">
-<select name="reschoice" onChange="SetResChoice(this.form)">
-<option>'.&mt('Select action').
-'<option value="rename"/>'.&mt('Rename').
-'<option value="move"/>'.&mt('Move').
-'<option value="copy"/>'.&mt('Copy').
-'<option value="publish"/>'.$publish_button;
+<select name="reschoice" onchange="SetResChoice(this.form)">
+<option>'.&mt('Select action').'</option>'.
+'<option value="copy">'.&mt('Copy').'</option>';
if ($pubstatus eq 'obsolete' || $pubstatus eq 'unpublished') {
- $$pub_select .= '
-<option value="delete"/>'.&mt('Delete');
+ $$pub_select .=
+'<option value="rename">'.&mt('Rename').'</option>'.
+'<option value="move">'.&mt('Move').'</option>'.
+'<option value="delete">'.&mt('Delete').'</option>';
} else {
$$pub_select .= '
-<option value="obsolete"/>'.&mt('Mark obsolete');
+<option value="obsolete">'.&mt('Mark obsolete').'</option>';
}
- $$pub_select .= '
-<option value="print"/>'.&mt('Print');
-
# check for versions
my $versions = &check_for_versions($r,'/'.$filename,$udom,$uname);
if ($versions > 0) {
$$pub_select .='
-<option value="retrieve"/>'.&mt('Retrieve old version');
+<option value="retrieve">'.&mt('Retrieve old version').'</option>';
}
$$pub_select .= '
-</select>
+<option value="publish">'.$publish_button.'</option>'.
+'<option value="cleanup">'.&mt('Clean up').'</option>'.
+'<option value="print">'.&mt('Print').'</option>'.
+'</select>
<input type="hidden" name="filename" value="/~'.
- $uname.'/'.$thisdisfn.'/'.$filename.'"></form>';
+ &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" /></form>';
$$numres ++;
}