--- loncom/interface/lonannounce.pm	2003/09/17 19:45:39	1.20
+++ loncom/interface/lonannounce.pm	2004/01/14 16:07:18	1.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.20 2003/09/17 19:45:39 www Exp $
+# $Id: lonannounce.pm,v 1.24 2004/01/14 16:07:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,14 +47,14 @@ sub editfield {
     my $enddateform = &Apache::lonhtmlcommon::date_setter('anno',
                                                           'enddate',
                                                           $end);
-
+    my $help=&Apache::loncommon::help_open_topic('Calendar_Add_Announcement');
     $r->print(<<ENDFORM);
 <form name="anno" method="post">
 <input type="hidden" value=''          name="action"      >
 <table><tr><td>Starting date:</td><td>$startdateform</td></tr>
 <tr><td>Ending date:</td><td>$enddateform</td></tr></table>
 <textarea name="msg" rows="4" cols="60">$text</textarea>
-<input type="button" onClick="trysubmit()" value="Post Announcement"><hr>
+<input type="button" onClick="trysubmit()" value="Post Announcement">$help<hr>
 ENDFORM
 }
 
@@ -84,7 +84,7 @@ sub normalcell {
 	    my ($courseid,$start,$end,@msg)=split(/\@/,$_);
             my $msg=join('@',@msg);
             my $fullmsg=$ENV{'course.'.$courseid.'.description'}.
-		', '.localtime($start).' - '.localtime($end).': '.$msg;
+		', '.&Apache::lonlocal::locallocaltime($start).' - '.&Apache::lonlocal::locallocaltime($end).': '.$msg;
             if ($courseid eq $ENV{'request.course.id'}) {
               if ((&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))
                && (!$showedcheck{$start.'_'.$end})
@@ -212,7 +212,7 @@ ENDDIA
 
 sub handler {
     my $r = shift;
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
 
@@ -418,7 +418,7 @@ SERVERANNOUNCE
     }
     $r->print('</tr>');
 
-    for (my $k=0;$k<=3;$k++) {
+    for (my $k=0;$k<=4;$k++) {
         $r->print('<tr>');
         for (my $i=0;$i<=6;$i++) {
             ($tk,$nm,$outp)=&showday($tk,0,%allcal);
@@ -433,7 +433,8 @@ SERVERANNOUNCE
     %showedcheck=();
     undef %showedcheck;
 # --------------------------------------------------------------- Remove button
-    if ($allowed) { $r->print('<input type="button" onClick="removesub()" value="Remove Checked Entries"></form>'); }
+    if ($allowed) { $r->print('<input type="button" onClick="removesub()" value="Remove Checked Entries">'.
+			      &Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').'</form>'); }
     $r->print('<p>'.
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.