[LON-CAPA-cvs] cvs: loncom /interface lonannounce.pm

[www]

www		Mon Jul  3 11:30:53 2006 EDT

  Modified files:              
    /loncom/interface	lonannounce.pm 
  Log:
  Bug #4850: don't display filenames or symbs as titles in announcements, but do
  display the fact that there is a deadline, etc.
  
  
Index: loncom/interface/lonannounce.pm
diff -u loncom/interface/lonannounce.pm:1.58 loncom/interface/lonannounce.pm:1.59
--- loncom/interface/lonannounce.pm:1.58	Sun Jul  2 23:11:07 2006
+++ loncom/interface/lonannounce.pm	Mon Jul  3 11:30:52 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.58 2006/07/03 03:11:07 albertel Exp $
+# $Id: lonannounce.pm,v 1.59 2006/07/03 15:30:52 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -80,9 +80,6 @@
 	   $returnhash{$courseid.'@'.$item}=$thiscal{$item};
         }
     }
-
-    return %returnhash if ($courseid ne $env{'request.course.id'});
-
     my $can_see_hidden = $env{'request.role.adv'};
     my $navmap;# = Apache::lonnavmaps::navmap->new();
     my %resourcedata=
@@ -281,10 +278,16 @@
 
     my $output = $msg->{'datetype'}. ': '.$msg->{'realm'};
     if (exists($msg->{'url'})) {
-	$output .= ': '.&Apache::lonnet::gettitle($msg->{'url'});
+	my $displayurl=&Apache::lonnet::gettitle($msg->{'url'});
+	if ($msg->{'url'}!~/\Q$displayurl\E$/) {
+	    $output .= ' - '.$displayurl;
+	}
     }
     if (exists($msg->{'symb'})) {
-	$output .= ': '.&Apache::lonnet::gettitle($msg->{'symb'});
+	my $displaysymb=&Apache::lonnet::gettitle($msg->{'symb'});
+	if ($msg->{'symb'}!~/\Q$displaysymb\E$/) {
+	    $output .= ' - '.$displaysymb;
+	}
     }
     $output .= ' ('.$msg->{'section'}.') ';
     return $output;