Diff for /loncom/publisher/lonpubdir.pm between versions 1.60 and 1.62

version 1.60, 2004/06/07 22:34:12 version 1.62, 2004/07/02 09:41:07
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 321  sub putresource { Line 326  sub putresource {
  $publish_button=&mt('Re-Publish');   $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)).' '.
    &mt(&getSourceRightString($targetdir.'/'.$filename));
     $bgcolor='#CCFF88';      $bgcolor='#CCFF88';
     if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {      if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
  $status=&mt('Obsolete');   $status=&mt('Obsolete');
Line 332  sub putresource { Line 338  sub putresource {
  &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';
     $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>';
Line 345  sub putresource { Line 352  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='';

Removed from v.1.60  
changed lines
  Added in v.1.62


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