--- loncom/publisher/lonpubdir.pm 2003/12/29 19:01:27 1.49 +++ loncom/publisher/lonpubdir.pm 2004/06/18 16:52:19 1.61 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Construction Space Directory Lister # -# $Id: lonpubdir.pm,v 1.49 2003/12/29 19:01:27 www Exp $ +# $Id: lonpubdir.pm,v 1.61 2004/06/18 16:52:19 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,6 +37,7 @@ use Apache::loncacc; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonlocal; +use Apache::lonmsg; sub handler { @@ -85,14 +86,14 @@ sub handler { my $targetdir=$udom.'/'.$uname.$thisdisfn; # Publiction target directory. my $linkdir='/priv/'.$uname.$thisdisfn; # Full URL name of constr space. - + my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom); &startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page. - # Start off the diretory table. + # Start off the directory table. - $r->print(''. - '
'.&mt('Actions').''.&mt('Name').''. + $r->print(''. + ''. ''); @@ -111,10 +112,10 @@ sub handler { my $extension=''; if ($filename=~/\.(\w+)$/) { $extension=$1; } if ($cmode&$dirptr) { - putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime); + putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs); } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') { putresource($r, $uname, $filename, $thisdisfn, $resdir, - $targetdir, $linkdir, $cmtime); + $targetdir, $linkdir, $cmtime,\%bombs); } else { # "hidden" extension and not a directory, so hide it away. } @@ -221,8 +222,15 @@ ENDPUBDIRSCRIPT $r->print('

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

'); } - $r->print( - &Apache::lonhtmlcommon::crumbs($thisdisfn.'/','_top','/priv/'.$uname)); + 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); } # @@ -244,7 +252,15 @@ sub getTitleString { return $title; } +sub getCopyRightString { + my $fullname = shift; + return &Apache::lonnet::metadata($fullname, 'copyright'); +} +sub getSourceRightString { + my $fullname = shift; + return &Apache::lonnet::metadata($fullname, 'sourceavail'); +} # # Put out a directory table row: # putdirectory(r, base, here, dirname, modtime) @@ -255,7 +271,7 @@ sub getTitleString { # modtime - Encoded modification time. # sub putdirectory { - my ($r, $reqfile, $here, $dirname, $modtime) = @_; + my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs) = @_; # construct the display filename: the directory name unless ..: @@ -265,12 +281,26 @@ sub putdirectory { } unless (( ($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) { + my $kaputt=0; + foreach (keys %{$bombs}) { + if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; } + } + %Apache::lonpublisher::metadatafields=(); + %Apache::lonpublisher::metadatakeys=(); + my $construct=$here; + $construct=~s:^/priv/(\w+)$:/home/$1/public_html:; + &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile( + $construct.'/'.$dirname.'/default.meta' + )); $r->print(''. + ''. ''. - ''. - ''. - ''. + ''. + ''. ''. "\n"); } @@ -282,60 +312,70 @@ sub putdirectory { sub putresource { my ($r, $uname, $filename, $thisdisfn, $resdir, $targetdir, $linkdir, - $cmtime) = @_; + $cmtime,$bombs) = @_; my $status=&mt('Unpublished'); - my $bgcolor='#FFCCCC'; + my $bgcolor='#FFAA99'; my $title=' '; + my $publish_button=&mt('Publish'); 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'); if ($rmtime>=$cmtime) { - $status=&mt('Published'); - $bgcolor='#CCFFCC'; + $status=&mt('Published').'
'. + &mt(&getCopyRightString($targetdir.'/'.$filename)).' '. + &mt(&getSourceRightString($targetdir.'/'.$filename)); + $bgcolor='#CCFF88'; if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) { $status=&mt('Obsolete'); $bgcolor='#AAAAAA'; } $title=''. - getTitleString($targetdir.'/'.$filename, 'title').''; + &getTitleString($targetdir.'/'.$filename).''; } else { - $status=&mt('Modified'); - $bgcolor='#FFFFCC'; + $status=&mt('Modified').'
'. + &mt(&getCopyRightString($targetdir.'/'.$filename)).' '. + &mt(&getSourceRightString($targetdir.'/'.$filename)); + $bgcolor='#FFFF77'; $title=''. - getTitleString($targetdir.'/'.$filename,'title').''; + &getTitleString($targetdir.'/'.$filename).''; if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') { - $status.='
'.&mt('Diffs').''; } - } + } + $title.='
'. + ($$bombs{$targetdir.'/'.$filename}?'':'Edit Metadata').''; $status.='
'.&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').')'; + $editlink2='
('.&mt('Edit').')'; } if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) { $editlink=' ('.&mt('Decompress').')'; } $r->print(''. + ''). ''. - ''. ''. ''.
 '.&mt('Actions').''.&mt('Name').''. &mt('Title').''.&mt('Status').''.&mt('Last Modified'). '
'.&mt('Go to ...').''. - $disfilename.'  '. + $disfilename.''.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' '. + $Apache::lonpublisher::metadatafields{'subject'}.' '. + $Apache::lonpublisher::metadatafields{'keywords'}.''.&Apache::lonlocal::locallocaltime($modtime).'
'.($filename=~/[\#\~]$/?' ': + ''.&mt('Publish').''. + $uname.$thisdisfn.'/'.$filename.'">'.$publish_button.''. ''. + ''. ''. - $filename.''.$editlink2.$editlink. + $filename.''.$editlink2.$editlink. ''.$title.''.$status.'