Diff for /loncom/publisher/lonpublisher.pm between versions 1.193 and 1.194

version 1.193, 2005/05/17 00:46:36 version 1.194, 2005/05/19 03:22:04
Line 355  sub hiddenfield { Line 355  sub hiddenfield {
   
 sub checkbox {  sub checkbox {
     my ($name,$text)=@_;      my ($name,$text)=@_;
     return "\n<br /><input type='checkbox' name='$name' /> $text";      return "\n<br /><input type='checkbox' name='$name' /> ".&mt($text);
 }  }
   
 sub selectbox {  sub selectbox {
Line 1151  sub publish { Line 1151  sub publish {
   
     my $intr_scrout.=      my $intr_scrout.=
  '<form name="pubform" action="/adm/publish" method="post">'.   '<form name="pubform" action="/adm/publish" method="post">'.
  '<p><input type="submit" value="'.&mt('Finalize Publication').'" /></p>'.   '<p>'.($env{'form.makeobsolete'}?'':'<input type="submit" value="'.&mt('Finalize Publication').'" />').'</p>'.
  &hiddenfield('phase','two').   &hiddenfield('phase','two').
  &hiddenfield('filename',$env{'form.filename'}).   &hiddenfield('filename',$env{'form.filename'}).
  &hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).   &hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
  &hiddenfield('dependencies',join(',',keys %allow)).   &hiddenfield('dependencies',join(',',keys %allow));
       unless ($env{'form.makeobsolete'}) {
          $intr_scrout.=
  &textfield('Title','title',$metadatafields{'title'}).   &textfield('Title','title',$metadatafields{'title'}).
  &textfield('Author(s)','author',$metadatafields{'author'}).   &textfield('Author(s)','author',$metadatafields{'author'}).
  &textfield('Subject','subject',$metadatafields{'subject'});   &textfield('Subject','subject',$metadatafields{'subject'});
    # --------------------------------------------------- Scan content for keywords
 # --------------------------------------------------- Scan content for keywords  
   
     my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");      my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
     my $KEYWORDS=&mt('Keywords');      my $KEYWORDS=&mt('Keywords');
Line 1315  END Line 1316  END
     } else {      } else {
  $intr_scrout.=&hiddenfield('copyright','private');   $intr_scrout.=&hiddenfield('copyright','private');
     }      }
      } else {
          $intr_scrout.=
    &hiddenfield('title',$metadatafields{'title'}).
    &hiddenfield('author',$metadatafields{'author'}).
    &hiddenfield('subject',$metadatafields{'subject'}).
    &hiddenfield('keywords',$metadatafields{'keywords'}).
    &hiddenfield('abstract',$metadatafields{'abstract'}).
    &hiddenfield('notes',$metadatafields{'notes'}).
    &hiddenfield('mime',$metadatafields{'mime'}).
    &hiddenfield('creationdate',$metadatafields{'creationdate'}).
    &hiddenfield('lastrevisiondate',time).
    &hiddenfield('owner',$metadatafields{'owner'}).
    &hiddenfield('lowestgradelevel',$metadatafields{'lowestgradelevel'}).
    &hiddenfield('standards',$metadatafields{'standards'}).
    &hiddenfield('highestgradelevel',$metadatafields{'highestgradelevel'}).
    &hiddenfield('language',$metadatafields{'language'}).
    &hiddenfield('copyright',$metadatafields{'copyright'}).
    &hiddenfield('sourceavail',$metadatafields{'sourceavail'}).
    &hiddenfield('customdistributionfile',$metadatafields{'customdistributionfile'}).
    &text_with_browse_field('Suggested Replacement for Obsolete File',
       'obsoletereplacement',
       $metadatafields{'obsoletereplacement'});
      }
     if (!$batch) {      if (!$batch) {
  $scrout.=$intr_scrout.'<p><input type="submit" value="'.   $scrout.=$intr_scrout.'<p><input type="submit" value="'.
     &mt('Finalize Publication').'" /></p></form>';      &mt($env{'form.makeobsolete'}?'Make Obsolete':'Finalize Publication').'" /></p></form>';
     }      }
     return($scrout,0);      return($scrout,0);
 }  }
Line 1714  sub publishdirectory { Line 1738  sub publishdirectory {
   &hiddenfield('phase','two').    &hiddenfield('phase','two').
   &hiddenfield('filename',$env{'form.filename'}).    &hiddenfield('filename',$env{'form.filename'}).
   &checkbox('pubrec','include subdirectories').    &checkbox('pubrec','include subdirectories').
   &checkbox('forcerepub','force republication of previously published files'));    &checkbox('forcerepub','force republication of previously published files').
         $r->print('<input type="submit" value="'.&mt('Publish Directory').'" /></form>');                    &checkbox('forceobsolete','make file(s) obsolete'));
           my %allcopyrights=('keep','Keep current copyright');
           my %ratcopyrights=%allcopyrights;
           foreach (&Apache::loncommon::copyrightids) {
               $allcopyrights{$_}=&Apache::loncommon::copyrightdescription($_);
               unless ($_ eq 'public') { $ratcopyrights{$_}=$allcopyrights{$_}; }
    }
           $r->print('<br >'.&mt('Copyright for all files:').&Apache::loncommon::select_form('keep','forceallcopy',%allcopyrights));
           $r->print('<br >'.&mt('Copyright for pages/sequences:').&Apache::loncommon::select_form('keep','forceratcopy',%ratcopyrights));
    $r->print(&text_with_browse_field('Custom Distribution File','forcecustomfile'));
           $r->print('<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');
     } else {      } else {
 # actually publish things  # actually publish things
  opendir(DIR,$fn);   opendir(DIR,$fn);

Removed from v.1.193  
changed lines
  Added in v.1.194


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