--- loncom/interface/lonannounce.pm	2003/09/02 21:15:59	1.18
+++ 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.18 2003/09/02 21:15:59 www Exp $
+# $Id: lonannounce.pm,v 1.24 2004/01/14 16:07:18 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,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
 }
 
@@ -83,10 +84,11 @@ 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})) {
+               && (!$showedcheck{$start.'_'.$end})
+	       && ($ENV{'form.pickdate'} ne 'yes')) {
                $output.='<input type="checkbox" name="remove_'.$start.'_'.
 		   $end.'">';
                $showedcheck{$start.'_'.$end}=1;
@@ -102,7 +104,7 @@ sub normalcell {
 	((($day eq $todayhash{'day'}) &&
           ($month eq $todayhash{'month'}) &&
           ($year eq $todayhash{'year'}))?' bgcolor="#FFFF00"':'').
-           '><b>'.$day.'</b><br>'.$output.'</td>';
+           '>'.&tfont('<b>'.&picklink($day,$day,$month,$year).'</b><br>'.$output).'</td>';
 }
 
 sub plaincell {
@@ -171,9 +173,46 @@ sub showday {
    }
 }
 
+sub tfont {
+    my $text=shift;
+    if ($ENV{'form.pickdate'} eq 'yes') {
+	return '<font size="1">'.$text.'</font>';
+    } else {
+	return $text;
+    }
+}
+
+sub picklink {
+    my ($text,$day,$month,$year)=@_;
+    if ($ENV{'form.pickdate'} eq 'yes') {
+	return '<a href="javascript:dialin('.$day.','.$month.','.$year.')">'.
+	    $text.'</a>';
+    } else {
+	return $text;
+    }
+}
+
+sub dialscript {
+    return (<<ENDDIA);
+<script 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;
+    var i;
+    for (i=0;i<slct.length;i++) {
+        if (slct.options[i].value==month) { slct.selectedIndex=i; }
+    }
+    opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_day.value=day;
+    opener.$ENV{'form.element'}\_checkday();
+    self.close();
+}
+</script>
+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;
 
@@ -185,7 +224,7 @@ sub handler {
     undef %showedcheck;
 # ---------------------------------------------------------- Get month and year
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['month','year','pickdate']);
+                             ['month','year','pickdate','formname','element']);
 # --------------------------------------------------- Decide what month to show
     my $year=$todayhash{'year'};
     if ($ENV{'form.year'}) { $year=$ENV{'form.year'}; }
@@ -194,7 +233,8 @@ sub handler {
 
 # ---------------------------------------------- See if we are in pickdate mode
     my $pickdatemode=($ENV{'form.pickdate'} eq 'yes');
-
+    my $pickinfo='&pickdate=yes&formname='.$ENV{'form.formname'}.
+	'&element='.$ENV{'form.element'};
 # --------------------------------------------- Find out first day of the month
 
     my %firstday=&Apache::loncommon::timehash(
@@ -226,6 +266,7 @@ ENDDOCUMENT
     if ($pickdatemode) {
 # no big header in pickdate mode
 	$r->print(&Apache::loncommon::bodytag("Pick a Date",'','',1).
+		  &dialscript().
 		  '<font size="1">');
     } else {
        $r->print(&Apache::loncommon::bodytag("Announcements and Calendar"));
@@ -327,9 +368,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>'.
@@ -339,14 +383,27 @@ SERVERANNOUNCE
     }
     $r->print(
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.
- ($pickdatemode?'&pickdate=yes':'').'">Previous Month</a> '.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
  '<a href="/adm/announcements?month='.$fm.'&year='.$fy.
- ($pickdatemode?'&pickdate=yes':'').'">Next Month</a>'.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
  '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
  '&year='.$todayhash{'year'}.
- ($pickdatemode?'&pickdate=yes':'').'">Current Month</a><p>'.
-        '<table border="2" cols="7" rows="5"><tr><th>Sun</th><th>Mon</th>'.
-        '<th>Tue</th><th>Wed</th><th>Thu</th><th>Fri</th><th>Sat</th></tr>');
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a><p>'.
+        '<table border="2" cols="7" rows="5"><tr><th>'.
+&tfont(&mt('Sun'))
+.'</th><th>'.
+&tfont(&mt('Mon'))
+.'</th><th>'.
+&tfont(&mt('Tue'))
+.'</th><th>'.
+&tfont(&mt('Wed'))
+.'</th><th>'.
+&tfont(&mt('Thu'))
+.'</th><th>'.
+&tfont(&mt('Fri'))
+.'</th><th>'.
+&tfont(&mt('Sat'))
+.'</th></tr>');
 
     my $tk=&Apache::loncommon::maketime(%firstday);
     my $outp;
@@ -361,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);
@@ -376,15 +433,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?'&pickdate=yes':'').'">Previous Month</a> '.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
  '<a href="/adm/announcements?month='.$fm.'&year='.$fy.
- ($pickdatemode?'&pickdate=yes':'').'">Next Month</a>'.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
  '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
  '&year='.$todayhash{'year'}.
- ($pickdatemode?'&pickdate=yes':'').'">Current Month</a></p>'.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a></p>'.
  ($pickdatemode?'</font>':'').
  '</body></html>');
     return OK;