--- loncom/xml/londefdef.pm	2009/06/02 13:10:29	1.410
+++ loncom/xml/londefdef.pm	2010/01/30 21:46:06	1.414
@@ -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.414 2010/01/30 21:46:06 raeburn Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -549,6 +549,8 @@ sub start_body {
             'text'  => 'HTML Editor',
             'href'  => '',
         });
+        # breadcrumbs (and tools) will be created 
+        # in start_page->bodytag->innerregister
     } else {
         # FIXME Where are we?
     }
@@ -561,17 +563,20 @@ sub start_body {
 #					    'no_title'       => 1,
 					    'force_register' => 1});
 
-    $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);
+        } elsif ($env{'request.state'} eq 'edit') {
+            $currentstring.=&Apache::loncommon::head_subbox($header);
         }
         $currentstring.=&Apache::lonxml::message_location();
     } elsif ($target eq 'tex') {
@@ -594,7 +599,11 @@ sub edit_controls {
 </div>';
     }
     $result .= '
-<div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" /></div>
+<div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" />';
+    if (($env{'request.course.id'}) && ($env{'form.forceedit'})) {
+        $result .= ('&nbsp;' x 3).'<input type="button" value="'.&mt('Course View').'" onclick="javascript:location.href=currentURL" />';
+    }
+    $result .= '</div>
 </div>
 </form>
 ';
@@ -4806,8 +4815,7 @@ sub is_inside_of {
 #
 #   This sub provides the typical LaTeX prefix matter for tex output:
 #
-sub latex_header
-{
+sub latex_header {
     my ($mode) = @_;
     my $currentstring = '';