[Zope-Checkins] CVS: Zope/lib/python/OFS/dtml - documentEdit.dtml:1.8.22.2 properties.dtml:1.8.18.6 propertysheets.dtml:1.2.218.1

[Andreas Jung]

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

Modified Files:
      Tag: Zope-2_6-branch
	documentEdit.dtml properties.dtml propertysheets.dtml 
Log Message:
     - Collector #1058: Several fixes for PropertySheets when used
       outside ZClasses


=== Zope/lib/python/OFS/dtml/documentEdit.dtml 1.8.22.1 => 1.8.22.2 ===
--- Zope/lib/python/OFS/dtml/documentEdit.dtml:1.8.22.1	Sun Dec 22 11:16:15 2002
+++ Zope/lib/python/OFS/dtml/documentEdit.dtml	Mon Sep 29 08:11:37 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/properties.dtml 1.8.18.5 => 1.8.18.6 ===
--- Zope/lib/python/OFS/dtml/properties.dtml:1.8.18.5	Fri Jan 31 03:39:09 2003
+++ Zope/lib/python/OFS/dtml/properties.dtml	Mon Sep 29 08:11:37 2003
@@ -59,6 +59,7 @@
 </tr>
 
 <dtml-in propertyMap mapping>
+<dtml-let type="not _.has_key('type') and 'string' or type">
 <tr>
   <td align="left" valign="top" width="16">
   <dtml-if "'d' in _['sequence-item'].get('mode', 'awd')">
@@ -177,6 +178,7 @@
   </div>
   </td>
 </tr>
+</dtml-let>
 </dtml-in>
 <tr>
   <td colspan="2">&nbsp;</td>


=== Zope/lib/python/OFS/dtml/propertysheets.dtml 1.2 => 1.2.218.1 ===
--- Zope/lib/python/OFS/dtml/propertysheets.dtml:1.2	Mon Jan  8 17:46:59 2001
+++ Zope/lib/python/OFS/dtml/propertysheets.dtml	Mon Sep 29 08:11:37 2003
@@ -4,12 +4,15 @@
 <form action="<dtml-var URL1>" method="post">
 <table cellspacing="0" cellpadding="2" border="0">
 <dtml-in items sort>
-<dtml-with "_(REQUEST=REQUEST, item=_['sequence-item'].aq_base)" only>
+<dtml-with "_(REQUEST=REQUEST, item=_['sequence-item'].aq_base, isDeletable=isDeletable)" only>
 <dtml-with item>
 <dtml-if id>
 <tr>
   <td align="left" valign="top">
-  <a href="&dtml-id;">&dtml-id; (<dtml-var xml_namespace>)</a>
+  <dtml-if expr="isDeletable(id)"><input type=checkbox name="ids:list" value="&dtml-id;"></dtml-if>
+  </td>
+  <td align="left" valign="top">
+  <a href="&dtml-id;/manage">&dtml-id; <dtml-if xml_namespace>(<dtml-var xml_namespace>)</dtml-if></a>
   <dtml-if locked_in_session>
     <dtml-if modified_in_session>
       <img src="&dtml-BASEPATH1;/p_/locked"
@@ -25,17 +28,23 @@
 </dtml-with>
 </dtml-with>
 </dtml-in>
-</table>
-
-<table cellspacing="0" cellpadding="2" border="0">
 <tr>
-  <td align="left" valign="top">
-  </td>
-  <td align="left" valign="top">
-  <input type="submit" name="manage_addPropertySheetForm:method" 
-   class="form-element" value="Add">
+  <td colspan=2>
+    <input type="submit" name="manage_delPropertySheets:method" 
+  	 class="form-element" value="Delete">
   </td>
 </tr>
+</table>
+
+<table cellpadding=5>
+ <tr>
+    <td><span class="form-label">Name:</span> <input name="id"></td>
+    <td><span class="form-label">Namespace:</span> <input name="ns"></td>
+    <td>
+      <input type="submit" name="manage_addPropertySheet:method" 
+  	 class="form-element" value="Add">
+    </td>
+  </tr>
 </table>
 </form>