--- loncom/interface/lonannounce.pm	2008/12/15 16:37:44	1.76
+++ loncom/interface/lonannounce.pm	2009/11/04 20:01:24	1.80
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.76 2008/12/15 16:37:44 raeburn Exp $
+# $Id: lonannounce.pm,v 1.80 2009/11/04 20:01:24 raeburn 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{'anon'} = &mt('Community Announcements');
+        $lt{'incrss'} = &mt('Include in community RSS newsfeed');
+    }
 
     $r->print(<<ENDFORM);
 <h2>$lt{'annon'} $help</h2>
@@ -415,7 +419,7 @@ sub picklink {
 
 sub dialscript {
     return (<<ENDDIA);
-<script language="Javascript">
+<script type="text/javascript" language="JavaScript">
 function dialin(day,month,year) {
 	opener.document.$env{'form.formname'}.$env{'form.element'}\_year.value=year;
     var slct=opener.document.$env{'form.formname'}.$env{'form.element'}\_month;
@@ -517,7 +521,7 @@ sub handler {
 
 # ------------------------------------------------------------ Print the screen
     my $js = <<ENDDOCUMENT;
-<script type="text/javascript">
+<script type="text/javascript" language="JavaScript">
 
     function trysubmit() {
         document.anno.action.value="new";
@@ -539,7 +543,7 @@ ENDDOCUMENT
 		  '<font size="1">');
     } else {
         my $brcrum = [{href=>"/adm/announcements",text=>"Announcements and Calendar"}];
-        $r->print(&Apache::loncommon::start_page("Announcements and Calendar",$js,{'bread_crumbs' => $brcrum}));
+        $r->print(&Apache::loncommon::start_page("Communication",$js,{'bread_crumbs' => $brcrum}));
     }
 # does this user have privileges to post, etc?
     my $allowed=0;
@@ -590,11 +594,12 @@ ENDDOCUMENT
 	}
     }
     $r->print(
-  '<br /><input type="submit" name="serveraction" value="'.&mt('Post').'"></form><hr />');
+  '<br /><input type="submit" name="serveraction" value="'.&mt('Post').'" /></form><hr />');
     }
     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 +617,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 +645,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();