--- loncom/interface/lonannounce.pm	2003/09/02 21:15:59	1.18
+++ loncom/interface/lonannounce.pm	2003/09/03 01:53:46	1.19
@@ -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.19 2003/09/03 01:53:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,7 +86,8 @@ sub normalcell {
 		', '.localtime($start).' - '.localtime($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 +103,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,6 +172,43 @@ 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');
@@ -185,7 +223,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 +232,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 +265,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"));
@@ -339,14 +379,27 @@ SERVERANNOUNCE
     }
     $r->print(
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.
- ($pickdatemode?'&pickdate=yes':'').'">Previous Month</a> '.
+ ($pickdatemode?$pickinfo:'').'">Previous Month</a> '.
  '<a href="/adm/announcements?month='.$fm.'&year='.$fy.
- ($pickdatemode?'&pickdate=yes':'').'">Next Month</a>'.
+ ($pickdatemode?$pickinfo:'').'">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:'').'">Current Month</a><p>'.
+        '<table border="2" cols="7" rows="5"><tr><th>'.
+&tfont('Sun')
+.'</th><th>'.
+&tfont('Mon')
+.'</th><th>'.
+&tfont('Tue')
+.'</th><th>'.
+&tfont('Wed')
+.'</th><th>'.
+&tfont('Thu')
+.'</th><th>'.
+&tfont('Fri')
+.'</th><th>'.
+&tfont('Sat')
+.'</th></tr>');
 
     my $tk=&Apache::loncommon::maketime(%firstday);
     my $outp;
@@ -379,12 +432,12 @@ SERVERANNOUNCE
     if ($allowed) { $r->print('<input type="button" onClick="removesub()" value="Remove Checked Entries"></form>'); }
     $r->print('<p>'.
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.
- ($pickdatemode?'&pickdate=yes':'').'">Previous Month</a> '.
+ ($pickdatemode?$pickinfo:'').'">Previous Month</a> '.
  '<a href="/adm/announcements?month='.$fm.'&year='.$fy.
- ($pickdatemode?'&pickdate=yes':'').'">Next Month</a>'.
+ ($pickdatemode?$pickinfo:'').'">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:'').'">Current Month</a></p>'.
  ($pickdatemode?'</font>':'').
  '</body></html>');
     return OK;