[Erp5-report] r24250 - in /erp5/trunk/bt5/erp5_odt_style: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: thibaut
Date: Mon Oct 20 14:42:15 2008
New Revision: 24250

URL: http://svn.erp5.org?rev=24250&view=rev
Log:
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.

Modified:
    erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml
    erp5/trunk/bt5/erp5_odt_style/bt/revision

Modified: erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml?rev=24250&r1=24249&r2=24250&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml (original)
+++ erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml Mon Oct 20 14:42:15 2008
@@ -73,12 +73,6 @@
 bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
         </item>
         <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
             <key> <string>_bind_names</string> </key>
             <value>
               <object>
@@ -102,12 +96,6 @@
                   </dictionary>
                 </state>
               </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
             </value>
         </item>
         <item>
@@ -392,8 +380,17 @@
                     </tal:block>\n
                   </tal:block>\n
                   <tal:block tal:condition="python: (not (same_type(value,[]) or same_type(value,()) )) and (value != None)">\n
-                    <text:p text:style-name=\'field-content-center\'\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

Modified: erp5/trunk/bt5/erp5_odt_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/bt/revision?rev=24250&r1=24249&r2=24250&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/bt/revision (original)
+++ erp5/trunk/bt5/erp5_odt_style/bt/revision Mon Oct 20 14:42:15 2008
@@ -1,1 +1,1 @@
-59
+60