[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm
bisitz
bisitz@source.lon-capa.org
Thu, 01 Oct 2009 15:31:24 -0000
bisitz Thu Oct 1 15:31:24 2009 EDT
Modified files:
/loncom/xml londefdef.pm
Log:
Fixed bug 6015:
Menu links (e.g. Publish) work again for HTML pages in CSTR.
CSTR_pageheader includes a lonmenu::constspaceform() call.
Don't call lonmenu::constspaceform() again when CSTR_pageheader is called.
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.410 loncom/xml/londefdef.pm:1.411
--- loncom/xml/londefdef.pm:1.410 Tue Jun 2 13:10:29 2009
+++ loncom/xml/londefdef.pm Thu Oct 1 15:31:24 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.410 2009/06/02 13:10:29 bisitz Exp $
+# $Id: londefdef.pm,v 1.411 2009/10/01 15:31:24 bisitz Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -564,9 +564,12 @@
$currentstring .= &Apache::lonhtmlcommon::breadcrumbs();
my $header = '';
+ if ($env{'request.state'} ne 'published' &&
+ $env{'request.state'} ne 'construct') {
+ $header=&Apache::lonmenu::constspaceform();
+ }
if ($env{'request.state'} ne 'published') {
- $header=&Apache::lonmenu::constspaceform()
- .&Apache::londefdef::edit_controls();
+ $header.=&Apache::londefdef::edit_controls();
}
if ($env{'request.state'} eq 'construct') {
$currentstring.=&Apache::loncommon::head_subbox(