[Erp5-report] r19420 - in /erp5/trunk/bt5/erp5_ods_style: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Feb 19 18:53:45 2008
New Revision: 19420

URL: http://svn.erp5.org?rev=19420&view=rev
Log:
Don't display an extra cell in stat line ( + other minor style fixes)

Modified:
    erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_line_ods_macro.xml
    erp5/trunk/bt5/erp5_ods_style/bt/revision

Modified: erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_line_ods_macro.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_line_ods_macro.xml?rev=19420&r1=19419&r2=19420&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_line_ods_macro.xml (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_line_ods_macro.xml Tue Feb 19 18:53:45 2008
@@ -62,7 +62,7 @@
                  tal:define="listboxline python: listbox_line_structure[\'line\']">\n
 \n
         <tal:block metal:define-slot="for_form_list"\n
-                    tal:condition="listboxline/isTitleLine | is_report_tree_mode">\n
+                   tal:condition="listboxline/isTitleLine">\n
           <tal:block metal:define-slot="list_header">\n
             <table:table-row table:style-name=\'ro4\'>\n
               <tal:block tal:condition="python: is_report_tree_mode">\n
@@ -112,10 +112,10 @@
               </tal:block>\n
               <tal:block tal:repeat="column_item listboxline/getColumnItemList">\n
                 <tal:block tal:define="column_property python: column_item[1];\n
-                                        value column_property;\n
-                                        column_id python: column_item[0];\n
-                                        style_prefix string:;\n
-                                        field python: editable_fields.get(column_id, None);">\n
+                                       value column_property;\n
+                                       column_id python: column_item[0];\n
+                                       style_prefix string:;\n
+                                       field python: editable_fields.get(column_id, None);">\n
                   <tal:block metal:use-macro="here/field_ods_macro/macros/cell_value"/>\n
                 </tal:block>\n
               </tal:block>\n
@@ -129,11 +129,10 @@
                 </table:table-cell>\n
               </tal:block>\n
               <table:table-cell table:style-name=\'report-column-title\'\n
+                                tal:condition="listboxline/getSectionName"\n
                                 table:number-columns-spanned=\'1\'\n
                                 office:value-type=\'string\'>\n
-                <tal:block tal:condition="listboxline/getSectionName">\n
                   <text:p tal:content="listboxline/getSectionName"/>\n
-                </tal:block>\n
               </table:table-cell>\n
               <tal:block tal:repeat="empty_index python: xrange(listboxline.getSectionDepth()+1, max_section_depth)">\n
                 <table:table-cell table:style-name=\'report-column-title\'\n
@@ -143,10 +142,10 @@
               </tal:block>\n
               <tal:block tal:repeat="column_item python: listboxline.getColumnItemList()">\n
                 <tal:block tal:define="column_property python: column_item[1];\n
-                                        value column_property;\n
-                                        column_id python: column_item[0];\n
-                                        style_prefix string:stat-;\n
-                                        field python: editable_fields.get(column_id, None);">\n
+                                       value column_property;\n
+                                       column_id python: column_item[0];\n
+                                       style_prefix string:stat-;\n
+                                       field python: editable_fields.get(column_id, None);">\n
                   <tal:block metal:use-macro="here/field_ods_macro/macros/cell_value"/>\n
                 </tal:block>\n
               </tal:block>\n

Modified: erp5/trunk/bt5/erp5_ods_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/bt/revision?rev=19420&r1=19419&r2=19420&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/bt/revision (original)
+++ erp5/trunk/bt5/erp5_ods_style/bt/revision Tue Feb 19 18:53:45 2008
@@ -1,1 +1,1 @@
-123
+124