Skip to content

erp5
erp5
Commit 60abec3d authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

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.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17209 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 115868e4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 259 additions and 311 deletions
bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_list.xml
View file @ 60abec3d
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
<string>Products.ERP5OOo.OOoTemplate</string> <tuple/>
<string>OOoTemplate</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -138,9 +135,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -138,9 +135,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n
xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n
xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n
tal:attributes=\'dummy\n tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\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 office:version=\'1.0\'>\n
<office:scripts/>\n <office:scripts/>\n
<office:font-face-decls>\n <office:font-face-decls>\n
...@@ -187,7 +182,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -187,7 +182,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
<style:table-column-properties style:rel-column-width=\'21842*\' style:column-width=\'9.783cm\'/>\n <style:table-column-properties style:rel-column-width=\'21842*\' style:column-width=\'9.783cm\'/>\n
</style:style>\n </style:style>\n
<style:style style:family=\'table-cell\' style:name=\'listbox-table.A1\'>\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:background-image/>\n
</style:table-cell-properties>\n </style:table-cell-properties>\n
</style:style>\n </style:style>\n
......
bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml
View file @ 60abec3d
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
<string>Products.ERP5OOo.OOoTemplate</string> <tuple/>
<string>OOoTemplate</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -158,7 +155,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -158,7 +155,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
<style:table-column-properties style:rel-column-width=\'32768*\' style:column-width=\'14.676cm\'/>\n <style:table-column-properties style:rel-column-width=\'32768*\' style:column-width=\'14.676cm\'/>\n
</style:style>\n </style:style>\n
<style:style style:family=\'table-cell\' style:name=\'field-table.A1\'>\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:background-image/>\n
</style:table-cell-properties>\n </style:table-cell-properties>\n
</style:style>\n </style:style>\n
...@@ -186,7 +183,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -186,7 +183,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
<style:table-column-properties style:rel-column-width=\'21842*\' style:column-width=\'9.783cm\'/>\n <style:table-column-properties style:rel-column-width=\'21842*\' style:column-width=\'9.783cm\'/>\n
</style:style>\n </style:style>\n
<style:style style:family=\'table-cell\' style:name=\'listbox-table.A1\'>\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:background-image/>\n
</style:table-cell-properties>\n </style:table-cell-properties>\n
</style:style>\n </style:style>\n
......
bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml
View file @ 60abec3d
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
<string>Products.ERP5OOo.OOoTemplate</string> <tuple/>
<string>OOoTemplate</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -139,7 +136,6 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -139,7 +136,6 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n
xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\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: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:version=\'1.0\'>\n
<office:scripts/>\n <office:scripts/>\n
<office:font-face-decls>\n <office:font-face-decls>\n
...@@ -158,7 +154,9 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -158,7 +154,9 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
<style:table-column-properties style:rel-column-width=\'32768*\' style:column-width=\'14.676cm\'/>\n <style:table-column-properties style:rel-column-width=\'32768*\' style:column-width=\'14.676cm\'/>\n
</style:style>\n </style:style>\n
<style:style style:family=\'table-cell\' style:name=\'field-table.A1\'>\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:background-image/>\n
</style:table-cell-properties>\n </style:table-cell-properties>\n
</style:style>\n </style:style>\n
...@@ -186,7 +184,12 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -186,7 +184,12 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
<style:table-column-properties style:rel-column-width=\'21842*\' style:column-width=\'9.783cm\'/>\n <style:table-column-properties style:rel-column-width=\'21842*\' style:column-width=\'9.783cm\'/>\n
</style:style>\n </style:style>\n
<style:style style:family=\'table-cell\' style:name=\'listbox-table.A1\'>\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:background-image/>\n
</style:table-cell-properties>\n </style:table-cell-properties>\n
</style:style>\n </style:style>\n
...@@ -214,6 +217,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -214,6 +217,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
</office:automatic-styles>\n </office:automatic-styles>\n
<office:body>\n <office:body>\n
<office:text>\n <office:text>\n
<!-- XXX val -->\n
<text:sequence-decls>\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=\'Illustration\'/>\n
<text:sequence-decl text:display-outline-level=\'0\' text:name=\'Table\'/>\n <text:sequence-decl text:display-outline-level=\'0\' text:name=\'Table\'/>\n
...@@ -222,14 +226,14 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -222,14 +226,14 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
</text:sequence-decls>\n </text:sequence-decls>\n
\n \n
<tal:block tal:define="report_item_list python:report_method();\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 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 <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 <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: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:define="field_list python: form.get_fields_in_group(group)">\n
<tal:block tal:condition="field_list">\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 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 <table:table-column table:style-name=\'field-table.A\' table:number-columns-repeated=\'2\'/>\n
<tal:block tal:repeat="field field_list">\n <tal:block tal:repeat="field field_list">\n
...@@ -240,28 +244,28 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -240,28 +244,28 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
</table:table-cell>\n </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 <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 <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 <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>\n </tal:block>\n
<tal:block tal:condition="python: not (same_type(value, []) or same_type(value, ()) or same_type(value, None))">\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: value" />\n <text:p text:style-name=\'field-content\' tal:content="python: field.render_pdf(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>\n
</table:table-cell>\n </table:table-cell>\n
</table:table-row>\n </table:table-row>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
</table:table>\n </table:table>\n
<tal:block tal:condition="form/get_fields">\n
<text:p/>\n <text:p/>\n
<text:p/>\n <text:p/>\n
<text:p/>\n <text:p/>\n
<text:p/>\n <text:p/></tal:block>\n
</tal:block>\n </tal:block>\n
</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:define="field_list python: form.get_fields_in_group(\'bottom\')">\n
<tal:block tal:condition="field_list">\n <tal:block tal:condition="field_list">\n
<tal:block tal:repeat="field field_list">\n <tal:block tal:repeat="field field_list">\n
...@@ -281,24 +285,21 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -281,24 +285,21 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
</tal:block>\n </tal:block>\n
</tal:block>\n </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:define="portal_object here/portal_url/getPortalObject">\n
<tal:block tal:repeat="report_item report_item_list">\n <tal:block tal:repeat="report_item report_item_list">\n
<tal:block tal:define="here python:report_item.getObject(portal_object);\n <tal:block tal:define="here python:report_item.getObject(portal_object);\n
dummy python:report_item.pushReport(portal_object)">\n dummy python:report_item.pushReport(portal_object)">\n
<tal:block tal:condition="report_item/getTitle | report_item/getTranslatedTitle">\n <tal:block tal:condition="report_item/getTitle">\n
\t <tal:block tal:condition="report_item/getTitle">\n <text:p\n
<text:p tal:content="report_item/getTitle"\n tal:content="report_item/getTitle"\n
\t\t\t i18n:translate=""\n tal:attributes="text:style-name string:report-title-${report_item/getLevel}"\n
\t\t\t tal:attributes="text:style-name string:report-title-${report_item/getLevel}">toto</text:p><text:p/>\n >report item title</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
</tal:block> \n \n
<tal:block tal:condition="report_item/getFormId">\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 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>\n
......
bt5/erp5_odt_style/bt/revision
View file @ 60abec3d
10 11
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7