--- loncom/publisher/lonpubdir.pm 2003/09/21 03:30:02 1.38 +++ 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.38 2003/09/21 03:30:02 taceyjo1 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('<table border=2>'. - '<tr><th>Actions</th><th>Name</th><th>Title</th>'. - '<th>Status</th><th>Last Modified</th></tr>'); + '<tr><th>'.&mt('Actions').'</th><th>'.&mt('Name').'</th><th>'. + &mt('Title').'</th>'. + '<th>'.&mt('Status').'</th><th>'.&mt('Last Modified'). + '</th></tr>'); 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('<html><head><title>LON-CAPA Construction Space</title></head>'); @@ -210,24 +202,28 @@ parent.lastknownpriv='/~$uname/$thisdisf </script> ENDPUBDIRSCRIPT - $r->print('<h1>Construction Space Directory <tt>'. - $thisdisfn.'/</tt></h1>'. + $r->print('<h2>'.&mt('Construction Space Directory').'</h2>'. '<script type="text/javascript">top.document.title = \''. $thisdisfn.'/ - LON-CAPA Construction Space\';</script>'. $pubdirscript. '<form method="post" action="/adm/publish" target="_parent">'. '<table><tr><td><input type="hidden" name="filename" value="/~'. $uname.$thisdisfn.'/" />'. - '<input type="button" onClick="pubdir(this.form);" value="Publish Directory" />'. + '<input type="button" onClick="pubdir(this.form);" value="'. +&mt('Publish Directory').'" />'. '<input type="hidden" name="pubrec" value="" />'. - '<input type="button" onClick="pubrecdir(this.form);" value="Publish Directory and Sub Directories" /></td><td>'. + '<input type="button" onClick="pubrecdir(this.form);" value="'. +&mt('Publish Directory and Sub Directories').'" /></td><td>'. '<input type="button" onClick="window.location='."'/~". - $uname.$thisdisfn."/default.meta'".'" value="Edit Directory Catalog Information" /></td></tr><tr><td><input type="checkbox" name="forcerepub" /> Force publication of unmodified files.</td><td> </td></tr></table></form>'); + $uname.$thisdisfn."/default.meta'".'" value="'. +&mt('Edit Directory Catalog Information').'" /></td></tr><tr><td><input type="checkbox" name="forcerepub" /> '.&mt('Force publication of unmodified files').'.</td><td> </td></tr></table></form>'); if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) { - $r->print('<h3>Co-Author: '.$uname.' at '.$udom. + $r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom. '</h3>'); } + $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 = '<i>Parent Directory</i>'; + $disfilename = '<i>'.&mt('Parent Directory').'</i>'; } unless (( ($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) { + my $kaputt=0; + foreach (keys %{$bombs}) { + if ($_=~/^$resdir\/$disfilename\//) { $kaputt=1; last; } + } $r->print('<tr bgcolor="#CCCCFF">'. - '<td>Go to ...</td>'. + '<td>'.&mt('Go to ...').'</td>'. '<td><a href="'.$here.'/'.$dirname.'/" target="_top">'. $disfilename.'</a></td>'. - '<td> </td>'. + '<td>'.($kaputt?'<img src="/adm/lonMisc/bomb.gif" />':' ').'</td>'. '<td> </td>'. - '<td>'.localtime($modtime).'</td>'. + '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'. "</tr>\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,37 +298,47 @@ 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='<a href="/res/'.$targetdir.'/'.$filename. '.meta" target=cat>'. + ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" />':''). getTitleString($targetdir.'/'.$filename, 'title').'</a>'; } else { - $status='Modified'; + $status=&mt('Modified'); $bgcolor='#FFFFCC'; $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'. + ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" />':''). getTitleString($targetdir.'/'.$filename,'title').'</a>'; if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') { $status.='<br><a href="/adm/diff?filename=/~'.$uname. $thisdisfn.'/'.$filename. - '&versiontwo=priv" target=cat>Diffs</a>'; + '&versiontwo=priv" target=cat>'.&mt('Diffs').'</a>'; } } $status.='<br><a href="/adm/retrieve?filename=/~'.$uname. - $thisdisfn.'/'.$filename.'" target=cat>Retrieve</a>'; + $thisdisfn.'/'.$filename.'" target=cat>'.&mt('Retrieve').'</a>'; } my $editlink=''; my $editlink2=''; if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) { - $editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">Edit</a>)'; + $editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('Edit').'</a>)'; } if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) { - $editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">EditXML</a>)'; - $editlink2=' (<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_top">Edit</a>)'; + $editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('EditXML').'</a>)'; + $editlink2=' (<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_top">'.&mt('Edit').'</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>)'; } $r->print('<tr bgcolor="'.$bgcolor.'">'. '<td><a target="_parent" href="/adm/publish?filename=/~'. - $uname.$thisdisfn.'/'.$filename.'">'.'Publish</a>'. + $uname.$thisdisfn.'/'.$filename.'">'.&mt('Publish').'</a>'. '</td>'. '<td>'. '<a href="'.$linkdir.'/'.$filename.'" target="_top">'. @@ -336,7 +346,7 @@ sub putresource { '</td>'. '<td>'.$title.'</td>'. '<td>'.$status.'</td>'. - '<td>'.localtime($cmtime).'</td>'. + '<td>'.&Apache::lonlocal::locallocaltime($cmtime).'</td>'. "</tr>\n"); return OK; }