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

[www]

www		Tue Jan 15 11:53:28 2008 EDT

  Modified files:              
    /loncom/interface	loncommon.pm lonmenu.pm 
  Log:
  Bug #5541: don't double-display course title in location bar of top-level resource
  Bug #5565: show location bar, even if new messages are present
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.633 loncom/interface/loncommon.pm:1.634
--- loncom/interface/loncommon.pm:1.633	Sat Jan  5 23:38:57 2008
+++ loncom/interface/loncommon.pm	Tue Jan 15 11:53:27 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.633 2008/01/06 04:38:57 raeburn Exp $
+# $Id: loncommon.pm,v 1.634 2008/01/15 16:53:27 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4404,6 +4404,7 @@
 }
 .LC_new_mail {
   font-family: $sans;
+  background: $tabbg;
   font-weight: bold;
 }
 
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.232 loncom/interface/lonmenu.pm:1.233
--- loncom/interface/lonmenu.pm:1.232	Mon Jan 14 09:32:30 2008
+++ loncom/interface/lonmenu.pm	Tue Jan 15 11:53:27 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.232 2008/01/14 14:32:30 raeburn Exp $
+# $Id: lonmenu.pm,v 1.233 2008/01/15 16:53:27 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -349,16 +349,18 @@
 	} else {
 	    $newmail= 'swmenu.setstatus("you have","messages");';
 	}
-    } elsif (($textual) 
+    } 
+    if (($textual) 
 	     && ($env{'request.symb'}) 
 	     && ($env{'request.course.id'})) {
 	$newmail.= '<td class="LC_current_location">';
 	my ($mapurl,$rid,$resurl)=
 	    &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
-        $newmail.=$env{'course.'.$env{'request.course.id'}.'.description'};
+        my $coursetitle=$env{'course.'.$env{'request.course.id'}.'.description'};
+        $newmail.=$coursetitle;
         my $maptitle=&Apache::lonnet::gettitle($mapurl);
 	my $restitle=&Apache::lonnet::gettitle(&Apache::lonnet::symbread());
-        if ($maptitle && $maptitle ne 'default.sequence') {
+        if ($maptitle && ($maptitle ne 'default.sequence') && ($maptitle ne $coursetitle)) {
 	    $newmail.=', '.$maptitle;
         }
         if ($restitle) {