--- loncom/interface/lonannounce.pm 2009/04/04 21:47:40 1.79
+++ loncom/interface/lonannounce.pm 2012/02/22 18:38:29 1.83
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Announce
#
-# $Id: lonannounce.pm,v 1.79 2009/04/04 21:47:40 bisitz Exp $
+# $Id: lonannounce.pm,v 1.83 2012/02/22 18:38:29 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -45,7 +45,7 @@ my %todayhash;
my %showedcheck;
sub editfield {
- my ($r,$start,$end,$text)=@_;
+ my ($r,$start,$end,$text,$crstype)=@_;
# Deal with date forms
my $startdateform = &Apache::lonhtmlcommon::date_setter('anno',
'startdate',
@@ -61,6 +61,10 @@ sub editfield {
'start' => 'Starting date',
'end' => 'Ending date',
'incrss' => 'Include in course RSS newsfeed');
+ if ($crstype eq 'Community') {
+ $lt{'annon'} = &mt('Community Announcements');
+ $lt{'incrss'} = &mt('Include in community RSS newsfeed');
+ }
$r->print(<
Posting '.$1.': '.&Apache::lonnet::postannounce
($1,$env{'form.serverannnounce'}));
@@ -595,6 +603,7 @@ ENDDOCUMENT
if ($allowed) {
my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $crstype = &Apache::loncommon::course_type();
# ----------------------------------------------------- Store new submitted one
if ($env{'form.action'} eq 'new') {
my $startdate =
@@ -612,7 +621,13 @@ ENDDOCUMENT
$startdate.'_'.$enddate =>
$env{'form.msg'} },$coursedom,$coursenum);
if ($env{'form.rsspost'}) {
- &Apache::lonrss::addentry($coursenum,$coursedom,'Course_Announcements',
+ my $feed;
+ if ($crstype eq 'Community') {
+ $feed = 'Community_Announcements';
+ } else {
+ $feed = 'Course_Announcements';
+ }
+ &Apache::lonrss::addentry($coursenum,$coursedom,$feed,
&mt('Event from [_1] to [_2]',
&Apache::lonlocal::locallocaltime($startdate),
&Apache::lonlocal::locallocaltime($enddate)),
@@ -634,7 +649,7 @@ ENDDOCUMENT
$tomorrowhash{'day'}++;
my $tomorrow=&Apache::loncommon::maketime(%tomorrowhash);
- &editfield($r,$today,$tomorrow,'');
+ &editfield($r,$today,$tomorrow,'',$crstype);
}
# ----------------------------------------------------- Summarize all calendars
my %allcal=&get_all_calendars();
@@ -656,7 +671,7 @@ ENDDOCUMENT
.&mt('No calendar available for this date.')
.'
'. - '
'.&mt($localdays[$i]).' | '); } @@ -742,22 +757,23 @@ ENDDOCUMENT } } # ------------------------------------------------------------------- End table - $r->print('
---|
'. - ''.&mt('Previous Month').' '. - ''.&mt('Next Month').''. ' '.&mt('Current Month').'
'. - ($pickdatemode?'':'').&Apache::loncommon::end_page()); - $r->print(''.&mt('Download your Calendar as iCalendar File').''); + ($pickdatemode?'':''). + ''.&mt('Download your Calendar as iCalendar File').''. + &Apache::loncommon::end_page()); return OK; }