--- loncom/xml/londefdef.pm	2009/05/26 14:54:29	1.407
+++ loncom/xml/londefdef.pm	2009/10/01 15:31:24	1.411
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.407 2009/05/26 14:54:29 bisitz Exp $
+# $Id: londefdef.pm,v 1.411 2009/10/01 15:31:24 bisitz Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -540,14 +540,18 @@ sub start_body {
 
     # Breadcrumbs
     &Apache::lonhtmlcommon::clear_breadcrumbs();
-    &Apache::lonhtmlcommon::add_breadcrumb({
-        'text'  => 'Construction Space',
-        'href'  => '', # FIXME Add link to /priv/[user]
-    });
-    &Apache::lonhtmlcommon::add_breadcrumb({
-        'text'  => 'HTML Editor',
-        'href'  => '',
-    });    
+    if ($env{'request.state'} eq 'construct') {
+        &Apache::lonhtmlcommon::add_breadcrumb({
+            'text'  => 'Construction Space',
+            'href'  => &Apache::loncommon::authorspace(),
+        });
+        &Apache::lonhtmlcommon::add_breadcrumb({
+            'text'  => 'HTML Editor',
+            'href'  => '',
+        });
+    } else {
+        # FIXME Where are we?
+    }
 
 	$currentstring = 
 	    &Apache::loncommon::start_page($Apache::londefdef::title,
@@ -560,13 +564,18 @@ sub start_body {
     $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(
+                                &Apache::loncommon::CSTR_pageheader()
+                               .$header);
         }
-        $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.
@@ -588,9 +597,10 @@ sub edit_controls {
 </div>';
     }
     $result .= '
-<div class="LC_edit_problem_header_edit_row"><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" /></div></div>
+<div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" /></div>
+</div>
 </form>
-<br />';
+';
     return $result;
 }