2008-04-10 fabien

* add css class for div with no input inside. This is necessary to have a correct rendering of readOnly fields (non editable).
* remove string after '/>'. This is tipicaly time and date separator that make the field rendering position bad.
* replace some unused div with tal:block, this make html source code more clean

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

bt5/erp5_pdf_editor/SkinTemplateItem/portal_skins/erp5_pdf_editor/form_render_PDFeForm.xml

@@ -148,12 +148,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
                     output rendering as a single field.\n
                     UPDATE : with xhtml_style, this \n
                   </div>\n
-                  <div tal:condition="python:(not field_errors.has_key(field.id))"><!-- field has no error -->\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
                           tal:attributes="class string:${name}_class;\n
                           title field/title"/>\n
                   </div>\n
-                  <div tal:condition="python: field_errors.has_key(field.id)"><!-- field has errors-->\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
                     i18n:attributes="title"\n
                     tal:attributes="class string:${name}_class_error;\n
@@ -172,17 +172,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
                     in the document before processing the next input\n
                   </div>\n
                   <tal:block tal:condition="python: \'hidden\' not in struct_input_div[1]">\n
-                    <div tal:define="struct_range python:range(struct_input_len)"\n
+                    <tal:block tal:define="struct_range python:range(struct_input_len)"\n
                           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_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:attributes="class class_final;\n
-                                              title field/title"/>\n
+                                              title field/title">\n
+                        </div>\n
                       </div>\n
                       <div tal:condition="python:field_errors.has_key(field.id)"><!-- field has errors 1-->\n
                         <div tal:define="struct_content python:struct_input_div[struct_ind];\n
@@ -195,13 +197,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
                               tal:attributes="class class_final;\n
                               title field/title"/>\n
                       </div>\n
-                    </div>\n
+                    </tal:block>\n
                   </tal:block>\n
                   <tal:block tal:condition="python: \'hidden\' in struct_input_div[1]">\n
                     <!-- processing CheckBoxField in xhtml_style -->\n
                     <div tal:define="struct_range python:range(struct_input_len)"\n
                           tal:repeat="struct_ind python:struct_range[1:]">\n
-                      <div tal:condition="python:(not field_errors.has_key(field.id))">\n
+                      <tal:block tal:condition="python:(not field_errors.has_key(field.id))">\n
                         <!-- field has no error 2-->\n
                         <div tal:define="struct_content python:struct_input_div[struct_ind];\n
                                           struct_final python:\'%s %s\' %\n
@@ -211,8 +213,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
                                           tal:replace="structure struct_final"\n
                                           tal:attributes="class class_final;\n
                                           title field/title"/>\n
-                      </div>\n
-                      <div tal:condition="python:field_errors.has_key(field.id)">\n
+                      </tal:block>\n
+                      <tal:block tal:condition="python:field_errors.has_key(field.id)">\n
                         <!-- field has errors 2-->\n
                         <div tal:define="struct_content python:struct_input_div[struct_ind];\n
                                           struct_final python:\'%s %s\' %\n
@@ -222,7 +224,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
                               tal:replace="structure struct_final"\n
                               tal:attributes="class class_final;\n
                               title field/title"/>\n
-                      </div>\n
+                      </tal:block>\n
                     </div>\n
                   </tal:block>\n
                 </div>\n

bt5/erp5_pdf_editor/bt/change_log

+2008-04-10 fabien
+* add css class for div with no input inside. This is necessary to have a correct rendering of readOnly fields (non editable).
+* remove string after '/>'. This is tipicaly time and date separator that make the field rendering position bad.
+* replace some unused div with tal:block, this make html source code more clean
+
+
 2008-03-31 fabien
 * add update_module_scribus portal action that permit to update the forms of a module created using the create_module_scribus action
 

bt5/erp5_pdf_editor/bt/revision

-24
\ No newline at end of file
+26
\ No newline at end of file