[Erp5-report] r17209 - in /erp5/trunk/bt5/erp5_odt_style: SkinTemplateItem/portal_skins/erp...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Oct 26 18:31:21 CEST 2007
Author: jerome
Date: Fri Oct 26 18:31:20 2007
New Revision: 17209
URL: http://svn.erp5.org?rev=17209&view=rev
Log:
Numerous small fixes.
The notable change is that this style uses field.get_value('css_style') for OOo text style. Base_getODTStyleSheet now defines 'figure' style for this.
Modified:
erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_getODTStyleSheet.xml
erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_list.xml
erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml
erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml
erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml
erp5/trunk/bt5/erp5_odt_style/bt/revision
Modified: erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_getODTStyleSheet.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_getODTStyleSheet.xml?rev=17209&r1=17208&r2=17209&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_getODTStyleSheet.xml (original)
+++ erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_getODTStyleSheet.xml Fri Oct 26 18:31:20 2007
@@ -3,18 +3,15 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>OFS.Image</string>
- <string>File</string>
- </tuple>
- <none/>
+ <global name="File" module="OFS.Image"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_EtagSupport__etag</string> </key>
- <value> <string>ts87945296.95</string> </value>
+ <value> <string>ts93412228.19</string> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
@@ -38,165 +35,178 @@
</item>
<item>
<key> <string>data</string> </key>
- <value> <string encoding="base64">UEsDBBQAAAAAAAFGGDdexjIMJwAAACcAAAAIAAAAbWltZXR5cGVhcHBsaWNhdGlvbi92bmQub2Fz
-aXMub3BlbmRvY3VtZW50LnRleHRQSwMEFAAAAAAAAUYYNwAAAAAAAAAAAAAAABoAAABDb25maWd1
-cmF0aW9uczIvc3RhdHVzYmFyL1BLAwQUAAgACAABRhg3AAAAAAAAAAAAAAAAJwAAAENvbmZpZ3Vy
+ <value> <string encoding="base64">UEsDBBQAAAAAAPd6WjdexjIMJwAAACcAAAAIAAAAbWltZXR5cGVhcHBsaWNhdGlvbi92bmQub2Fz
+aXMub3BlbmRvY3VtZW50LnRleHRQSwMEFAAAAAAA93paNwAAAAAAAAAAAAAAABoAAABDb25maWd1
+cmF0aW9uczIvc3RhdHVzYmFyL1BLAwQUAAgACAD3elo3AAAAAAAAAAAAAAAAJwAAAENvbmZpZ3Vy
YXRpb25zMi9hY2NlbGVyYXRvci9jdXJyZW50LnhtbAMAUEsHCAAAAAACAAAAAAAAAFBLAwQUAAAA
-AAABRhg3AAAAAAAAAAAAAAAAGAAAAENvbmZpZ3VyYXRpb25zMi9mbG9hdGVyL1BLAwQUAAAAAAAB
-Rhg3AAAAAAAAAAAAAAAAGgAAAENvbmZpZ3VyYXRpb25zMi9wb3B1cG1lbnUvUEsDBBQAAAAAAAFG
-GDcAAAAAAAAAAAAAAAAcAAAAQ29uZmlndXJhdGlvbnMyL3Byb2dyZXNzYmFyL1BLAwQUAAAAAAAB
-Rhg3AAAAAAAAAAAAAAAAGAAAAENvbmZpZ3VyYXRpb25zMi9tZW51YmFyL1BLAwQUAAAAAAABRhg3
-AAAAAAAAAAAAAAAAGAAAAENvbmZpZ3VyYXRpb25zMi90b29sYmFyL1BLAwQUAAAAAAABRhg3AAAA
-AAAAAAAAAAAAHwAAAENvbmZpZ3VyYXRpb25zMi9pbWFnZXMvQml0bWFwcy9QSwMEFAAIAAgAAUYY
-NwAAAAAAAAAAAAAAAAsAAABjb250ZW50LnhtbO1bbW/qNhT+vl+BcqV9mGRCoLcvrPSq7dWkSbfS
-pN5N+2oSA7517Mx2SNmvnx0nwQmEpoG2oKVItLaf4zx+fHxOOCnXX55D0lsiLjCjE8frD5weoj4L
-MJ1PnD+//wYunS83P12z2Qz7aBwwPw4RlcBnVKrfPWVNxdiMTpyY0zGDAosxhSESY+mPWYRobjW2
-0eP0WqZHyBVpbJ6CbWuJnmVTY40t2cJp8yunYNs64DBpaqyxSlTbfMaaGj8LAmZMqR5GUOIKi2eC
-6dPEWUgZjV03SZJ+MuozPne9q6srNx0tCPsFLoo5SVGB7yKC9MWE6/U9N8eGSMKm/DTWpkTjcIp4
-Y2mghBu7Kpbzxh6xnNdI4y8gb+wbKbi8vaOg+faOAts2hHJRsyeX7oMaTN8evq19gYdNr6WxJal8
-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
-AO4DAAA1HwAAAAA=</string> </value>
+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</string> </value>
</item>
<item>
<key> <string>precondition</string> </key>
@@ -204,7 +214,7 @@
</item>
<item>
<key> <string>size</string> </key>
- <value> <long>9017</long> </value>
+ <value> <long>9780</long> </value>
</item>
<item>
<key> <string>title</string> </key>
Modified: erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_list.xml?rev=17209&r1=17208&r2=17209&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_list.xml (original)
+++ erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_list.xml Fri Oct 26 18:31:20 2007
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5OOo.OOoTemplate</string>
- <string>OOoTemplate</string>
- </tuple>
- <none/>
+ <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -138,9 +135,7 @@
xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n
xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n
xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n
- tal:attributes=\'dummy\n
- python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n
- tal:define="global frame_width python:25.8"\n
+ tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n
office:version=\'1.0\'>\n
<office:scripts/>\n
<office:font-face-decls>\n
@@ -187,7 +182,7 @@
<style:table-column-properties style:rel-column-width=\'21842*\' style:column-width=\'9.783cm\'/>\n
</style:style>\n
<style:style style:family=\'table-cell\' style:name=\'listbox-table.A1\'>\n
- <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'none\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#b3b3b3\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
+ <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'0.002cm solid #000000\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#e6e6e6\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
<style:background-image/>\n
</style:table-cell-properties>\n
</style:style>\n
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=17209&r1=17208&r2=17209&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 Fri Oct 26 18:31:20 2007
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5OOo.OOoTemplate</string>
- <string>OOoTemplate</string>
- </tuple>
- <none/>
+ <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -158,7 +155,7 @@
<style:table-column-properties style:rel-column-width=\'32768*\' style:column-width=\'14.676cm\'/>\n
</style:style>\n
<style:style style:family=\'table-cell\' style:name=\'field-table.A1\'>\n
- <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'none\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#e6e6e6\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
+ <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'0.002cm solid #000000\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#e6e6e6\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
<style:background-image/>\n
</style:table-cell-properties>\n
</style:style>\n
@@ -186,7 +183,7 @@
<style:table-column-properties style:rel-column-width=\'21842*\' style:column-width=\'9.783cm\'/>\n
</style:style>\n
<style:style style:family=\'table-cell\' style:name=\'listbox-table.A1\'>\n
- <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'none\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#b3b3b3\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
+ <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'0.002cm solid #000000\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#e6e6e6\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
<style:background-image/>\n
</style:table-cell-properties>\n
</style:style>\n
Modified: erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml?rev=17209&r1=17208&r2=17209&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml (original)
+++ erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml Fri Oct 26 18:31:20 2007
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PageTemplates.ZopePageTemplate</string>
- <string>ZopePageTemplate</string>
- </tuple>
- <none/>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -75,10 +72,8 @@
xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n
xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n
xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n
- tal:attributes=\'dummy\n
- python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n
- tal:define="global frame_width python:25.8"\n
- office:version=\'1.0\'>\n
+ tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n
+ office:version=\'1.0\'>\n
<office:scripts/>\n
<office:font-face-decls>\n
<style:font-face svg:font-family="\'DejaVu Sans\'" style:font-family-generic=\'roman\' style:name=\'DejaVu Sans\' style:font-pitch=\'variable\'/>\n
@@ -88,70 +83,6 @@
<office:automatic-styles>\n
<style:style style:family=\'table\' style:name=\'field-table\'>\n
<style:table-properties style:may-break-between-rows=\'false\' table:align=\'margins\' style:width=\'18.352cm\'/>\n
- </style:style>\n
- <style:style style:family=\'table-column\' style:name=\'field-table.A\'>\n
- <style:table-column-properties style:rel-column-width=\'32767*\' style:column-width=\'9.176cm\'/>\n
- </style:style>\n
- <style:style style:family=\'table-column\' style:name=\'field-table.B\'>\n
- <style:table-column-properties style:rel-column-width=\'32768*\' style:column-width=\'9.176cm\'/>\n
- </style:style>\n
- <style:style style:family=\'table-cell\' style:name=\'field-table.A1\'>\n
- <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'none\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#e6e6e6\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
- <style:background-image/>\n
- </style:table-cell-properties>\n
- </style:style>\n
- <style:style style:family=\'table-cell\' style:name=\'field-table.B1\'>\n
- <style:table-cell-properties fo:padding=\'0.097cm\' fo:border=\'0.002cm solid #000000\'/>\n
- </style:style>\n
- <style:style style:family=\'table-cell\' style:name=\'field-table.A2\'>\n
- <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'none\' fo:border-top=\'none\' fo:background-color=\'#e6e6e6\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
- <style:background-image/>\n
- </style:table-cell-properties>\n
- </style:style>\n
- <style:style style:family=\'table-cell\' style:name=\'field-table.B2\'>\n
- <style:table-cell-properties fo:border-left=\'0.002cm solid #000000\' fo:border-right=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\' fo:padding=\'0.097cm\' fo:border-top=\'none\'/>\n
- </style:style>\n
- <style:style style:family=\'table\' style:name=\'listbox-table\'>\n
- <style:table-properties style:may-break-between-rows=\'true\' table:align=\'margins\' style:width=\'18.352cm\'/>\n
- </style:style>\n
- <style:style style:family=\'table-column\' style:name=\'listbox-table.A\'>\n
- <style:table-column-properties style:rel-column-width=\'21845*\' style:column-width=\'6.117cm\'/>\n
- </style:style>\n
- <style:style style:family=\'table-column\' style:name=\'listbox-table.B\'>\n
- <style:table-column-properties style:rel-column-width=\'21848*\' style:column-width=\'6.117cm\'/>\n
- </style:style>\n
- <style:style style:family=\'table-column\' style:name=\'listbox-table.C\'>\n
- <style:table-column-properties style:rel-column-width=\'21842*\' style:column-width=\'6.117cm\'/>\n
- </style:style>\n
- <style:style style:family=\'table-cell\' style:name=\'listbox-table.A1\'>\n
- <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'none\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#b3b3b3\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
- <style:background-image/>\n
- </style:table-cell-properties>\n
- </style:style>\n
- <style:style style:family=\'table-cell\' style:name=\'listbox-table.C1\'>\n
- <style:table-cell-properties fo:padding=\'0.097cm\' fo:background-color=\'#b3b3b3\' fo:border=\'0.002cm solid #000000\'>\n
- <style:background-image/>\n
- </style:table-cell-properties>\n
- </style:style>\n
- <style:style style:family=\'table-cell\' style:name=\'listbox-table.A2\'>\n
- <style:table-cell-properties fo:border-left=\'0.002cm solid #000000\' fo:border-right=\'none\' fo:border-bottom=\'0.002cm solid #000000\' fo:padding=\'0.097cm\' fo:border-top=\'none\'/>\n
- </style:style>\n
- <style:style style:family=\'table-cell\' style:name=\'listbox-table.C2\'>\n
- <style:table-cell-properties fo:border-left=\'0.002cm solid #000000\' fo:border-right=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\' fo:padding=\'0.097cm\' fo:border-top=\'none\'/>\n
- </style:style>\n
- <style:style style:family=\'table-cell\' style:name=\'listbox-table.A3\'>\n
- <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'none\' fo:border-top=\'none\' fo:background-color=\'#e6e6e6\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
- <style:background-image/>\n
- </style:table-cell-properties>\n
- </style:style>\n
- <style:style style:family=\'table-cell\' style:name=\'listbox-table.C3\'>\n
- <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'0.002cm solid #000000\' fo:border-top=\'none\' fo:background-color=\'#e6e6e6\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
- <style:background-image/>\n
- </style:table-cell-properties>\n
- </style:style>\n
- <style:style style:parent-style-name=\'report-title\' style:family=\'paragraph\' style:name=\'P1\'>\n
- <style:paragraph-properties fo:text-align=\'start\' style:justify-single-word=\'false\'/>\n
- <style:text-properties style:font-size-asian=\'14pt\' style:font-size-complex=\'14pt\' fo:font-size=\'14pt\'/>\n
</style:style>\n
</office:automatic-styles>\n
\n
@@ -193,12 +124,18 @@
<table:table-column table:style-name=\'listbox-table.A\'/>\n
</tal:block> \n
<tal:block tal:repeat="listboxline python: listboxline_list">\n
+ <!-- XXX This odd / even thing will probably go away. It\'s\n
+ great for HTML, but not so usefull when print. Actually the\n
+ real problem it\'s it can\'t be defined in the stylesheet\n
+ easily. For now, it\'s defined globally: -->\n
+ <tal:block tal:define="global style_cell python:\'listbox-table.C2\'"/>\n
+\n
<tal:block tal:condition="repeat/listboxline/odd">\n
- <tal:block tal:define="global style_cell python:\'listbox-table.C2\'"/>\n
+ <!-- <tal:block tal:define="global style_cell python:\'listbox-table.C2\'"/> -->\n
<tal:block tal:define="global style_text python:\'listbox-data-a\'"/>\n
</tal:block> \n
<tal:block tal:condition="repeat/listboxline/even">\n
- <tal:block tal:define="global style_cell python:\'listbox-table.C3\'"/>\n
+ <!-- <tal:block tal:define="global style_cell python:\'listbox-table.C3\'"/> -->\n
<tal:block tal:define="global style_text python:\'listbox-data-b\'"/>\n
</tal:block> \n
\n
@@ -211,15 +148,17 @@
</table:table-cell>\n
</table:table-row>\n
</tal:block> \n
+\n
<tal:block tal:condition="python: listboxline.isTitleLine()">\n
<table:table-header-rows>\n
<table:table-row>\n
<tal:block tal:repeat="column_item python: listboxline.getColumnItemList()">\n
<tal:block tal:define="column_property python: column_item[1];\n
- column_id python: column_item[0]">\n
+ column_id python: column_item[0]">\n
<tal:block tal:condition="python: column_property is not None">\n
<table:table-cell table:style-name=\'listbox-table.A1\' office:value-type=\'string\'> \n
- <text:p text:style-name=\'listbox-header\' tal:content="python: here.Localizer.erp5_ui.gettext(str(column_property)).encode(\'utf8\')"/> \n
+ <text:p text:style-name=\'listbox-header\'\n
+ tal:content="python: here.Localizer.erp5_ui.gettext(column_property).encode(\'utf8\')"/> \n
</table:table-cell>\n
</tal:block>\n
<tal:block tal:condition="python: column_property is None">\n
@@ -232,12 +171,14 @@
</table:table-row>\n
</table:table-header-rows>\n
</tal:block>\n
+ \n
+ <!-- Data Line -->\n
<tal:block tal:condition="python: listboxline.isDataLine() ">\n
<table:table-row>\n
<tal:block tal:repeat="column_item python: listboxline.getColumnItemList()">\n
<tal:block tal:define="column_property python: column_item[1];\n
- column_id python: column_item[0];\n
- is_list python:same_type(column_property, []) or same_type(column_property, ())">\n
+ column_id python: column_item[0];\n
+ is_list python:same_type(column_property, []) or same_type(column_property, ())">\n
<tal:block tal:condition="python: is_list">\n
<table:table-cell tal:attributes="table:style-name style_cell" office:value-type=\'string\'>\n
<tal:block tal:repeat="item column_property">\n
@@ -249,10 +190,12 @@
<tal:block tal:condition="python: column_property is not None and not is_list">\n
<table:table-cell tal:attributes="table:style-name style_cell" office:value-type=\'string\' \n
tal:define="field python: editable_fields.get(column_id, None)" >\n
- <text:p tal:attributes="text:style-name style_text" tal:condition="python: field is None"\n
- tal:content="python:str(column_property)"/>\n
- <text:p tal:attributes="text:style-name style_text" tal:condition="python: field is not None" \n
- tal:content="python:field.render_pdf(column_property)"/>\n
+ <text:p tal:attributes="text:style-name style_text"\n
+ tal:condition="python: field is None"\n
+ tal:content="python:str(column_property)"/>\n
+ <text:p tal:attributes="text:style-name python:field.get_value(\'css_class\') or style_text"\n
+ tal:condition="python: field is not None" \n
+ tal:content="python:field.render_pdf(column_property)"/>\n
</table:table-cell>\n
</tal:block>\n
<tal:block tal:condition="python: column_property is None">\n
@@ -263,21 +206,23 @@
</tal:block>\n
</tal:block>\n
</table:table-row>\n
- </tal:block> \n
+ </tal:block>\n
+\n
+ <!-- Stat Line -->\n
<tal:block tal:condition="python: listboxline.isStatLine() or listboxline.isSummaryLine()">\n
<table:table-row>\n
<tal:block tal:repeat="column_item python: listboxline.getColumnItemList()">\n
<tal:block tal:define="column_property python: column_item[1];\n
column_id python: column_item[0]">\n
- <tal:block tal:condition="python: column_property is not None"> \n
- <table:table-cell tal:attributes="table:style-name style_cell" office:value-type=\'string\' \n
- tal:define="field python: editable_fields.get(column_id, None)">\n
+ <tal:block tal:condition="python: column_property is not None"\n
+ tal:define="field python: editable_fields.get(column_id, None);">\n
+ <table:table-cell tal:attributes="table:style-name style_cell" office:value-type=\'string\' >\n
<text:p tal:attributes="text:style-name style_text" \n
-\t\t tal:condition="python: field is None"\n
- tal:content="python:column_property"/>\n
- <text:p tal:attributes="text:style-name style_text" \n
-\t\t tal:condition="python: field is not None" \n
- tal:content="python:field.render_pdf(column_property)"/>\n
+ tal:condition="python: field is None"\n
+ tal:content="python:column_property"/>\n
+ <text:p tal:attributes="text:style-name python: field.get_value(\'css_class\') or style_text"\n
+ tal:condition="python: field is not None"\n
+ tal:content="python:field.render_pdf(column_property)"/>\n
</table:table-cell>\n
</tal:block>\n
<tal:block tal:condition="python: column_property is None">\n
Modified: erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml?rev=17209&r1=17208&r2=17209&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml (original)
+++ erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml Fri Oct 26 18:31:20 2007
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5OOo.OOoTemplate</string>
- <string>OOoTemplate</string>
- </tuple>
- <none/>
+ <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -139,7 +136,6 @@
xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n
xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n
tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n
- tal:define="global frame_width python:25.8"\n
office:version=\'1.0\'>\n
<office:scripts/>\n
<office:font-face-decls>\n
@@ -158,7 +154,9 @@
<style:table-column-properties style:rel-column-width=\'32768*\' style:column-width=\'14.676cm\'/>\n
</style:style>\n
<style:style style:family=\'table-cell\' style:name=\'field-table.A1\'>\n
- <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'none\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#e6e6e6\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
+ <!-- FIXME: can this be in style sheet ? as far as I see, oowriter does\n
+ not allow to set table-cell styles -->\n
+ <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'0.002cm solid #000000\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#e6e6e6\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
<style:background-image/>\n
</style:table-cell-properties>\n
</style:style>\n
@@ -186,7 +184,12 @@
<style:table-column-properties style:rel-column-width=\'21842*\' style:column-width=\'9.783cm\'/>\n
</style:style>\n
<style:style style:family=\'table-cell\' style:name=\'listbox-table.A1\'>\n
- <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'none\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#b3b3b3\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
+ <style:table-cell-properties fo:padding=\'0.097cm\'\n
+ fo:border-right=\'0.002cm solid #000000\'\n
+ fo:border-top=\'0.002cm solid #000000\'\n
+ fo:background-color=\'#e6e6e6\'\n
+ fo:border-left=\'0.002cm solid #000000\'\n
+ fo:border-bottom=\'0.002cm solid #000000\'>\n
<style:background-image/>\n
</style:table-cell-properties>\n
</style:style>\n
@@ -214,6 +217,7 @@
</office:automatic-styles>\n
<office:body>\n
<office:text>\n
+ <!-- XXX val -->\n
<text:sequence-decls>\n
<text:sequence-decl text:display-outline-level=\'0\' text:name=\'Illustration\'/>\n
<text:sequence-decl text:display-outline-level=\'0\' text:name=\'Table\'/>\n
@@ -222,14 +226,14 @@
</text:sequence-decls>\n
\n
<tal:block tal:define="report_item_list python:report_method();\n
- field_errors python: request.get(\'field_errors\',{});\n
- dummy python: request.set(\'here\',here); "> \n
- <text:p text:style-name=\'report-title\' tal:content="python: here.Localizer.erp5_ui.gettext(form.getProperty(\'title\', \'\')).encode(\'utf-8\')"> report title </text:p>\n
+ dummy python: request.set(\'here\',here); "> \n
+ <text:p text:style-name=\'report-title\'\n
+ tal:content="python: here.Localizer.erp5_ui.gettext(form.getProperty(\'title\', \'\')).encode(\'utf-8\')"> report title </text:p>\n
<text:p></text:p> \n
- <spacer height="100" tal:condition="form/get_fields"/>\n
<tal:block tal:repeat="group python: [g for g in form.get_groups() if g not in (\'bottom\', \'hidden\')]">\n
<tal:block tal:define="field_list python: form.get_fields_in_group(group)">\n
<tal:block tal:condition="field_list">\n
+ <!-- TODO: make this a macro for field rendering -->\n
<table:table table:style-name=\'field-table\' table:name=\'field-table\' >\n
<table:table-column table:style-name=\'field-table.A\' table:number-columns-repeated=\'2\'/>\n
<tal:block tal:repeat="field field_list">\n
@@ -240,28 +244,28 @@
</table:table-cell>\n
<table:table-cell table:style-name=\'field-table.B1\' office:value-type=\'string\' tal:define="value python: field.get_value(\'default\')">\n
<tal:block tal:condition="python: same_type(value,[]) or same_type(value,())">\n
+ <!-- XXX render_odf for list fields ? using TAL structure ? -->\n
<tal:block tal:repeat="item value">\n
- <text:p text:style-name=\'field-content\' tal:content="python: str(item)" />\n
+ <text:p text:style-name=\'field-content\' tal:content="item" />\n
</tal:block>\n
- </tal:block>\n
- <tal:block tal:condition="python: not (same_type(value, []) or same_type(value, ()) or same_type(value, None))">\n
- <text:p text:style-name=\'field-content\' tal:content="python: value" />\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
+ <tal:block tal:condition="python: not (same_type(value, []) or same_type(value, ()))">\n
+ <text:p text:style-name=\'field-content\' tal:content="python: field.render_pdf(value)" />\n
</tal:block>\n
</table:table-cell>\n
</table:table-row>\n
</tal:block>\n
</tal:block>\n
- </table:table>\n
- <text:p/>\n
- <text:p/>\n
- <text:p/>\n
- <text:p/>\n
+ </table:table>\n
+ <tal:block tal:condition="form/get_fields">\n
+ <text:p/>\n
+ <text:p/>\n
+ <text:p/>\n
+ <text:p/></tal:block>\n
</tal:block>\n
</tal:block>\n
</tal:block>\n
+ <!-- TODO: another macro for bottom field rendering -->\n
<tal:block tal:define="field_list python: form.get_fields_in_group(\'bottom\')">\n
<tal:block tal:condition="field_list">\n
<tal:block tal:repeat="field field_list">\n
@@ -281,35 +285,32 @@
</tal:block>\n
</tal:block>\n
</tal:block>\n
- </tal:block>\n
+ </tal:block> <!-- TODO: if possible a macro for form rendering ? -->\n
+\n
<tal:block tal:define="portal_object here/portal_url/getPortalObject">\n
<tal:block tal:repeat="report_item report_item_list">\n
<tal:block tal:define="here python:report_item.getObject(portal_object);\n
- dummy python:report_item.pushReport(portal_object)">\n
- <tal:block tal:condition="report_item/getTitle | report_item/getTranslatedTitle">\n
- \t <tal:block tal:condition="report_item/getTitle">\n
- <text:p tal:content="report_item/getTitle"\n
-\t\t\t i18n:translate=""\n
-\t\t\t tal:attributes="text:style-name string:report-title-${report_item/getLevel}">toto</text:p><text:p/>\n
- </tal:block>\n
- <tal:block tal:condition="report_item/getTranslatedTitle">\n
-\t\t <text:p tal:content="report_item/getTranslatedTitle"\n
-\t\t\t tal:attributes="text:style-name string:report-title-${report_item/getLevel}">toto</text:p><text:p/>\n
- </tal:block>\n
- </tal:block> \n
+ dummy python:report_item.pushReport(portal_object)">\n
+ <tal:block tal:condition="report_item/getTitle">\n
+ <text:p\n
+ tal:content="report_item/getTitle"\n
+ tal:attributes="text:style-name string:report-title-${report_item/getLevel}"\n
+ >report item title</text:p><text:p/>\n
+ </tal:block>\n
+\n
<tal:block tal:condition="report_item/getFormId">\n
- <tal:block tal:define="form python:getattr(here,report_item.getFormId())" >\n
+ <tal:block tal:define="form python:getattr(here, report_item.getFormId())" >\n
<tal:block tal:condition="python:form.pt == \'form_view\'">\n
- <tal:block metal:use-macro="form/form_view/macros/form_layout"/>\n
+ <tal:block metal:use-macro="form/form_view/macros/form_layout"/>\n
</tal:block>\n
<tal:block tal:condition="python:form.pt == \'form_list\'">\n
<tal:block metal:use-macro="form/form_list/macros/form_layout"/>\n
</tal:block></tal:block></tal:block>\n
</tal:block>\n
<tal:block tal:define="dummy python:report_item.popReport(portal_object)"/>\n
- </tal:block>\n
</tal:block>\n
</tal:block>\n
+ </tal:block>\n
</office:text>\n
</office:body>\n
</office:document-content>\n
Modified: erp5/trunk/bt5/erp5_odt_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/bt/revision?rev=17209&r1=17208&r2=17209&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/bt/revision (original)
+++ erp5/trunk/bt5/erp5_odt_style/bt/revision Fri Oct 26 18:31:20 2007
@@ -1,1 +1,1 @@
-10
+11
More information about the Erp5-report
mailing list