[Erp5-report] r43731 ivan - in /erp5/trunk/bt5/erp5_egov: SkinTemplateItem/portal_skins/erp...

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Feb 25 13:26:42 CET 2011


Author: ivan
Date: Fri Feb 25 13:26:41 2011
New Revision: 43731

URL: http://svn.erp5.org?rev=43731&view=rev
Log:
Replace wrongly used tal:replace with tal:content which broke Pt under Zope 2.12

Modified:
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/form_render_PDFeForm.xml
    erp5/trunk/bt5/erp5_egov/bt/revision

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/form_render_PDFeForm.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/form_render_PDFeForm.xml?rev=43731&r1=43730&r2=43731&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/form_render_PDFeForm.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/form_render_PDFeForm.xml [utf8] Fri Feb 25 13:26:41 2011
@@ -106,7 +106,7 @@ Foundation, Inc., 59 Temple Place - Suit
             <div tal:omit-tag=""\n
               tal:define="struct python:field.render(value,request)">\n
               <div tal:omit-tag=""\n
-                    tal:define="struct python:struct.replace(\'&nbsp;;\',\'\');\n
+                    tal:define="struct python:struct.replace(\'&nbsp;\',\'\');\n
                                 struct_input_div python:struct.split(\'<input\');\n
                                 struct_input_len python:len(struct_input_div);\n
                                 struct_input_range python:range(struct_input_len);\n
@@ -118,7 +118,7 @@ Foundation, Inc., 59 Temple Place - Suit
                                 struct_test python:struct_selec_test and struct_input_test">\n
                 <div tal:replace="nothing">\n
                   - rendering final output string through \'field.render\'.\n
-                  - replacing all \'&nbsp\' with \'\' to prevent error in rendering\n
+                  - replacing all \'&amps;nbsp\' with \'\' to prevent error in rendering\n
                   - making two tests : first one (struct_input_test) is used to test if\n
                   rendering is single field (StringField, ) or multi-field\n
                   (DateTimeField, RelationStringField, ).\n
@@ -135,13 +135,13 @@ Foundation, Inc., 59 Temple Place - Suit
                     output rendering as a single field.\n
                     UPDATE : with xhtml_style, this \n
                   </div>\n
-                  <div class="input" tal:attributes="class python: (\'<\' not in struct) and \'%s_class\' % name or \'\'" tal:condition="python:(not field_errors.has_key(field.id))"><!-- field has no error -->\n
-                    <div tal:replace="structure struct"\n
+-                  <div class="input" tal:attributes="class python: (\'<\' not in struct) and \'%s_class\' % name or \'\'" tal:condition="python:(not field_errors.has_key(field.id))"><!-- field has no error -->\n
+                    <div tal:content="structure struct"\n
                           tal:attributes="class string:${name}_class;\n
                           title field/title"/>\n
                   </div>\n
                   <div class="input" tal:attributes="class python: (\'<\' not in struct) and \'%s_class\' % name or \'\'" tal:condition="python: field_errors.has_key(field.id)"><!-- field has errors-->\n
-                    <div tal:replace="structure struct"\n
+                    <div tal:content="structure struct"\n
                     i18n:attributes="title"\n
                     tal:attributes="class string:${name}_class_error;\n
                     title string:${field/title}"/>\n
@@ -163,12 +163,12 @@ Foundation, Inc., 59 Temple Place - Suit
                           tal:repeat="struct_ind python:struct_range[1:]">\n
                       <div tal:condition="python:(not field_errors.has_key(field.id))"><!-- field has no error 1-->\n
                         <div tal:define="struct_content python:struct_input_div[struct_ind];\n
-                          struct_content python:\'/>\'in struct_content and struct_content[:struct_content.rfind(\'/>\')+2] or struct_content;\n
+                          struct_content python:\'/>\'in struct_content and struct_content[:struct_content.rfind(\'/&gt;\')+2] or struct_content;\n
                                                         struct_final python:\'%s %s\' %\n
                                                         (\'<input \', struct_content);\n
                                                         class_final python:\'%s%s%s\' %\n
                                                         (class_base,\'_class_\', struct_ind)"\n
-                              tal:replace="structure struct_final"\n
+                              tal:content="structure struct_final"\n
                               tal:attributes="class class_final;\n
                                               title field/title">\n
                         </div>\n
@@ -179,7 +179,7 @@ Foundation, Inc., 59 Temple Place - Suit
                                           (\'<input \', struct_content);\n
                                           class_final python:\'%s%s%s%s\' %\n
                                           (class_base,\'_class_\', struct_ind, \'_error\')"\n
-                              tal:replace="structure struct_final"\n
+                              tal:content="structure struct_final"\n
                               i18n:attributes="title"\n
                               tal:attributes="class class_final;\n
                               title field/title"/>\n
@@ -197,7 +197,7 @@ Foundation, Inc., 59 Temple Place - Suit
                                           (\'<input \', struct_content);\n
                                           class_final python:\'%s%s\' %\n
                                           (class_base,\'_class\')"\n
-                                          tal:replace="structure struct_final"\n
+                                          tal:content="structure struct_final"\n
                                           tal:attributes="class class_final;\n
                                           title field/title"/>\n
                       </tal:block>\n
@@ -208,7 +208,7 @@ Foundation, Inc., 59 Temple Place - Suit
                                           (\'<input \', struct_content);\n
                                           class_final python:\'%s%s\' %\n
                                           (class_base,\'_class_error\')"\n
-                              tal:replace="structure struct_final"\n
+                              tal:content="structure struct_final"\n
                               tal:attributes="class class_final;\n
                               title field/title"/>\n
                       </tal:block>\n
@@ -235,14 +235,14 @@ Foundation, Inc., 59 Temple Place - Suit
                       <div tal:condition="python:(not field_errors.has_key(field.id))"\n
                             tal:define="class_final python:\'%s%s%s\' %\n
                                         (class_base,\'_class_\', struct_ind)"\n
-                            tal:replace="structure python:struct_selec_div[struct_ind]"\n
+                            tal:content="structure python:struct_selec_div[struct_ind]"\n
                             tal:attributes="class class_final;\n
                             title field/title"/>\n
                             <!-- field has errors -->\n
                       <div tal:condition="python:field_errors.has_key(field.id)"\n
                             tal:define="class_final python:\'%s%s%s%s\' %\n
                                         (class_base,\'_class_\', struct_ind, \'_error\')"\n
-                            tal:replace="structure python:struct_selec_div[struct_ind]"\n
+                            tal:content="structure python:struct_selec_div[struct_ind]"\n
                             tal:attributes="class class_final;\n
                             title field/title"/>\n
                     </div>\n
@@ -288,8 +288,7 @@ Foundation, Inc., 59 Temple Place - Suit
   </tal:block>\n
 </tal:block>\n
 </tal:block>\n
-</tal:block>\n
-
+</tal:block>
 
 ]]></unicode> </value>
         </item>
@@ -307,7 +306,7 @@ Foundation, Inc., 59 Temple Place - Suit
         </item>
         <item>
             <key> <string>output_encoding</string> </key>
-            <value> <string>utf-8</string> </value>
+            <value> <string>iso-8859-15</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=43731&r1=43730&r2=43731&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision [utf8] Fri Feb 25 13:26:41 2011
@@ -1 +1 @@
-749
\ No newline at end of file
+750
\ No newline at end of file



More information about the Erp5-report mailing list