[LON-CAPA-cvs] cvs: loncom /homework edit.pm structuretags.pm

[raeburn]

raeburn		Mon Aug 25 23:18:29 2008 EDT

  Modified files:              
    /loncom/homework	structuretags.pm edit.pm 
  Log:
  Better fix so textarea in a "text block" in colorful edit mode extends fully to the right.
  - Putting back the insertlist removed in 1.426 (future functionality might need it).
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.428 loncom/homework/structuretags.pm:1.429
--- loncom/homework/structuretags.pm:1.428	Thu Aug 21 16:46:23 2008
+++ loncom/homework/structuretags.pm	Mon Aug 25 23:18:29 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.428 2008/08/21 20:46:23 raeburn Exp $
+# $Id: structuretags.pm,v 1.429 2008/08/26 03:18:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1887,7 +1887,6 @@
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     my $text='';
-
     if ($target eq 'edit') {
 	my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth;
 	$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
@@ -1898,7 +1897,10 @@
         unless ($env{'environment.wysiwygeditor'} eq 'on') {
             $result.='<td align="left">'
                      .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
-                     .'</td>';
+		     .'</td>'
+                     .'<td>'
+                     .&Apache::edit::insertlist($target,$token)
+		     .'</td>';
         }
 	$result.='<td align="right" valign="top">' .
 		 &Apache::loncommon::helpLatexCheatsheet().
Index: loncom/homework/edit.pm
diff -u loncom/homework/edit.pm:1.114 loncom/homework/edit.pm:1.115
--- loncom/homework/edit.pm:1.114	Tue Mar 11 22:46:52 2008
+++ loncom/homework/edit.pm	Mon Aug 25 23:18:29 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.114 2008/03/12 02:46:52 raeburn Exp $
+# $Id: edit.pm,v 1.115 2008/08/26 03:18:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -128,7 +128,7 @@
     return $result;
 }
 
-sub start_spanning_row { return '<tr><td colspan="4" bgcolor="#DDDDDD">';}
+sub start_spanning_row { return '<tr><td colspan="5" bgcolor="#DDDDDD">';}
 sub start_row          { return '<tr><td bgcolor="#DDDDDD">';            }
 sub end_row            { return '</td></tr>';          }