--- loncom/publisher/lonpubdir.pm 2004/08/20 16:29:15 1.63 +++ loncom/publisher/lonpubdir.pm 2004/10/29 18:40:40 1.64 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Construction Space Directory Lister # -# $Id: lonpubdir.pm,v 1.63 2004/08/20 16:29:15 www Exp $ +# $Id: lonpubdir.pm,v 1.64 2004/10/29 18:40:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,6 +38,8 @@ use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonlocal; use Apache::lonmsg; +use Apache::lonmenu; +use Apache::lonnet; sub handler { @@ -89,13 +91,24 @@ sub handler { 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. + + &resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc. + + my $numdir = 0; + my $numres = 0; # Start off the directory table. - - $r->print(''. - ''. - ' + + + + + + + + + +
 '.&mt('Actions').''.&mt('Name').''. - &mt('Title').''.&mt('Status').''.&mt('Last Modified'). + $r->print('

Directory Contents:

'); + $r->print(''. + ''. + ''. + ''. + ''. + ''. + ''); my $filename; @@ -112,10 +125,10 @@ sub handler { my $extension=''; if ($filename=~/\.(\w+)$/) { $extension=$1; } if ($cmode&$dirptr) { - putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs); + putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs,\$numdir); } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') { - putresource($r, $uname, $filename, $thisdisfn, $resdir, - $targetdir, $linkdir, $cmtime,\%bombs); + putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir, + $targetdir, $linkdir, $cmtime,\%bombs,\$numres); } else { # "hidden" extension and not a directory, so hide it away. } @@ -173,13 +186,27 @@ sub getEffectiveUrl { sub startpage { my ($r, $uname, $udom, $thisdisfn) = @_; - + my $currdir = '/priv/'.$uname.$thisdisfn; &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - + $r->print('LON-CAPA Construction Space'); - - $r->print(&Apache::loncommon::bodytag(undef,undef,undef,1)); + + my $pagetitle; + my $formaction='/priv/'.$uname.'/'.$thisdisfn; + $formaction=~s/\/+/\//g; + $pagetitle .= (''. + 'Construction Space: '. + &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn,'top','/priv','','-1'). + &Apache::lonhtmlcommon::select_recent('construct','recent', + 'this.form.action=this.form.recent.value;this.form.submit()'). + ''); + &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction); + + $r->print(&Apache::loncommon::bodytag('Construction Space',undef,undef,undef,undef,undef,$pagetitle)); + + $r->print(&Apache::loncommon::help_open_menu('','','','',3,'Authoring')); my $pubdirscript=(< // Store directory location for menu bar to find @@ -188,49 +215,243 @@ parent.lastknownpriv='/~$uname/$thisdisf // 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) + } + if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') { + window.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(); + } + } + function pubdir(theform) { if (confirm('Publish complete directory?')) { + forcepub(theform) theform.submit(); } } - function pubrecdir(theform) { + 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") + return + } + theform.submit() + } + + function SetPubDir(theform,printForm) { + if (theform.diraction.options[theform.diraction.selectedIndex].value == "open") { + window.location = theform.filename.value + return + } + if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") { + pubdir(theform) + } + if (theform.diraction.options[theform.diraction.selectedIndex].value == "publishsub") { + pubrecdir(theform) + } + if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") { + window.location=theform.filename.value+'default.meta' + } + if (theform.diraction.options[theform.diraction.selectedIndex].value == "print") { + theform.action = '/adm/printout' + theform.postdata.value = theform.filename.value + theform.submit() + } + return + } + function SetResChoice(theform) { + var activity = theform.reschoice.options[theform.reschoice.selectedIndex].value + if ((activity == 'rename') || (activity == 'copy') || (activity == 'move')) { + changename(theform,activity) + } + if (activity == 'publish') { + var pubform = document.pubresource + pubform.filename.value = theform.filename.value + pubform.submit() + } + 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() + } + } + if (activity == 'obsolete') { + alert("Mark as obsolete - still to be implemented") + } + if (activity == 'print') { + document.printresource.postdata = theform.filename.value + document.printresource.curseed = getcurseed() + document.printresource.problemtype = getproblemtype() + document.printresource.submit() + } + if (activity == 'retrieve') { + retrieveres.filename.value = theform.filename.value + retrieveres.submit() + } + return + } + function changename(theform,activity) { + var newname=prompt('New Name'); + if (newname == "" || !newname) { + return + } + document.moveresource.newfilename.value = newname + document.moveresource.filename.value = theform.filename.value + 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; + } ENDPUBDIRSCRIPT + $r->print($pubdirscript); - $r->print('

'.&mt('Construction Space Directory').'

'. - ''. - $pubdirscript. - '
'. - '
'.&mt('Type').''.&mt('Actions').''.&mt('Name').''.&mt('Title').''.&mt('Status').''.&mt('Last Modified'). '
'. - ''. - ''. - ''. -'
'.&mt('Force publication of unmodified files').'. 
'); - if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) { $r->print('

'.&mt('Co-Author').': '.$uname.' at '.$udom. '

'); } - my $formaction='/priv/'.$uname.'/'.$thisdisfn.'/'; - $formaction=~s/\/+/\//g; - $r->print('
'. - &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv'). - &Apache::lonhtmlcommon::select_recent('construct','recent', - 'this.form.action=this.form.recent.value;this.form.submit()'). - '
'); - &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction); +} + +sub dircontrols { + my ($r,$uname,$udom,$thisdisfn) = @_; + $r->print(< +
Actions for current directoryUpload a new documentCreate a new directory or LON-CAPA document
+
+ + +
+
+ + + +
+
+ + + +
+ 		+
+ + + +
+ 		+
+ + +    + +
+
+
+
+END +} + +sub resourceactions { + my ($r,$uname,$udom,$thisdisfn) = @_; + $r->print(< + + + + +
+ + +
+
+ + + +
+
+ + + +
+
+ +
+END } # @@ -271,16 +492,14 @@ sub getSourceRightString { # modtime - Encoded modification time. # sub putdirectory { - my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs) = @_; - + my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs, $numdir) = @_; # construct the display filename: the directory name unless ..: my $disfilename = $dirname; if ($dirname eq '..') { $disfilename = ''.&mt('Parent Directory').''; } - unless (( ($dirname eq '..') && ($reqfile eq '')) || - ($dirname eq '.')) { + unless ( (($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) { my $kaputt=0; foreach (keys %{$bombs}) { if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; } @@ -292,62 +511,90 @@ sub putdirectory { &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile( $construct.'/'.$dirname.'/default.meta' )); + my $actionitem = ''; + if ($dirname eq '..') { + $actionitem = 'Go to ...'; + } else { + $actionitem = + '
'. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + '
'; + $$numdir ++; + } $r->print(''. ''. - ''.&mt('Go to ...').''. - ''. + ''.$actionitem.''. + ''. $disfilename.''. ''.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' '. $Apache::lonpublisher::metadatafields{'subject'}.' '. $Apache::lonpublisher::metadatafields{'keywords'}.''. ''.&Apache::lonlocal::locallocaltime($modtime).''. "\n"); - } + } return OK; } # # Put a table row for a file resource. # sub putresource { - my ($r, $uname, $filename, $thisdisfn, + my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir, $linkdir, - $cmtime,$bombs) = @_; - + $cmtime,$bombs,$numres) = @_; + my $pubstatus = 'unpublished'; my $status=&mt('Unpublished'); my $bgcolor='#FFAA99'; my $title=' '; my $publish_button=&mt('Publish'); - my $action_buttons= - '
'. - &mt('Delete').''; +# my $action_buttons= +# '
'. +# &mt('Delete').''; if (-e $resdir.'/'.$filename) { my ($rdev,$rino,$rmode,$rnlink, $ruid,$rgid,$rrdev,$rsize, $ratime,$rmtime,$rctime, $rblksize,$rblocks)=stat($resdir.'/'.$filename); - $publish_button=&mt('Re-Publish'); + $publish_button=&mt('Re-publish'); if ($rmtime>=$cmtime) { + $pubstatus = 'published'; $status=&mt('Published').'
'. &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=''; - } + } +# } else { +# $action_buttons=''; +# } $title=''. &getTitleString($targetdir.'/'.$filename).''; } else { + $pubstatus = 'modified'; $status=&mt('Modified').'
'. &mt(&getCopyRightString($targetdir.'/'.$filename)).' '. &mt(&getSourceRightString($targetdir.'/'.$filename)); $bgcolor='#FFFF77'; - $action_buttons=''; +# $action_buttons=''; $title=''. &getTitleString($targetdir.'/'.$filename).''; if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') { @@ -359,30 +606,29 @@ sub putresource { $title.='
'. ($$bombs{$targetdir.'/'.$filename}?'':'Edit Metadata').''; $status.='
'.&mt('Retrieve').''; + $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').''; } my $editlink=''; my $editlink2=''; if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) { - $editlink='
('.&mt('Edit').')'; + $editlink='
('.&mt('Edit').')'; } if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) { - $editlink=' ('.&mt('EditXML').')'; - $editlink2='
('.&mt('Edit').')'; + $editlink=' ('.&mt('EditXML').')'; + $editlink2='
('.&mt('Edit').')'; } if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) { $editlink=' ('.&mt('Decompress').')'; } + my $pub_select = ''; + &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres); $r->print(''. ''.($filename=~/[\#\~]$/?' ': ''). - ''.$publish_button.''. - $action_buttons. - ''. + ''.$pub_select.''. ''. - ''. + ''. $filename.''.$editlink2.$editlink. ''. ''.$title.''. @@ -391,6 +637,59 @@ sub putresource { "\n"); return OK; } + +sub create_pubselect { + my ($r,$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres) = @_; + $$pub_select = ' +
+ +
'; + $$numres ++; +} + +sub check_for_versions { + my ($r,$fn,$udom,$uname) = @_; + my $versions = 0; + my $docroot=$r->dir_config('lonDocRoot'); + my $resfn=$docroot.'/res/'.$udom.'/'.$uname.$fn; + my $resdir=$resfn; + $resdir=~s/\/[^\/]+$/\//; + $fn=~/\/([^\/]+)\.(\w+)$/; + my $main=$1; + my $suffix=$2; + opendir(DIR,$resdir); + while (my $filename=readdir(DIR)) { + if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) { + $versions ++; + } + } + return $versions; +} + # # Categorize files in the directory. # For each file in a list of files in a file directory,