2008-10-20 Thibaut

improve form_view. When you use EditorField with FCKEditor, don't escape some characters like '>', '<'. And if you use EditorField with text_area, escape the characters.

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

bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml

@@ -72,12 +72,6 @@ AAAAAFBpY3R1cmVzLzEwMDAwMDAwMDAwMDAwQjQwMDAwMDAyMTEyMkRCMEFELmpwZ1BLAQIUABQA
 AAAIAPCOATeB4XqibAEAABQIAAAVAAAAAAAAAAAAAAAAAOgKAABNRVRBLUlORi9tYW5pZmVzdC54
 bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -104,12 +98,6 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
               </object>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
@@ -392,9 +380,18 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
                     </tal:block>\n
                   </tal:block>\n
                   <tal:block tal:condition="python: (not (same_type(value,[]) or same_type(value,()) )) and (value != None)">\n
+                    <tal:block tal:condition="python: field_type==\'EditorField\' and field.get_value(\'text_editor\')==\'fck_editor\'">\n
+                      <tal:block tal:content="structure python: field.render_pdf(value)" />\n
+                    </tal:block>\n
+                    <tal:block tal:condition="python: field_type in (\'EditorField\',) and field.get_value(\'text_editor\')==\'text_area\'">\n
+                      <text:p text:style-name=\'field-content-center\'\n
+                  tal:content="structure python: field.render_pdf(value).replace(\'&amp;\', \'&amp;amp;\').replace(\'&gt;\', \'&amp;gt;\').replace(\'&lt;\', \'&amp;lt;\').replace(\'\\n\', \'&lt;text:line-break/&gt;\')"/>\n
+                    </tal:block>\n
+                    <tal:block tal:condition="python: field_type!=\'EditorField\'">\n
                       <text:p text:style-name=\'field-content-center\'\n
                               tal:content="structure python: field.render_pdf(value).replace(\'&amp;\', \'&amp;amp;\').replace(\'&gt;\', \'&amp;gt;\').replace(\'&lt;\', \'&amp;lt;\').replace(\'\\n\', \'&lt;text:line-break/&gt;\')"/>\n
                     </tal:block>\n
+                  </tal:block>\n
                   <tal:block tal:condition="python: value is None">\n
                     <text:p text:style-name=\'field-content\' tal:content="python: \' \'" />\n
                   </tal:block>\n

bt5/erp5_odt_style/bt/revision

-59
+60
\ No newline at end of file