--- loncom/xml/londefdef.pm	2009/05/28 12:39:12	1.408
+++ loncom/xml/londefdef.pm	2010/08/16 16:14:32	1.415.4.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.408 2009/05/28 12:39:12 bisitz Exp $
+# $Id: londefdef.pm,v 1.415.4.1 2010/08/16 16:14:32 raeburn Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -540,14 +540,20 @@ 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'  => '',
+        });
+        # breadcrumbs (and tools) will be created 
+        # in start_page->bodytag->innerregister
+    } else {
+        # FIXME Where are we?
+    }
 
 	$currentstring = 
 	    &Apache::loncommon::start_page($Apache::londefdef::title,
@@ -557,16 +563,21 @@ 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::loncommon::head_subbox(
-                            &Apache::loncommon::CSTR_pageheader()
-                           .$header);
         $currentstring.=&Apache::lonxml::message_location();
     } elsif ($target eq 'tex') {
         $currentstring = '';   #  '\begin{document}' is in header.
@@ -588,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>
 ';
@@ -2033,26 +2048,36 @@ sub start_table {
 	my $width  = &Apache::lonxml::get_param('TeXwidth', $parstack, $safeeval, undef, 0);
 	my $theme  = &Apache::lonxml::get_param('TeXtheme', $parstack, $safeeval, undef, 0);
 	my $align  = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 0);
+        my $cell_border = &Apache::lonxml::get_param('rules', $parstack, $safeeval, undef, 0);
 
 	# The only thing that needs any figuring out is the width.. and then only if it is
 	# a percent. If not it's assumed to be some valid TeX measurement unit e.g. 3.0cm
 	#
 
 	my $table = new Apache::lontable();
-	if ($border ne '') {
-	    $table->table_border(1);
+        if ((defined $border) && ($border > 0)) {
+        #    &Apache::lonnet::logthis("Turning on table borders: $border");
+            $table->table_border(1);
+            if ($cell_border ne 'none') {
+                $table->cell_border(1); # html specs that border turns on both...unless rules='none'.
+            }
+        }
+        # Only all or nothing for cell borders for now:
+
+        if ((defined $cell_border) && ($cell_border ne 'none')) {
+        #    &Apache::lonnet::logthis("Turning on cell borders: $cell_border");
 	    $table->cell_border(1);
 	}
-	if ($theme ne '') {
+        if (defined $theme) {
 	    $table->theme($theme);
 	}
-	if ($align ne '') {
+	if (defined $align) {
 	    $table->alignment($align);
 	}
 
 	# Missing width is most of page width
 
-	if ($width eq "") {
+	if (!(defined $width)) {
 	    $width = '70%';
 	}
 	
@@ -3260,21 +3285,28 @@ sub start_img {
 						   ['','bottom','middle','top','left','right'],$token,5);
 	$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap',
 						   ['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2);
+        my $alt=    &Apache::lonxml::get_param('alt',$parstack,$safeeval);
+        my $enc=    &Apache::lonxml::get_param('encrypturl',$parstack,$safeeval);
+
 	$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl',
 						   ['no','yes'], $token, 2);
+        if (($alt=~/\S/) && (lc($enc) eq 'yes')) {
+           $currentstring.='<br /><span class="LC_warning">'.&mt('Warning: the description "[_1]" will be available, even for encrypted URL',$alt).'</span><br />';
+        }
 	$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
 	my $src=    &Apache::lonxml::get_param('src',$parstack,$safeeval);
-	my $alt=    &Apache::lonxml::get_param('alt',$parstack,$safeeval);
 	my $width=  &Apache::lonxml::get_param('width',$parstack,$safeeval);
 	my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
 
         if ($token->[2]{'src'}=~/\$/) {
-           $currentstring.='Variable image source';
+           $currentstring.=&mt('Variable image source');
+        } elsif ($token->[2]{'src'}=~/\S/) {
+           $currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
+           if ($width) { $currentstring.=' width="'.$width.'" '; }
+           if ($height) { $currentstring.=' height="'.$height.'" '; }
+           $currentstring .= ' />';
         } else {
-	   $currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
-	   if ($width) { $currentstring.=' width="'.$width.'" '; }
-	   if ($height) { $currentstring.=' height="'.$height.'" '; }
-	   $currentstring .= ' />';
+           $currentstring.=&mt("No image source specified");
         }
     } elsif ($target eq 'modified') {
 	my ($osrc,$owidth,$oheight)=
@@ -4736,7 +4768,7 @@ sub align_latex_image {
     #    Even though we set a default alignment value, the user
     #    could have given us an illegal value.  In that case we
     #    just use the default alignment of bottom..
-    $currentstring = "\n% figurewrapping \n";
+    $currentstring = '';
     if      ($align eq "top")    {
 	$currentstring .= '\raisebox{-'.$height.'mm}{'.$image;
 	$closure = '}';
@@ -4779,8 +4811,6 @@ sub align_latex_image {
 	$currentstring .= "{$image";
 	$closure       = '}';
     }
-    $currentstring .= "\n% end wrappage\n";
-    $closure        = "\n% Begin closure\n".$closure."\n% End closure\n";
     return ($currentstring, $closure);
 }
 
@@ -4800,8 +4830,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 = '';