[Zope-Checkins] CVS: Zope/lib/python/OFS/dtml - properties.dtml:1.7

[Toby Dickenson]

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

Modified Files:
	properties.dtml 
Log Message:
merged toby-stiff-cache-branch and toby-unicode-branch

=== Zope/lib/python/OFS/dtml/properties.dtml 1.6 => 1.7 ===
+<dtml-var "u''">
 <dtml-var manage_page_header>
 <dtml-with "_(management_view='Properties')">
 <dtml-var manage_tabs>
@@ -42,7 +44,7 @@
 <tr>
   <td align="left" valign="top" width="16">
   <dtml-if "'d' in _['sequence-item'].get('mode', 'awd')">
-  <input type="checkbox" name="_ids:list" value="<dtml-var id html_quote>" 
+  <input type="checkbox" name="_ids:utf8:list" value="<dtml-var id html_quote>"
    id="cb-<dtml-var id>">
   <dtml-else>
   </dtml-if>
@@ -64,22 +66,22 @@
    value="<dtml-if "hasProperty(id)"><dtml-var 
    "('%s' % getProperty(id))" html_quote></dtml-if>">
   <dtml-elif "type in ('float', 'date')">
-  <input type="text" name="<dtml-var id>:<dtml-var type>" size="35"
+  <input type="text" name="<dtml-var id>:utf8:<dtml-var type>" size="35"
    value="<dtml-var "getProperty(id)" html_quote>">
-  <dtml-elif "type=='string'">
-  <input type="text" name="<dtml-var id>:string" size="35"
+  <dtml-elif "type in ['string','ustring']">
+  <input type="text" name="<dtml-var id>:utf8:<dtml-var type>" size="35"
    value="<dtml-var "getProperty(id)" html_quote>">
   <dtml-elif "type=='boolean'">
   <input type="checkbox" name="<dtml-var id>:boolean" size="35"
    <dtml-if "getProperty(id)">CHECKED</dtml-if>>
-  <dtml-elif "type=='tokens'">
-  <input type="text" name="<dtml-var id>:tokens" size="35"
+  <dtml-elif "type in ['tokens','utokens']">
+  <input type="text" name="<dtml-var id>:utf8:<dtml-var type>" size="35"
    value="<dtml-in "getProperty(id)"><dtml-var sequence-item html_quote> </dtml-in>">
-  <dtml-elif "type=='text'">
-  <textarea name="<dtml-var id>:text" rows="6" cols="35"><dtml-var 
+  <dtml-elif "type in ['text','utext']">
+  <textarea name="<dtml-var id>:utf8:<dtml-var type>" rows="6" cols="35"><dtml-var
    "getProperty(id)" html_quote></textarea>
-  <dtml-elif "type=='lines'">
-  <textarea name="<dtml-var id>:lines" rows="6" cols="35"><dtml-in
+  <dtml-elif "type in ['lines','ulines']">
+  <textarea name="<dtml-var id>:utf8:<dtml-var type>" rows="6" cols="35"><dtml-in
   "getProperty(id)"><dtml-var sequence-item html_quote><dtml-if
    sequence-end><dtml-else><dtml-var "'\n'"></dtml-if></dtml-in></textarea>
 
@@ -87,7 +89,7 @@
 
     <dtml-if "hasProperty(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>">
+    <select name="<dtml-var id>:utf8:text">
       <dtml-in "getProperty(select_variable)">
          <option
           <dtml-if "_['sequence-item']==getProperty(id)">SELECTED</dtml-if>
@@ -97,7 +99,7 @@
     </div>
     <dtml-elif "_.has_key(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>">
+    <select name="<dtml-var id>:utf8:text">
       <dtml-in "_[select_variable]">
          <option
           <dtml-if "_['sequence-item']==getProperty(id)">SELECTED</dtml-if>
@@ -115,7 +117,7 @@
 
     <dtml-if "hasProperty(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>:list" multiple
+    <select name="<dtml-var id>:utf8:list" multiple
       size="<dtml-var "_.min(7, _.len(getProperty(select_variable)))">">
       <dtml-in "getProperty(select_variable)">
          <option<dtml-if 
@@ -127,7 +129,7 @@
     </div>
     <dtml-elif "_.has_key(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>:list" multiple
+    <select name="<dtml-var id>:utf8:list" multiple
       size="<dtml-var "_.min(7, _.len(_[select_variable]))">">
       <dtml-in "_[select_variable]">
          <option<dtml-if 
@@ -211,7 +213,7 @@
   </div>
   </td>
   <td align="left" valign="top">
-  <input type="text" name="id" size="30" value=""/>
+  <input type="text" name="id:utf8:string" size="30" value=""/>
   </td>
   <td align="left" valign="top" class="form-label">
   Type
@@ -226,8 +228,12 @@
       <option>lines</option>
       <option>long</option>
       <option selected>string</option>
+      <option>ustring</option>
       <option>text</option>
       <option>tokens</option>
+      <option>utext</option>
+      <option>utokens</option>
+      <option>ulines</option>
       <option>selection</option>
       <option>multiple selection</option>
     </select>
@@ -241,7 +247,7 @@
   </div>
   </td>
   <td colspan=2 align="left" valign="top">
-  <input type="text" name="value" size="30" />
+  <input type="text" name="value:utf8:string" size="30" />
   </td>
   <td align="right" valign="top">
   <div class="form-element">