Updated from OFS.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1746 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/dtml/properties.dtml

+<dtml-if management_page_charset>
+    <dtml-comment>
+    A site-global encoding specification in a property.
+    Note that this feature only works if there are no unicode objects
+    around. This means that this feature is not likely to be supported
+    in all future versions of zope.
+    </dtml-comment>
+    <dtml-call "REQUEST.set('management_page_charset',
+                          _['management_page_charset'])">
+    <dtml-call "REQUEST.set('management_page_charset_tag','')">
+<dtml-else>
+    <dtml-comment>
+    Thankfully no site-global encoding specification in a property.
+    We can set UTF-8, and unicode properties will work.
+    </dtml-comment>
+    <dtml-call "REQUEST.set('management_page_charset','UTF-8')">
+    <dtml-call "REQUEST.set('management_page_charset_tag','UTF-8:')">
+</dtml-if>
+    
+<dtml-if "REQUEST.get('management_page_charset',None)=='UTF-8'">
+<dtml-var "u' '">
+</dtml-if>
 <dtml-var manage_page_header>
 <dtml-with "_(management_view='Properties')">
 <dtml-var manage_tabs>
@@ -5,11 +27,11 @@
 
 <dtml-if Principia-Version>
 <p>
-<em>You are currently working in version <dtml-var Principia-Version></em>
+<em>You are currently working in version &dtml-Principia-Version;</em>
 </p>
 </dtml-if Principia-Version>
 
-<form action="<dtml-var URL1>" method="post">
+<form action="&dtml-URL1;" method="post">
 <dtml-if propertyMap>
 <p class="form-help">
 Properties allow you to assign simple values to Zope objects. To change 
@@ -39,75 +61,73 @@ property values, edit the values and click &quot;Save Changes&quot;.
 </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')">
-  <input type="checkbox" name="ids:list" value="<dtml-var id html_quote>" 
-   id="cb-<dtml-var id>">
+  <input type="checkbox" name="_ids:<dtml-var "REQUEST['management_page_charset_tag']">string:list" value="&dtml-id;"
+   id="cb-&dtml-id;">
   <dtml-else>
   </dtml-if>
   </td>
   <td align="left" valign="top">
   <div class="form-label">
-  <label for="cb-<dtml-var id>"><dtml-var "propertyLabel(id)"></label>
+  <label for="cb-&dtml-id;"><dtml-var "propertyLabel(id)" html_quote></label>
   </div>
   </td>
   <td align="left" valign="top">
 
   <dtml-if "'w' in _['sequence-item'].get('mode', 'awd')">
   <dtml-if "type == 'int'">
-  <input type="text" name="<dtml-var id>:<dtml-var 
-   type>" size="35" value="<dtml-if "hasProperty(id)"><dtml-var 
-   "'%s' % getProperty(id)" html_quote></dtml-if>">
+  <input type="text" name="&dtml-id;:&dtml-type;"
+   size="35" value="<dtml-if "hasProperty(id)"><dtml-var "'%s' % getProperty(id)" html_quote></dtml-if>">
   <dtml-elif "type == 'long'">
-  <input type="text" name="<dtml-var id>:<dtml-var type>" size="35"
-   value="<dtml-if "hasProperty(id)"><dtml-var 
-   "('%s' % getProperty(id))" html_quote></dtml-if>">
+  <input type="text" name="&dtml-id;:&dtml-type;" size="35"
+   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-id;:<dtml-var "REQUEST['management_page_charset_tag']">&dtml-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-id;:<dtml-var "REQUEST['management_page_charset_tag']">&dtml-type;" size="35"
    value="<dtml-var "getProperty(id)" html_quote>">
   <dtml-elif "type=='boolean'">
-  <input type="checkbox" name="<dtml-var id>:boolean" size="35"
+  <input type="checkbox" name="&dtml-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"
-   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 
-   "getProperty(id)" html_quote></textarea>
-  <dtml-elif "type=='lines'">
-  <textarea name="<dtml-var id>:lines" rows="6" cols="35"><dtml-in
-  "getProperty(id)"><dtml-var sequence-item html_quote><dtml-if
+  <dtml-elif "type in ['tokens','utokens']">
+  <input type="text" name="&dtml-id;:<dtml-var "REQUEST['management_page_charset_tag']">&dtml-type;" size="35"
+   value="<dtml-in "getProperty(id)">&dtml-sequence-item; </dtml-in>">
+  <dtml-elif "type in ['text','utext']">
+  <textarea name="&dtml-id;:<dtml-var "REQUEST['management_page_charset_tag']">&dtml-type;" rows="6" cols="35"><dtml-var "getProperty(id)" html_quote></textarea>
+  <dtml-elif "type in ['lines','ulines']">
+  <textarea name="&dtml-id;:<dtml-var "REQUEST['management_page_charset_tag']">&dtml-type;" rows="6" cols="35"><dtml-in
+  "getProperty(id)">&dtml-sequence-item;<dtml-if
    sequence-end><dtml-else><dtml-var "'\n'"></dtml-if></dtml-in></textarea>
 
   <dtml-elif "type=='selection'">
 
     <dtml-if "hasProperty(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>">
+    <select name="&dtml-id;:<dtml-var "REQUEST['management_page_charset_tag']">text">
       <dtml-in "getProperty(select_variable)">
          <option
           <dtml-if "_['sequence-item']==getProperty(id)">SELECTED</dtml-if>
-          ><dtml-var sequence-item html_quote></option>
+          >&dtml-sequence-item;</option>
       </dtml-in>
     </select>
     </div>
     <dtml-elif "_.has_key(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>">
+    <select name="&dtml-id;:<dtml-var "REQUEST['management_page_charset_tag']">text">
       <dtml-in "_[select_variable]">
          <option
           <dtml-if "_['sequence-item']==getProperty(id)">SELECTED</dtml-if>
-          ><dtml-var sequence-item html_quote></option>
+          >&dtml-sequence-item;</option>
       </dtml-in>
     </select>
     </div>
     <dtml-else>
     <div class="form-text">
-       No value for <dtml-var select_variable>.
+       No value for &dtml-select_variable;.
     </div>
     </dtml-if>
 
@@ -115,31 +135,31 @@ property values, edit the values and click &quot;Save Changes&quot;.
 
     <dtml-if "hasProperty(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>:list" multiple
+    <select name="&dtml-id;:<dtml-var "REQUEST['management_page_charset_tag']">list:string" multiple
       size="<dtml-var "_.min(7, _.len(getProperty(select_variable)))">">
       <dtml-in "getProperty(select_variable)">
          <option<dtml-if 
          "getProperty(id) and (_['sequence-item'] in getProperty(id))"
          > SELECTED</dtml-if
-         >><dtml-var sequence-item html_quote></option>
+         >>&dtml-sequence-item;</option>
       </dtml-in>
     </select>
     </div>
     <dtml-elif "_.has_key(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>:list" multiple
+    <select name="&dtml-id;:<dtml-var "REQUEST['management_page_charset_tag']">list:string" multiple
       size="<dtml-var "_.min(7, _.len(_[select_variable]))">">
       <dtml-in "_[select_variable]">
          <option<dtml-if 
          "getProperty(id) and (_['sequence-item'] in getProperty(id))"
          > SELECTED</dtml-if
-         >><dtml-var sequence-item html_quote></option>
+         >>&dtml-sequence-item;</option>
       </dtml-in>
     </select>
     </div>
     <dtml-else>
     <div class="form-text">
-    No value for <dtml-var select_variable>.
+    No value for &dtml-select_variable;.
     </div>
     </dtml-if>
   <dtml-else>
@@ -156,7 +176,14 @@ property values, edit the values and click &quot;Save Changes&quot;.
   &dtml-type;
   </div>
   </td>
+  
+  <dtml-if "id=='title'">
+    <td align="center" valign="top">
+      <div class="list-item"><b>Warning:</b> be aware that removing 'title' without re-adding it might be dangerous.</div>
+   </td>
+  </dtml-if>
 </tr>
+</dtml-let>
 </dtml-in>
 <tr>
   <td colspan="2">&nbsp;</td>
@@ -196,7 +223,7 @@ and value and click the &quot;Add&quot; button.
 
 <dtml-if property_extensible_schema__>
 
-<form action="<dtml-var URL1>/manage_addProperty" method="post">
+<form action="&dtml-URL1;/manage_addProperty" method="post">
 
 <p class="form-help">
 To add a new property, enter a name, type and value for the new 
@@ -211,7 +238,7 @@ property and click the &quot;Add&quot; button.
   </div>
   </td>
   <td align="left" valign="top">
-  <input type="text" name="id" size="30" value=""/>
+  <input type="text" name="id:<dtml-var "REQUEST['management_page_charset_tag']">string" size="30" value=""/>
   </td>
   <td align="left" valign="top" class="form-label">
   Type
@@ -228,6 +255,12 @@ property and click the &quot;Add&quot; button.
       <option selected>string</option>
       <option>text</option>
       <option>tokens</option>
+      <dtml-if "REQUEST['management_page_charset'] == 'UTF-8'">
+        <option>ustring</option>
+        <option>ulines</option>
+        <option>utext</option>
+        <option>utokens</option>
+      </dtml-if>
       <option>selection</option>
       <option>multiple selection</option>
     </select>
@@ -241,7 +274,11 @@ property and click the &quot;Add&quot; button.
   </div>
   </td>
   <td colspan=2 align="left" valign="top">
-  <input type="text" name="value" size="30" />
+  <dtml-if "REQUEST['management_page_charset'] == 'UTF-8'">
+    <input type="text" name="value:UTF-8:ustring" size="30" />   
+  <dtml-else>   
+     <input type="text" name="value:string" size="30" />   
+  </dtml-if> 
   </td>
   <td align="right" valign="top">
   <div class="form-element">