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

bisitz bisitz@source.lon-capa.org
Tue, 01 Dec 2009 18:34:03 -0000


bisitz		Tue Dec  1 18:34:03 2009 EDT

  Modified files:              
    /loncom/interface	lonmeta.pm 
  Log:
  Bug 6137: No double menu/breadcrumbs for CSTR bombs screen
  
  
Index: loncom/interface/lonmeta.pm
diff -u loncom/interface/lonmeta.pm:1.237 loncom/interface/lonmeta.pm:1.238
--- loncom/interface/lonmeta.pm:1.237	Tue Dec  1 18:07:50 2009
+++ loncom/interface/lonmeta.pm	Tue Dec  1 18:34:02 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.237 2009/12/01 18:07:50 bisitz Exp $
+# $Id: lonmeta.pm,v 1.238 2009/12/01 18:34:02 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -744,8 +744,14 @@
 
 # Create pageheader
 sub pageheader {
-    my $output = &Apache::lonhtmlcommon::breadcrumbs();
-
+    my $output = '';
+    # No CSTR? Include breadcrumbs
+    if ($env{'request.state'} ne 'construct') {
+        # loncommon::bodytag already includes breadcrumbs for CSTR
+        # by calling lonmenu::innerregister
+        $output = &Apache::lonhtmlcommon::breadcrumbs();
+    }
+    # CSTR? Include CSTR header
     if ($env{'request.state'} eq 'construct') {
           $output .= &Apache::loncommon::head_subbox(
                          &Apache::loncommon::CSTR_pageheader());