--- loncom/interface/lonannounce.pm	2006/03/21 20:45:35	1.47
+++ loncom/interface/lonannounce.pm	2006/04/23 07:16:07	1.51
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.47 2006/03/21 20:45:35 albertel Exp $
+# $Id: lonannounce.pm,v 1.51 2006/04/23 07:16:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -155,12 +155,12 @@ sub readcalendar {
 }
 
 sub emptycell {
-    return '<td bgcolor="#AAAAAA">&nbsp;</td>';
+    return '<td class="LC_calendar_day_empty">&nbsp;</td>';
 }
 
 sub normalcell {
     my ($day,$month,$year,$text)=@_;
-    my $output='';
+    my $output;
     my @items=&order($text);
     foreach my $item (@items) {
         if ($item) {
@@ -189,20 +189,22 @@ sub normalcell {
 	    $fullmsg=~s/[\n\r]/\\n/gs;
             $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\'');
             $fullmsg=~s/&/\\&/g;
+	    my $short_msg = substr($msg,0,20).((length($msg) > 20)?'...':'');
+	    if (defined($output)) { $output.='<br />'; }
             $output.='<a href="javascript:alert('."'$fullmsg'".')">'.
-	       substr($msg,0,20).'...</a><br />';
+	       $short_msg.'</a>';
        }
     }
-    return '<td valign="top"'.
+    return '<td class="LC_calendar_day'.
 	((($day eq $todayhash{'day'}) &&
           ($month eq $todayhash{'month'}) &&
-          ($year eq $todayhash{'year'}))?' bgcolor="#FFFF00"':'').
-           '>'.&tfont('<b>'.&picklink($day,$day,$month,$year).'</b><br />'.$output).'</td>';
+          ($year eq $todayhash{'year'}))?'_current':'').
+           '" ><b>'.&picklink($day,$day,$month,$year).'</b><br />'.$output.'</td>';
 }
 
 sub plaincell {
     my ($text)=@_;
-    my $output='';
+    my $output;
     my @items=&order($text);
     foreach my $item (@items) {
         if ($item) {
@@ -217,8 +219,10 @@ sub plaincell {
  	    $fullmsg=~s/[\n\r]/\\n/gs;
             $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\'');
             $fullmsg=~s/&/\\&/g;
+	    my $short_msg = substr($msg,0,80).((length($msg) > 80)?'...':'');
+	    if (defined($output)) { $output.='<br />'; }
             $output.='<a href="javascript:alert('."'$fullmsg'".')">'.
-	       substr($msg,0,80).'...</a><br />';
+	       $short_msg.'</a>';
        }
     }
     return $output;
@@ -295,15 +299,6 @@ 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') {
@@ -342,8 +337,7 @@ sub handler {
     my $today=time;
     %todayhash=&Apache::loncommon::timehash($today);
 # ----------------------------------------------------------------- Check marks
-    %showedcheck=();
-    undef %showedcheck;
+    undef(%showedcheck);
 # ---------------------------------------------------------- Get month and year
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                              ['month','year','pickdate','formname','element']);
@@ -366,7 +360,6 @@ sub handler {
                                      'dlsav' => -1 ));
     my $weekday=$firstday{'weekday'};
 # ------------------------------------------------------------ Print the screen
-    my $html=&Apache::lonxml::xmlbegin();
     my $js = <<ENDDOCUMENT;
 <script type="text/javascript">
 
@@ -487,7 +480,7 @@ SERVERANNOUNCE
     }
 # ----------------------------------------------------- Summarize all calendars
     my %allcal=();
-    foreach my $course (&Apache::loncommon::findallcourses()) {
+    foreach my $course (sort(&Apache::loncommon::findallcourses())) {
 	%allcal=(%allcal,&readcalendar($course));
     }
 
@@ -510,6 +503,11 @@ SERVERANNOUNCE
 		  &Apache::loncommon::end_page());
 	return OK;
     }
+
+    my $class = "LC_calendar";
+    if ($env{'form.pickdate'} eq 'yes') {
+	$class .= " LC_calendar_pickdate";
+    }
     $r->print(
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
@@ -518,21 +516,14 @@ SERVERANNOUNCE
  '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
  '&year='.$todayhash{'year'}.
  ($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>');
+        '<table class="'.$class.'" cols="7" rows="5"><tr>
+<th>'.&mt('Sun').'</th>
+<th>'.&mt('Mon').'</th>
+<th>'.&mt('Tue').'</th>
+<th>'.&mt('Wed').'</th>
+<th>'.&mt('Thu').'</th>
+<th>'.&mt('Fri').'</th>
+<th>'.&mt('Sat').'</th></tr>');
 
     my $tk=&Apache::loncommon::maketime(%firstday);
     my $outp;
@@ -559,8 +550,7 @@ SERVERANNOUNCE
 # ------------------------------------------------------------------- End table
     $r->print('</table>');
 # ----------------------------------------------------------------- Check marks
-    %showedcheck=();
-    undef %showedcheck;
+    undef(%showedcheck);
 # --------------------------------------------------------------- Remove button
     if ($allowed) { $r->print('<input type="button" onClick="removesub()" value="Remove Checked Entries">'.
 			      &Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').'</form>'); }