--- loncom/interface/lonannounce.pm	2003/09/03 01:53:46	1.19
+++ loncom/interface/lonannounce.pm	2004/01/15 01:43:43	1.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.19 2003/09/03 01:53:46 www Exp $
+# $Id: lonannounce.pm,v 1.25 2004/01/15 01:43:43 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,6 +32,7 @@ use strict;
 use Apache::Constants qw(:common);
 use Apache::loncommon;
 use Apache::lonhtmlcommon();
+use Apache::lonlocal;
 use HTML::Entities();
 
 my %todayhash;
@@ -46,14 +47,17 @@ sub editfield {
     my $enddateform = &Apache::lonhtmlcommon::date_setter('anno',
                                                           'enddate',
                                                           $end);
-
+    my $help=&Apache::loncommon::help_open_topic('Calendar_Add_Announcement').
+	&Apache::loncommon::help_open_faq(274).
+	&Apache::loncommon::help_open_bug('Communication Tools');
     $r->print(<<ENDFORM);
+$help
 <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"><hr />
 ENDFORM
 }
 
@@ -83,7 +87,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})
@@ -211,7 +215,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;
 
@@ -367,9 +371,12 @@ SERVERANNOUNCE
     if ($pm<1) { ($pm,$py)=(12,$year-1); }
     if ($fm>12){ ($fm,$fy)=(1,$year+1); }
 
-    $r->print('<h1>'.('','January','February','March','April','May',
-		      'June','July','August','September','October',
-                      'November','December')[$month].' '.$year.'</h1>');
+    $r->print('<h1>'.('',&mt('January'),&mt('February'),&mt('March'),
+		      &mt('April'),&mt('May'),
+		      &mt('June'),&mt('July'),&mt('August'),
+                      &mt('September'),&mt('October'),
+                      &mt('November'),&mt('December'))[$month].' '.
+	              $year.'</h1>');
 # Reached the end of times, give up
     if (($year<1970) || ($year>2037)) {
 	$r->print('<h3>No calendar available for this date.</h3>'.
@@ -379,26 +386,26 @@ SERVERANNOUNCE
     }
     $r->print(
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.
- ($pickdatemode?$pickinfo:'').'">Previous Month</a> '.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
  '<a href="/adm/announcements?month='.$fm.'&year='.$fy.
- ($pickdatemode?$pickinfo:'').'">Next Month</a>'.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
  '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
  '&year='.$todayhash{'year'}.
- ($pickdatemode?$pickinfo:'').'">Current Month</a><p>'.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a><p>'.
         '<table border="2" cols="7" rows="5"><tr><th>'.
-&tfont('Sun')
+&tfont(&mt('Sun'))
 .'</th><th>'.
-&tfont('Mon')
+&tfont(&mt('Mon'))
 .'</th><th>'.
-&tfont('Tue')
+&tfont(&mt('Tue'))
 .'</th><th>'.
-&tfont('Wed')
+&tfont(&mt('Wed'))
 .'</th><th>'.
-&tfont('Thu')
+&tfont(&mt('Thu'))
 .'</th><th>'.
-&tfont('Fri')
+&tfont(&mt('Fri'))
 .'</th><th>'.
-&tfont('Sat')
+&tfont(&mt('Sat'))
 .'</th></tr>');
 
     my $tk=&Apache::loncommon::maketime(%firstday);
@@ -414,7 +421,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);
@@ -429,15 +436,16 @@ 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:'').'">Previous Month</a> '.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
  '<a href="/adm/announcements?month='.$fm.'&year='.$fy.
- ($pickdatemode?$pickinfo:'').'">Next Month</a>'.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
  '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
  '&year='.$todayhash{'year'}.
- ($pickdatemode?$pickinfo:'').'">Current Month</a></p>'.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a></p>'.
  ($pickdatemode?'</font>':'').
  '</body></html>');
     return OK;