--- loncom/publisher/lonpubdir.pm 2004/11/30 19:08:18 1.66
+++ loncom/publisher/lonpubdir.pm 2005/05/28 02:18:03 1.82
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Construction Space Directory Lister
#
-# $Id: lonpubdir.pm,v 1.66 2004/11/30 19:08:18 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.82 2005/05/28 02:18:03 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -61,7 +61,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 +72,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 +91,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.
@@ -146,8 +148,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.
@@ -189,43 +191,40 @@ sub startpage {
my $currdir = '/priv/'.$uname.$thisdisfn;
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
-
- $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
+ my $html=&Apache::lonxml::xmlbegin();
+ $r->print($html.'<head><title>LON-CAPA Construction Space</title></head>');
my $pagetitle;
- my $formaction='/priv/'.$uname.'/'.$thisdisfn.'/';
+ 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> '.
+ '<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;
+ if ($env{'environment.remote'} eq 'off') {
+ $env{'request.noversionuri'}=$currdir.'/';
$r->print(&Apache::loncommon::bodytag('Construction Space',undef,undef,undef,undef,undef,$pagetitle));
} else {
$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'
@@ -236,26 +235,6 @@ parent.lastknownpriv='/~$uname/$thisdisf
}
}
- 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();
- }
- }
-
- 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,19 +245,16 @@ 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()
@@ -298,22 +274,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 +306,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>');
}
@@ -370,9 +322,9 @@ sub dircontrols {
$r->print(<<END);
<table cellspacing="4" cellpadding="4" width="100%">
<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>
+ <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Actions for current directory</b></font></td>
+ <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Upload a new document</b></font></td>
+ <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Create a new directory or LON-CAPA document</b></font></td>
</tr>
<tr>
<td bgcolor="#ccddaa" valign="top" align="center">
@@ -380,7 +332,6 @@ sub dircontrols {
<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>
@@ -389,12 +340,9 @@ sub dircontrols {
<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">
@@ -409,7 +357,7 @@ sub dircontrols {
<nobr>
<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
<select name="action">
- <option>Select action</option>
+ <option>Select Action</option>
<option value="newfile">New file:</option>
<option value="newhtmlfile">New HTML file:</option>
<option value="newproblemfile">New problem:</option>
@@ -424,11 +372,20 @@ sub dircontrols {
</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 +399,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
}
@@ -511,6 +468,8 @@ sub putdirectory {
%Apache::lonpublisher::metadatakeys=();
my $construct=$here;
$construct=~s:^/priv/(\w+)$:/home/$1/public_html:;
+ my $dirpath = $here;
+ $dirpath=~s:^/priv/:/~:;
&Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
$construct.'/'.$dirname.'/default.meta'
));
@@ -527,13 +486,10 @@ sub putdirectory {
'<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>'.
'</select>'.
- '<input type="hidden" name="filename" value="'.$here.'/'.$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="'.$dirpath.'/'.$dirname.'/" />'.
+ '<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.
'<input type="hidden" name="postdata" value="" />'.
'</form>';
$$numdir ++;
@@ -559,6 +515,7 @@ 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';
@@ -589,7 +546,7 @@ sub putresource {
# $action_buttons='';
# }
$title='<a href="/res/'.$targetdir.'/'.$filename.
- '.meta" target=cat>'.
+ '.meta" target="cat">'.
&getTitleString($targetdir.'/'.$filename).'</a>';
} else {
$pubstatus = 'modified';
@@ -598,17 +555,17 @@ sub putresource {
&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">'.
+ $title.="\n".'<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.
+ $status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
$thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';
}
my $editlink='';
@@ -620,6 +577,10 @@ 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>)';
@@ -646,31 +607,30 @@ sub create_pubselect {
$$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;
+<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>';
+ $uname.$thisdisfn.'/'.$filename.'" /></form>';
$$numres ++;
}