[Zope-Checkins] CVS: Zope/lib/python/OFS/dtml - documentEdit.dtml:1.9.16.1 fileEdit.dtml:1.8.16.1

Andreas Jung andreas@andreas-jung.com
Sun, 6 Jul 2003 06:48:02 -0400


Update of /cvs-repository/Zope/lib/python/OFS/dtml
In directory cvs.zope.org:/tmp/cvs-serv8776/lib/python/OFS/dtml

Modified Files:
      Tag: Zope-2_7-branch
	documentEdit.dtml fileEdit.dtml 
Log Message:
     - Collector #628: Applied patch to fix several textarea resize
       problems.


=== Zope/lib/python/OFS/dtml/documentEdit.dtml 1.9 => 1.9.16.1 ===
--- Zope/lib/python/OFS/dtml/documentEdit.dtml:1.9	Sun Dec 22 12:53:59 2002
+++ Zope/lib/python/OFS/dtml/documentEdit.dtml	Sun Jul  6 06:47:26 2003
@@ -25,16 +25,14 @@
 
 <tr>
   <td align="left" valign="top" colspan="2">
-  <dtml-let cols="REQUEST.get('dtpref_cols', '100%')">
+  <dtml-let cols="REQUEST.get('dtpref_cols', '100%')"
+            rows="REQUEST.get('dtpref_rows', '20')">
     <dtml-if expr="cols[-1]=='%'">
-      <textarea name="data:text" wrap="off" style="width:&dtml-cols;"
-                rows="<dtml-var dtpref_rows missing="20" html_quote>"
-      ><dtml-var __str__></textarea>
+      <textarea name="data:text" wrap="off" style="width: &dtml-cols;;"
     <dtml-else>
       <textarea name="data:text" wrap="off" cols="&dtml-cols;"
-                rows="<dtml-var dtpref_rows missing="20" html_quote>"
-      ><dtml-var __str__></textarea>      
     </dtml-if>
+                rows="&dtml-rows;"><dtml-var __str__></textarea>      
   </dtml-let>
   </td>
 </tr>


=== Zope/lib/python/OFS/dtml/fileEdit.dtml 1.8 => 1.8.16.1 ===
--- Zope/lib/python/OFS/dtml/fileEdit.dtml:1.8	Sun Dec 22 12:53:59 2002
+++ Zope/lib/python/OFS/dtml/fileEdit.dtml	Sun Jul  6 06:47:26 2003
@@ -52,9 +52,15 @@
 <tr>
   <td align="left" valign="top" colspan="2">
   <div style="width: 100%;">
-  <textarea name="filedata:text" wrap="off" style="width: 100%;"<dtml-if 
-   dtpref_cols> cols="&dtml-dtpref_cols;"<dtml-else
-   > cols="50"</dtml-if><dtml-if dtpref_rows> rows="&dtml-dtpref_rows;"<dtml-else> rows="20"</dtml-if>><dtml-var __str__ html_quote></textarea>
+  <dtml-let cols="REQUEST.get('dtpref_cols', '100%')"
+            rows="REQUEST.get('dtpref_rows', '20')">
+  <dtml-if "cols[-1]=='%'">
+  <textarea name="filedata:text" wrap="off" style="width: &dtml-cols;;"
+  <dtml-else>
+  <textarea name="filedata:text" wrap="off" cols="&dtml-cols;"
+  </dtml-if>
+            rows="&dtml-rows;"><dtml-var __str__ html_quote></textarea>
+  </dtml-let>
   </div>
   </td>
 </tr>