--- loncom/interface/lonannounce.pm	2006/04/22 16:32:55	1.49
+++ 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.49 2006/04/22 16:32:55 albertel Exp $
+# $Id: lonannounce.pm,v 1.51 2006/04/23 07:16:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -160,7 +160,7 @@ sub emptycell {
 
 sub normalcell {
     my ($day,$month,$year,$text)=@_;
-    my $output='';
+    my $output;
     my @items=&order($text);
     foreach my $item (@items) {
         if ($item) {
@@ -189,8 +189,10 @@ 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 class="LC_calendar_day'.
@@ -202,7 +204,7 @@ sub normalcell {
 
 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;