[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncommon.pm

[raeburn]

raeburn		Sat Dec 22 16:03:26 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11
    - Remove unused code -- $messages
    - Bookmarks no longer used
    - Backport change in rev 1.1096, omitted from earlier backport (1.1075.2.15).
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.21 loncom/interface/loncommon.pm:1.1075.2.22
--- loncom/interface/loncommon.pm:1.1075.2.21	Sat Dec 22 15:53:00 2012
+++ loncom/interface/loncommon.pm	Sat Dec 22 16:03:25 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.21 2012/12/22 15:53:00 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.22 2012/12/22 16:03:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5026,8 +5026,6 @@
     }
 
     if (!$realm) { $realm=' '; }
-# Set messages
-    my $messages=&domainlogo($domain);
 
     my $extra_body_attr = &make_attr_string($forcereg,\%design);
 
@@ -5089,13 +5087,11 @@
 
 
         if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
-            unless ($env{'request.noversionuri'} =~ m{/res/adm/pages/bookmarkmenu/}) {
-                if ($dc_info) {
-                     $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
-                }
-                $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
-                               <em>$realm</em> $dc_info</div>|;
+            if ($dc_info) {
+                 $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
             }
+            $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
+                           <em>$realm</em> $dc_info</div>|;
             return $bodytag;
         }
 
@@ -5122,7 +5118,8 @@
                 $bodytag .= &Apache::lonmenu::innerregister($forcereg,
                                 $args->{'bread_crumbs'});
             } elsif ($forcereg) { 
-                $bodytag .= &Apache::lonmenu::innerregister($forcereg);
+                $bodytag .= &Apache::lonmenu::innerregister($forcereg,undef,
+                                                            $args->{'group'});
             } else {
                 my $forbodytag;
                 &Apache::lonmenu::prepare_functions($env{'request.noversionuri'},