[Zope-Checkins] CVS: Zope/lib/python/OFS/dtml - findAdv.dtml:1.3.16.1 findForm.dtml:1.4.16.1 findResult.dtml:1.4.16.2 main.dtml:1.20.2.2

Brian Lloyd brian at zope.com
Mon Jan 19 14:47:16 EST 2004 

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

Modified Files:
      Tag: Zope-2_7-branch
	findAdv.dtml findForm.dtml findResult.dtml main.dtml 
Log Message:
apply missed 813 patches


=== Zope/lib/python/OFS/dtml/findAdv.dtml 1.3 => 1.3.16.1 ===
--- Zope/lib/python/OFS/dtml/findAdv.dtml:1.3	Sun Dec 22 12:53:59 2002
+++ Zope/lib/python/OFS/dtml/findAdv.dtml	Mon Jan 19 14:46:44 2004
@@ -65,8 +65,8 @@
   <TD ALIGN="LEFT" VALIGN="TOP">
   <div class="form-element">
   <SELECT NAME="obj_mspec">
-  <OPTION VALUE="<"> before
-  <OPTION VALUE=">"> after
+  <OPTION VALUE="&lt;"> before
+  <OPTION VALUE="&gt;"> after
   </SELECT> 
   </div>
   <INPUT TYPE="TEXT" NAME="obj_mtime" SIZE="22">


=== Zope/lib/python/OFS/dtml/findForm.dtml 1.4 => 1.4.16.1 ===
--- Zope/lib/python/OFS/dtml/findForm.dtml:1.4	Sun Dec 22 12:53:59 2002
+++ Zope/lib/python/OFS/dtml/findForm.dtml	Mon Jan 19 14:46:44 2004
@@ -65,8 +65,8 @@
   <TD ALIGN="LEFT" VALIGN="TOP">
   <div class="form-element">
   <SELECT NAME="obj_mspec">
-  <OPTION VALUE="<"> before
-  <OPTION VALUE=">"> after
+  <OPTION VALUE="&lt;"> before
+  <OPTION VALUE="&gt;"> after
   </SELECT> 
   </div>
   <INPUT TYPE="TEXT" NAME="obj_mtime" SIZE="22">


=== Zope/lib/python/OFS/dtml/findResult.dtml 1.4.16.1 => 1.4.16.2 ===
--- Zope/lib/python/OFS/dtml/findResult.dtml:1.4.16.1	Thu Jan  8 18:33:48 2004
+++ Zope/lib/python/OFS/dtml/findResult.dtml	Mon Jan 19 14:46:44 2004
@@ -55,7 +55,7 @@
 </dtml-if>
 
 <TABLE width="100%" CELLSPACING="0" CELLPADDING="2" border="0">
-<dtml-if expr="_.len(results) != 1">
+<dtml-if expr="_.len(results) > batch_size">
 <tr class="list-header">
 <td width="50%">
  <div class="list-item">
@@ -171,11 +171,11 @@
   <div class="form-element">
   <SELECT NAME="obj_mspec">
 
-  <OPTION VALUE="<" <dtml-if "REQUEST.obj_mspec == '<'">SELECTED</dtml-if>> before
-  <OPTION VALUE=">" <dtml-if "REQUEST.obj_mspec == '>'">SELECTED</dtml-if>> after
+  <OPTION VALUE="&lt;" <dtml-if "REQUEST.obj_mspec == '<'">SELECTED</dtml-if>> before
+  <OPTION VALUE="&gt;" <dtml-if "REQUEST.obj_mspec == '>'">SELECTED</dtml-if>> after
   </SELECT> 
   </div>
-  <INPUT TYPE="TEXT" NAME="obj_mtime" SIZE="22" VALUE="<dtml-var obj_mtime>">
+  <INPUT TYPE="TEXT" NAME="obj_mtime" SIZE="22" VALUE="&dtml-obj_mtime;">
   </TD>
 </TR>
 
@@ -193,9 +193,9 @@
   <SELECT NAME="obj_roles:list" SIZE="3" MULTIPLE>
 <dtml-in valid_roles>
 <dtml-if obj_roles>
-  <OPTION VALUE="<dtml-var sequence-item html_quote>"<dtml-if "_['sequence-item'] in obj_roles">SELECTED</dtml-if>><dtml-var sequence-item>
+  <OPTION VALUE="&dtml-sequence-item;"<dtml-if "_['sequence-item'] in obj_roles">SELECTED</dtml-if>>&dtml-sequence-item;
 <dtml-else>
- <OPTION VALUE="<dtml-var sequence-item html_quote>"><dtml-var sequence-item>
+ <OPTION VALUE="&dtml-sequence-item;">&dtml-sequence-item;
 </dtml-if>
  
 </dtml-in>
@@ -215,7 +215,7 @@
   <div class="form-element">
   <SELECT NAME="obj_permission">
 <dtml-in permission_settings mapping>
-  <OPTION VALUE="<dtml-var name html_quote>"<dtml-in obj_metatypes><dtml-if "_['sequence-item'] == _['name']">SELECTED</dtml-if></dtml-in>> <dtml-var name>
+  <OPTION VALUE="&dtml-name;"<dtml-in obj_metatypes><dtml-if "_['sequence-item'] == _['name']">SELECTED</dtml-if></dtml-in>> &dtml-name;
 </dtml-in>
   </SELECT>
   </div>
@@ -232,8 +232,8 @@
   <TD ALIGN="LEFT" VALIGN="TOP">
   <div class="form-element">
   <SELECT NAME="skey">
-  <OPTION VALUE="id">Type
-  <OPTION VALUE="meta_type">Id
+  <OPTION VALUE="id">Id
+  <OPTION VALUE="meta_type">Type
   <OPTION VALUE="bobobase_modification_time">Last Modified
   </SELECT> 
   <span class="form-label">


=== Zope/lib/python/OFS/dtml/main.dtml 1.20.2.1 => 1.20.2.2 ===
--- Zope/lib/python/OFS/dtml/main.dtml:1.20.2.1	Tue Nov  4 12:55:55 2003
+++ Zope/lib/python/OFS/dtml/main.dtml	Mon Jan 19 14:46:44 2004
@@ -47,7 +47,7 @@
   <dtml-else>
     <dtml-in filtered_meta_types mapping sort=name>
     <input type="hidden" name=":method" value="&dtml.url_quote-action;" />
-    <input class="form-element" type="submit" name="submit" value=" Add &dtml-name;" />
+    <input class="form-element" type="submit" name="submit" value="Add &dtml-name;" />
     </dtml-in>
   </dtml-if>
   </form>
@@ -74,7 +74,7 @@
 <tr class="list-header">
   <td width="5%" align="right" colspan="2"><div 
    class="list-item"><a href="./manage_main?skey=meta_type<dtml-if 
-   "skey == 'meta_type' and not rkey">&rkey=meta_type</dtml-if>"
+   "skey == 'meta_type' and not rkey">&amp;rkey=meta_type</dtml-if>"
    onMouseOver="window.status='Sort objects by type'; return true"
    onMouseOut="window.status=''; return true"><dtml-if 
    "skey == 'meta_type' or rkey == 'meta_type'"
@@ -82,7 +82,7 @@
   </td>
   <td width="50%" align="left"><div class="list-item"><a 
    href="./manage_main?skey=id<dtml-if 
-   "skey == 'id' and not rkey">&rkey=id</dtml-if>"
+   "skey == 'id' and not rkey">&amp;rkey=id</dtml-if>"
    onMouseOver="window.status='Sort objects by name'; return true"
    onMouseOut="window.status=''; return true"><dtml-if 
    "skey == 'id' or rkey == 'id'"
@@ -90,7 +90,7 @@
   </td>
   <td width="15%" align="left"><div class="list-item"><a 
    href="./manage_main?skey=get_size<dtml-if 
-   "skey == 'get_size' and not rkey">&rkey=get_size</dtml-if>"
+   "skey == 'get_size' and not rkey">&amp;rkey=get_size</dtml-if>"
    onMouseOver="window.status='Sort objects by size'; return true"
    onMouseOut="window.status=''; return true"><dtml-if 
    "skey == 'get_size' or rkey == 'get_size'"
@@ -99,7 +99,7 @@
   <td width="19%" align="left"><div class="list-item"><a 
    href="./manage_main?skey=bobobase_modification_time<dtml-if 
    "skey == 'bobobase_modification_time' and not rkey"
-   >&rkey=bobobase_modification_time</dtml-if>"
+   >&amprkey=bobobase_modification_time</dtml-if>"
    onMouseOver="window.status='Sort objects by modification time'; return true"
    onMouseOut="window.status=''; return true"><dtml-if 
    "skey == 'bobobase_modification_time' or rkey == 'bobobase_modification_time'"
@@ -269,10 +269,10 @@
   by
   <select name="delta:int">
   <dtml-in "_.range(1,_.min(5,_.len(objectIds())))">
-  <option><dtml-var sequence-item></option>
+  <option>&dtml-sequence-item;</option>
   </dtml-in>
   <dtml-in "_.range(5,_.len(objectIds()),5)">
-  <option><dtml-var sequence-item></option>
+  <option>&dtml-sequence-item;</option>
   </dtml-in>
   </select>
   <input class="form-element" type="submit"
@@ -281,8 +281,8 @@
          name="manage_move_objects_to_bottom:method" value="Bottom" />
   </dtml-if>
   <dtml-unless expr="(skey, rkey and 1 or 0) == getDefaultSorting()">
-  <input type="hidden" name="key" value="<dtml-var skey>">
-  <input type="hidden" name="reverse" value="<dtml-var rkey>">
+  <input type="hidden" name="key" value="&dtml-skey;">
+  <input type="hidden" name="reverse" value="&dtml-rkey;">
   <input class="form-element" type="submit"
          name="manage_set_default_sorting:method"
          value="Set View as Default" />

More information about the Zope-Checkins mailing list