Diff for /loncom/publisher/lonpubdir.pm between versions 1.59 and 1.63

version 1.59, 2004/01/29 00:44:43 version 1.63, 2004/08/20 16:29:15
Line 256  sub getCopyRightString { Line 256  sub getCopyRightString {
     my $fullname = shift;      my $fullname = shift;
     return &Apache::lonnet::metadata($fullname, 'copyright');      return &Apache::lonnet::metadata($fullname, 'copyright');
 }  }
   
   sub getSourceRightString {
       my $fullname = shift;
       return &Apache::lonnet::metadata($fullname, 'sourceavail');
   }
 #  #
 #  Put out a directory table row:  #  Put out a directory table row:
 #    putdirectory(r, base, here, dirname, modtime)  #    putdirectory(r, base, here, dirname, modtime)
Line 312  sub putresource { Line 317  sub putresource {
     my $status=&mt('Unpublished');      my $status=&mt('Unpublished');
     my $bgcolor='#FFAA99';      my $bgcolor='#FFAA99';
     my $title=' ';      my $title=' ';
       my $publish_button=&mt('Publish');
       my $action_buttons=
           '<br /><a target="_top" href="/adm/cfile?action=delete&filename=/~'.
    $uname.'/'.$thisdisfn.'/'.$filename.'">'.
    &mt('Delete').'</a>';
     if (-e $resdir.'/'.$filename) {      if (-e $resdir.'/'.$filename) {
  my ($rdev,$rino,$rmode,$rnlink,   my ($rdev,$rino,$rmode,$rnlink,
     $ruid,$rgid,$rrdev,$rsize,      $ruid,$rgid,$rrdev,$rsize,
     $ratime,$rmtime,$rctime,      $ratime,$rmtime,$rctime,
     $rblksize,$rblocks)=stat($resdir.'/'.$filename);      $rblksize,$rblocks)=stat($resdir.'/'.$filename);
    $publish_button=&mt('Re-Publish');
  if ($rmtime>=$cmtime) {   if ($rmtime>=$cmtime) {
     $status=&mt('Published').'<br />'.      $status=&mt('Published').'<br />'.
  &mt(&getCopyRightString($targetdir.'/'.$filename));   &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
             $bgcolor='#CCFF88';   &mt(&getSourceRightString($targetdir.'/'.$filename));
       $bgcolor='#CCFF88';
     if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {      if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
  $status=&mt('Obsolete');   $status=&mt('Obsolete');
                 $bgcolor='#AAAAAA';                  $bgcolor='#AAAAAA';
       } else {
    $action_buttons='';
     }      }
     $title='<a href="/res/'.$targetdir.'/'.$filename.      $title='<a href="/res/'.$targetdir.'/'.$filename.
  '.meta" target=cat>'.   '.meta" target=cat>'.
  &getTitleString($targetdir.'/'.$filename).'</a>';   &getTitleString($targetdir.'/'.$filename).'</a>';
  } else {   } else {
     $status=&mt('Modified').'<br />'.      $status=&mt('Modified').'<br />'.
  &mt(&getCopyRightString($targetdir.'/'.$filename));   &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
    &mt(&getSourceRightString($targetdir.'/'.$filename));
             $bgcolor='#FFFF77';              $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>';   &getTitleString($targetdir.'/'.$filename).'</a>';
     if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {      if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
Line 343  sub putresource { Line 359  sub putresource {
  $title.='<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'.    $title.='<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'. 
     ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" />':'Edit Metadata').'</a>';      ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" />':'Edit Metadata').'</a>';
  $status.='<br><a href="/adm/retrieve?filename=/~'.$uname.   $status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
     $thisdisfn.'/'.$filename.'" target=cat>'.&mt('Retrieve').'</a>';      $thisdisfn.'/'.$filename.'" target="_top">'.&mt('Retrieve').'</a>';
     }      }
     my $editlink='';      my $editlink='';
     my $editlink2='';      my $editlink2='';
Line 362  sub putresource { Line 378  sub putresource {
       '<td>'.($filename=~/[\#\~]$/?'&nbsp;':        '<td>'.($filename=~/[\#\~]$/?'&nbsp;':
       '<img src="'.&Apache::loncommon::icon($filename).'" /></td>').        '<img src="'.&Apache::loncommon::icon($filename).'" /></td>').
       '<td><a target="_parent" href="/adm/publish?filename=/~'.        '<td><a target="_parent" href="/adm/publish?filename=/~'.
       $uname.$thisdisfn.'/'.$filename.'">'.&mt('Publish').'</a>'.        $uname.$thisdisfn.'/'.$filename.'">'.$publish_button.'</a>'.
         $action_buttons.
       '</td>'.        '</td>'.
       '<td><font face="arial">'.        '<td><font face="arial">'.
       '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.        '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.

Removed from v.1.59  
changed lines
  Added in v.1.63


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>