--- loncom/publisher/lonpubdir.pm 2003/08/03 01:20:02 1.37 +++ loncom/publisher/lonpubdir.pm 2003/12/30 22:19:18 1.50 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Construction Space Directory Lister # -# $Id: lonpubdir.pm,v 1.37 2003/08/03 01:20:02 www Exp $ +# $Id: lonpubdir.pm,v 1.50 2003/12/30 22:19:18 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,19 +25,6 @@ # # http://www.lon-capa.org/ # -# -# (TeX Content Handler -# -# YEAR=2000 -# 05/29/00,05/30,10/11 Gerd Kortemeyer) -# -# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer -# YEAR=2001 -# 03/23 Guy Albertelli -# 03/24,03/29 Gerd Kortemeyer) -# 03/31,04/03,05/09,06/23,08/18,08/20 Gerd Kortemeyer -# 12/28 Gerd Kortemeyer -# ### package Apache::lonpubdir; @@ -48,6 +35,9 @@ use File::Copy; use Apache::Constants qw(:common :http :methods); use Apache::loncacc; use Apache::loncommon(); +use Apache::lonhtmlcommon(); +use Apache::lonlocal; +use Apache::lonmsg; sub handler { @@ -96,21 +86,23 @@ 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(''. - ''. - ''); + ''. + ''); my $filename; my $dirptr=16384; # Mask indicating a directory in stat.cmode. opendir(DIR,$fn); - my @files=sort(readdir(DIR)); + my @files=sort {uc($a) cmp uc($b)} (readdir(DIR)); foreach my $filename (@files) { my ($cdev,$cino,$cmode,$cnlink, $cuid,$cgid,$crdev,$csize, @@ -120,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. } @@ -182,7 +174,7 @@ sub getEffectiveUrl { sub startpage { my ($r, $uname, $udom, $thisdisfn) = @_; - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; $r->print('LON-CAPA Construction Space'); @@ -210,24 +202,28 @@ parent.lastknownpriv='/~$uname/$thisdisf ENDPUBDIRSCRIPT - $r->print('

Construction Space Directory '. - $thisdisfn.'/

'. + $r->print('

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

'. ''. $pubdirscript. ''. '
ActionsNameTitleStatusLast Modified
'.&mt('Actions').''.&mt('Name').''. + &mt('Title').''.&mt('Status').''.&mt('Last Modified'). + '
'. - ''. + ''. ''. - ''. + ''. '
Force publication of unmodified files. 
'); + $uname.$thisdisfn."/default.meta'".'" value="'. +&mt('Edit Directory Catalog Information').'" /> '.&mt('Force publication of unmodified files').'. '); if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) { - $r->print('

Co-Author: '.$uname.' at '.$udom. + $r->print('

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

'); } + $r->print( + &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv')); } # @@ -244,7 +240,7 @@ sub getTitleString { my $title = &Apache::lonnet::metadata($fullname, 'title'); unless ($title) { - $title = "[untitled]"; + $title = "[".&mt('untitled')."]"; } return $title; } @@ -260,23 +256,27 @@ 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 ..: my $disfilename = $dirname; if ($dirname eq '..') { - $disfilename = 'Parent Directory'; + $disfilename = ''.&mt('Parent Directory').''; } unless (( ($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) { + my $kaputt=0; + foreach (keys %{$bombs}) { + if ($_=~/^$resdir\/$disfilename\//) { $kaputt=1; last; } + } $r->print(''. - 'Go to ...'. + ''.&mt('Go to ...').''. ''. $disfilename.''. - ' '. + ''.($kaputt?'':' ').''. ' '. - ''.localtime($modtime).''. + ''.&Apache::lonlocal::locallocaltime($modtime).''. "\n"); } return OK; @@ -287,9 +287,9 @@ sub putdirectory { sub putresource { my ($r, $uname, $filename, $thisdisfn, $resdir, $targetdir, $linkdir, - $cmtime) = @_; + $cmtime,$bombs) = @_; - my $status='Unpublished'; + my $status=&mt('Unpublished'); my $bgcolor='#FFCCCC'; my $title=' '; if (-e $resdir.'/'.$filename) { @@ -298,43 +298,55 @@ sub putresource { $ratime,$rmtime,$rctime, $rblksize,$rblocks)=stat($resdir.'/'.$filename); if ($rmtime>=$cmtime) { - $status='Published'; + $status=&mt('Published'); $bgcolor='#CCFFCC'; + if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) { + $status=&mt('Obsolete'); + $bgcolor='#AAAAAA'; + } $title=''. + ($$bombs{$targetdir.'/'.$filename}?'':''). getTitleString($targetdir.'/'.$filename, 'title').''; } else { - $status='Modified'; + $status=&mt('Modified'); $bgcolor='#FFFFCC'; $title=''. + ($$bombs{$targetdir.'/'.$filename}?'':''). getTitleString($targetdir.'/'.$filename,'title').''; if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') { $status.='
Diffs'; + '&versiontwo=priv" target=cat>'.&mt('Diffs').''; } } $status.='
Retrieve'; + $thisdisfn.'/'.$filename.'" target=cat>'.&mt('Retrieve').''; } my $editlink=''; + my $editlink2=''; if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) { - $editlink=' (Edit)'; + $editlink=' ('.&mt('Edit').')'; } if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) { - $editlink=' (EditXML)'; + $editlink=' ('.&mt('EditXML').')'; + $editlink2=' ('.&mt('Edit').')'; + } + if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) { + $editlink=' ('.&mt('Decompress').')'; } $r->print(''. ''.'Publish'. + $uname.$thisdisfn.'/'.$filename.'">'.&mt('Publish').''. ''. ''. ''. - $filename.''.$editlink. + $filename.''.$editlink2.$editlink. ''. ''.$title.''. ''.$status.''. - ''.localtime($cmtime).''. + ''.&Apache::lonlocal::locallocaltime($cmtime).''. "\n"); return OK; }