--- loncom/interface/lonannounce.pm	2006/06/29 16:44:49	1.57
+++ loncom/interface/lonannounce.pm	2006/11/29 07:46:39	1.62
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.57 2006/06/29 16:44:49 albertel Exp $
+# $Id: lonannounce.pm,v 1.62 2006/11/29 07:46:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -80,9 +80,13 @@ sub readcalendar {
 	   $returnhash{$courseid.'@'.$item}=$thiscal{$item};
         }
     }
-
-    my $can_see_hidden = $env{'request.role.adv'};
-    my $navmap;# = Apache::lonnavmaps::navmap->new();
+    my $can_see_hidden = ($env{'request.role.adv'} &&
+			  ($courseid eq $env{'request.course.id'}));
+    
+    my $navmap;
+    if ($courseid eq $env{'request.course.id'}) {
+	$navmap = Apache::lonnavmaps::navmap->new();
+    }
     my %resourcedata=
 	&Apache::lonnet::dump('resourcedata',$coursedom,$coursenum);
     foreach my $thiskey (sort keys %resourcedata) {
@@ -279,10 +283,16 @@ sub display_msg {
 
     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;
@@ -348,7 +358,8 @@ ENDDIA
 # ----------------------------------------------------- Summarize all calendars
 sub get_all_calendars {
     my %allcal=();
-    foreach my $course (sort(&Apache::loncommon::findallcourses())) {
+    my %courses = &Apache::loncommon::findallcourses();
+    foreach my $course (sort(keys(%courses))) {
 	%allcal=(%allcal,&readcalendar($course));
     }
     return %allcal;
@@ -485,9 +496,9 @@ SERVERANNOUNCE
 # list servers
     foreach my $host (sort(keys(%Apache::lonnet::hostname))) {
 	if (&Apache::lonnet::allowed('psa',$Apache::lonnet::hostdom{$host})) {
-	    $r->print ('<br /><input type="checkbox" name="postto_'.$host.'" /> '.
+	    $r->print ('<br /><label><input type="checkbox" name="postto_'.$host.'" /> '.
 		       $host.' <tt>'.$Apache::lonnet::hostname{$host}.'</tt> '.
-		       '<a href="http://'.$Apache::lonnet::hostname{$host}.
+		       '</label><a href="http://'.$Apache::lonnet::hostname{$host}.
 		       '/announcement.txt" target="annowin">current</a>');
 	}
     }