--- loncom/publisher/lonpublisher.pm 2005/05/17 00:46:36 1.193
+++ loncom/publisher/lonpublisher.pm 2005/05/19 03:22:04 1.194
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Publication Handler
#
-# $Id: lonpublisher.pm,v 1.193 2005/05/17 00:46:36 www Exp $
+# $Id: lonpublisher.pm,v 1.194 2005/05/19 03:22:04 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -355,7 +355,7 @@ sub hiddenfield {
sub checkbox {
my ($name,$text)=@_;
- return "\n
$text";
+ return "\n
".&mt($text);
}
sub selectbox {
@@ -1151,16 +1151,17 @@ sub publish {
my $intr_scrout.=
'
';
+ &mt($env{'form.makeobsolete'}?'Make Obsolete':'Finalize Publication').'" />';
}
return($scrout,0);
}
@@ -1714,8 +1738,18 @@ sub publishdirectory {
&hiddenfield('phase','two').
&hiddenfield('filename',$env{'form.filename'}).
&checkbox('pubrec','include subdirectories').
- &checkbox('forcerepub','force republication of previously published files'));
- $r->print('');
+ &checkbox('forcerepub','force republication of previously published files').
+ &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('
'.&mt('Copyright for all files:').&Apache::loncommon::select_form('keep','forceallcopy',%allcopyrights));
+ $r->print('
'.&mt('Copyright for pages/sequences:').&Apache::loncommon::select_form('keep','forceratcopy',%ratcopyrights));
+ $r->print(&text_with_browse_field('Custom Distribution File','forcecustomfile'));
+ $r->print('
');
} else {
# actually publish things
opendir(DIR,$fn);