*** lib/python/OFS/dtml/properties.dtml	Sat Dec 21 01:47:48 2002
--- properties.dtml	Sat Dec 21 03:01:56 2002
***************
*** 6,9 ****
--- 6,10 ----
      in all future versions of zope.
      </dtml-comment>
+     <dtml-call "REQUEST.set('management_page_charset_tag','')">
  <dtml-else>
      <dtml-comment>
***************
*** 12,18 ****
--- 13,22 ----
      </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')">
***************
*** 20,25 ****
  </dtml-with>
  
- <dtml-call "REQUEST.set('management_page_charset_tag',REQUEST['management_page_charset'])">
- 
  <dtml-if Principia-Version>
  <p>
--- 24,27 ----
***************
*** 61,65 ****
    <td align="left" valign="top" width="16">
    <dtml-if "'d' in _['sequence-item'].get('mode', 'awd')">
!   <input type="checkbox" name="_ids:<dtml-var "REQUEST['management_page_charset_tag']">:string:list" value="<dtml-var id html_quote>"
     id="cb-<dtml-var id>">
    <dtml-else>
--- 63,67 ----
    <td align="left" valign="top" width="16">
    <dtml-if "'d' in _['sequence-item'].get('mode', 'awd')">
!   <input type="checkbox" name="_ids:<dtml-var "REQUEST['management_page_charset_tag']">string:list" value="<dtml-var id html_quote>"
     id="cb-<dtml-var id>">
    <dtml-else>
***************
*** 83,90 ****
     "('%s' % getProperty(id))" html_quote></dtml-if>">
    <dtml-elif "type in ('float', 'date')">
!   <input type="text" name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']">:<dtml-var type>" size="35"
     value="<dtml-var "getProperty(id)" html_quote>">
    <dtml-elif "type in ['string','ustring']">
!   <input type="text" name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']">:<dtml-var type>" size="35"
     value="<dtml-var "getProperty(id)" html_quote>">
    <dtml-elif "type=='boolean'">
--- 85,92 ----
     "('%s' % getProperty(id))" html_quote></dtml-if>">
    <dtml-elif "type in ('float', 'date')">
!   <input type="text" name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']"><dtml-var type>" size="35"
     value="<dtml-var "getProperty(id)" html_quote>">
    <dtml-elif "type in ['string','ustring']">
!   <input type="text" name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']"><dtml-var type>" size="35"
     value="<dtml-var "getProperty(id)" html_quote>">
    <dtml-elif "type=='boolean'">
***************
*** 92,102 ****
     <dtml-if "getProperty(id)">CHECKED</dtml-if>>
    <dtml-elif "type in ['tokens','utokens']">
!   <input type="text" name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']">:<dtml-var type>" size="35"
     value="<dtml-in "getProperty(id)"><dtml-var sequence-item html_quote> </dtml-in>">
    <dtml-elif "type in ['text','utext']">
!   <textarea name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']">:<dtml-var type>" rows="6" cols="35"><dtml-var
     "getProperty(id)" html_quote></textarea>
    <dtml-elif "type in ['lines','ulines']">
!   <textarea name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']">:<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>
--- 94,104 ----
     <dtml-if "getProperty(id)">CHECKED</dtml-if>>
    <dtml-elif "type in ['tokens','utokens']">
!   <input type="text" name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']"><dtml-var type>" size="35"
     value="<dtml-in "getProperty(id)"><dtml-var sequence-item html_quote> </dtml-in>">
    <dtml-elif "type in ['text','utext']">
!   <textarea name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']"><dtml-var type>" rows="6" cols="35"><dtml-var
     "getProperty(id)" html_quote></textarea>
    <dtml-elif "type in ['lines','ulines']">
!   <textarea name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']"><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>
***************
*** 106,110 ****
      <dtml-if "hasProperty(select_variable)">
      <div class="form-element">
!     <select name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']">:text">
        <dtml-in "getProperty(select_variable)">
           <option
--- 108,112 ----
      <dtml-if "hasProperty(select_variable)">
      <div class="form-element">
!     <select name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']">text">
        <dtml-in "getProperty(select_variable)">
           <option
***************
*** 116,120 ****
      <dtml-elif "_.has_key(select_variable)">
      <div class="form-element">
!     <select name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']">:text">
        <dtml-in "_[select_variable]">
           <option
--- 118,122 ----
      <dtml-elif "_.has_key(select_variable)">
      <div class="form-element">
!     <select name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']">text">
        <dtml-in "_[select_variable]">
           <option
***************
*** 134,138 ****
      <dtml-if "hasProperty(select_variable)">
      <div class="form-element">
!     <select name="<dtml-var 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)">
--- 136,140 ----
      <dtml-if "hasProperty(select_variable)">
      <div class="form-element">
!     <select name="<dtml-var 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)">
***************
*** 146,150 ****
      <dtml-elif "_.has_key(select_variable)">
      <div class="form-element">
!     <select name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']">:list:string" multiple
        size="<dtml-var "_.min(7, _.len(_[select_variable]))">">
        <dtml-in "_[select_variable]">
--- 148,152 ----
      <dtml-elif "_.has_key(select_variable)">
      <div class="form-element">
!     <select name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']">list:string" multiple
        size="<dtml-var "_.min(7, _.len(_[select_variable]))">">
        <dtml-in "_[select_variable]">
***************
*** 230,234 ****
    </td>
    <td align="left" valign="top">
!   <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">
--- 232,236 ----
    </td>
    <td align="left" valign="top">
!   <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">
***************
*** 245,249 ****
        <option>long</option>
        <option selected>string</option>
!       <dtml-if "REQUEST['management_page_charset_tag']=='UTF-8'">
            <option>ustring</option>
            <option>text</option>
--- 247,251 ----
        <option>long</option>
        <option selected>string</option>
!       <dtml-if "REQUEST['management_page_charset']=='UTF-8'">
            <option>ustring</option>
            <option>text</option>
***************
*** 266,270 ****
    </td>
    <td colspan=2 align="left" valign="top">
!   <input type="text" name="value:<dtml-var "REQUEST['management_page_charset_tag']">:ustring" size="30" />
    </td>
    <td align="right" valign="top">
--- 268,276 ----
    </td>
    <td colspan=2 align="left" valign="top">
!   <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">