[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm

[bisitz]

bisitz		Tue May 26 14:54:29 2009 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  Moved edit_controls to pageheader
  (Tidy up CSS needed - work in progress)
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.406 loncom/xml/londefdef.pm:1.407
--- loncom/xml/londefdef.pm:1.406	Tue May 26 14:06:23 2009
+++ loncom/xml/londefdef.pm	Tue May 26 14:54:29 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.406 2009/05/26 14:06:23 bisitz Exp $
+# $Id: londefdef.pm,v 1.407 2009/05/26 14:54:29 bisitz Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -557,18 +557,21 @@
 #					    'no_title'       => 1,
 					    'force_register' => 1});
 
-    $currentstring .= &Apache::lonhtmlcommon::breadcrumbs()
-                     .&Apache::loncommon::head_subbox(
-                          &Apache::loncommon::CSTR_pageheader()); 
+    $currentstring .= &Apache::lonhtmlcommon::breadcrumbs();
 
-	if ($env{'request.state'} ne 'published') {
-	    $currentstring.=&Apache::lonmenu::constspaceform();
-	    $currentstring.=&Apache::londefdef::edit_controls();
-	}
-	$currentstring.=&Apache::lonxml::message_location();
+        my $header = '';
+        if ($env{'request.state'} ne 'published') {
+            $header=&Apache::lonmenu::constspaceform()
+                   .&Apache::londefdef::edit_controls();
+        }
+        $currentstring.=&Apache::loncommon::head_subbox(
+                            &Apache::loncommon::CSTR_pageheader()
+                           .$header);
+        $currentstring.=&Apache::lonxml::message_location();
     } elsif ($target eq 'tex') {
-	$currentstring = '';   #  '\begin{document}' is in header.
-    } 
+        $currentstring = '';   #  '\begin{document}' is in header.
+    }
+
     return $currentstring;
 }