Commit ccc8a2f6 authored by Rie Kozai's avatar Rie Kozai

improve and finalize ODS Style

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16039 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 0eefad05
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>your_format</string> <string>your_format</string>
......
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>here/Base_getConversionFormatList</string> </value> <value> <string>python: here.Base_getConversionFormatList(base_content_type=\'application/vnd.oasis.opendocument.spreadsheet\')</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -74,31 +74,31 @@ ...@@ -74,31 +74,31 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list/> <list/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>center</string> </key> <key> <string>center</string> </key>
<value> <value>
<list/> <list/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list/> <list/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list/> <list/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>right</string> </key> <key> <string>right</string> </key>
<value> <value>
<list/> <list/>
</value> </value>
......
...@@ -74,25 +74,25 @@ ...@@ -74,25 +74,25 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list/> <list/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>center</string> </key> <key> <string>center</string> </key>
<value> <value>
<list/> <list/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list/> <list/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>portal_skin</string> <string>portal_skin</string>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>right</string> </key> <key> <string>right</string> </key>
<value> <value>
<list/> <list/>
</value> </value>
......
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>here/Base_getConversionFormatList</string> </value> <value> <string>python: here.Base_getConversionFormatList(base_content_type=\'application/vnd.oasis.opendocument.spreadsheet\')</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -83,10 +83,10 @@ if context.pt != \'form_list\':\n ...@@ -83,10 +83,10 @@ if context.pt != \'form_list\':\n
else:\n else:\n
if landscape == 1:\n if landscape == 1:\n
#style sheet for list, there is under line in preview\n #style sheet for list, there is under line in preview\n
return context.Base_getODSStyleSheetListLandscape\n return context.Base_getODSListStyleSheetLandscape\n
else:\n else:\n
#(Default)\n #preview portrait(Default)\n
return context.Base_getODSStyleSheetListPortrait\n return context.Base_getODSListStyleSheet\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<tal:block metal:use-macro="here/style_macros/macros/style_macro"/>\n <tal:block metal:use-macro="here/style_macros/macros/style_macro"/>\n
<office:body>\n <office:body>\n
<office:spreadsheet>\n <office:spreadsheet>\n
<table:table table:style-name=\'ta1\' table:print=\'false\' tal:attributes="table:name python: form.REQUEST[\'selection_name\'].split(\'_selection\')[0].replace(\'_\', \' \').capitalize()" >\n <table:table table:style-name=\'ta1\' table:print=\'false\' tal:attributes="table:name here/getTitle" >\n
<tal:block metal:define-macro="form_layout" tal:define="dummy python: request.set(\'here\', here); listbox python:form.get_fields_in_group(\'bottom\')[0]">\n <tal:block metal:define-macro="form_layout" tal:define="dummy python: request.set(\'here\', here); listbox python:form.get_fields_in_group(\'bottom\')[0]">\n
<tal:block metal:use-macro="here/listbox_ods_macro/macros/listbox">\n <tal:block metal:use-macro="here/listbox_ods_macro/macros/listbox">\n
<tal:block metal:fill-slot="list_header">\n <tal:block metal:fill-slot="list_header">\n
......
...@@ -71,25 +71,24 @@ ...@@ -71,25 +71,24 @@
\n \n
<tal:block tal:condition="python: len(listboxline_list) > 1">\n <tal:block tal:condition="python: len(listboxline_list) > 1">\n
<tal:block tal:condition="python: is_domain_tree_mode">\n <tal:block tal:condition="python: is_domain_tree_mode">\n
<tal:block tal:define="domain_list python: selection.getDomainList()" tal:condition="python: len(domain_list) > 0" >\n <tal:block tal:define="domain_list python: selection.getDomainList()" tal:condition="python: len(domain_list) > 0">\n
<table:table-column table:style-name="co2"/>\n <table:table-column table:style-name="co2"/>\n
<table:table-row>\n <table:table-row>\n
<table:table-cell office:value-type=\'string\'>\n <table:table-cell office:value-type=\'string\'>\n
<text:p tal:content="python: domain_list[-1]" />\n <text:p tal:content="python: domain_list[-1]"/>\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
\n
<tal:block tal:repeat="listboxline python: listboxline_list">\n <tal:block tal:repeat="listboxline python: listboxline_list">\n
<table:table-column table:style-name=\'co2\' />\n <table:table-column table:style-name=\'co2\'/>\n
<tal:block metal:define-slot="for_form_list" tal:condition="listboxline/isTitleLine | python: is_report_tree_mode">\n <tal:block metal:define-slot="for_form_list" tal:condition="listboxline/isTitleLine | python: is_report_tree_mode">\n
<tal:block metal:define-slot="list_header">\n <tal:block metal:define-slot="list_header">\n
<table:table-row table:style-name=\'ro4\'>\n <table:table-row table:style-name=\'ro4\'>\n
<tal:block tal:condition="python: is_report_tree_mode">\n <tal:block tal:condition="python: is_report_tree_mode">\n
<table:table-cell table:style-name=\'report-column-title\' table:number-columns-spanned=\'1\' office:value-type=\'string\' >\n <table:table-cell table:style-name=\'report-column-title\' table:number-columns-spanned=\'1\' office:value-type=\'string\'>\n
<tal:block tal:condition="listboxline/getSectionName">\n <tal:block tal:condition="listboxline/getSectionName">\n
<text:p tal:content="python: here.Localozer.erp5_ui.gettext(listboxline/getSectionName).encode(\'utf-8\')"/>\n <text:p tal:content="listboxline/getSectionName"/>\n
</tal:block>\n </tal:block>\n
</table:table-cell>\n </table:table-cell>\n
</tal:block>\n </tal:block>\n
...@@ -98,8 +97,8 @@ ...@@ -98,8 +97,8 @@
<tal:block tal:condition="listboxline/isTitleLine">\n <tal:block tal:condition="listboxline/isTitleLine">\n
<tal:block tal:repeat="column_item listboxline/getColumnItemList">\n <tal:block tal:repeat="column_item listboxline/getColumnItemList">\n
<tal:block tal:define="column_property python: column_item[1]; column_id python: column_item[0]">\n <tal:block tal:define="column_property python: column_item[1]; column_id python: column_item[0]">\n
<tal:block tal:condition="python: column_property is not None" >\n <tal:block tal:condition="python: column_property is not None">\n
<table:table-cell table:number-rows-spanned=\'1\' table:style-name=\'report-column-title\' table:number-columns-spanned=\'1\' office:value-type=\'string\' >\n <table:table-cell table:number-rows-spanned=\'1\' table:style-name=\'report-column-title\' table:number-columns-spanned=\'1\' office:value-type=\'string\'>\n
<text:p tal:content="python: column_property">\n <text:p tal:content="python: column_property">\n
</text:p>\n </text:p>\n
</table:table-cell>\n </table:table-cell>\n
...@@ -120,48 +119,49 @@ ...@@ -120,48 +119,49 @@
<tal:block tal:condition="not:listboxline/isTitleLine">\n <tal:block tal:condition="not:listboxline/isTitleLine">\n
<table:table-column table:style-name="co2"/>\n <table:table-column table:style-name="co2"/>\n
<table:table-row>\n <table:table-row>\n
<tal:block tal:condition="listboxline/isDataLine | python: listboxline.isSummaryLine()">\n <tal:block tal:condition="python: listboxline.isDataLine() or listboxline.isSummaryLine()">\n
<tal:block tal:repeat="column_item listboxline/getColumnItemList">\n <tal:block tal:repeat="column_item listboxline/getColumnItemList">\n
<tal:block tal:define="column_property python: column_item[1]; column_id python: column_item[0]; is_list python:same_type(column_property, []) or same_type(column_property, ())">\n <tal:block tal:define="column_property python: column_item[1]; column_id python: column_item[0]; is_list python:same_type(column_property, []) or same_type(column_property, ())">\n
<tal:block tal:condition="python: is_list">\n <tal:block tal:condition="python: is_list">\n
<table:table-cell table:style-name=\'report-content-heading2\'>\n <table:table-cell tal:define="field python: editable_fields.get(column_id, None)" tal:attributes="table:style-name python:isinstance(column_property, (int, long, float)) and \'report-stat2-sans-bold\' or \'report-content-heading2\'">\n
<tal:block tal:repeat="item column_property">\n <text:p tal:condition="python: field is None" tal:content="python: column_property">\n
<text:p tal:content="python: here.Localizer.erp5_ui.gettext(item).encode(\'utf-8\')">\n </text:p>\n
</text:p>\n <text:p tal:condition="python: field is not None"\n
</tal:block>\n tal:content="python: field.render_pdf(column_property)">\n
</text:p>\n
</table:table-cell>\n </table:table-cell>\n
</tal:block>\n </tal:block>\n
<tal:block tal:condition="python: column_property is not None and not is_list">\n <tal:block tal:condition="python: column_property is not None and not is_list">\n
<table:table-cell tal:define="field python: editable_fields.get(column_id, None)" tal:attributes="table:style-name python:isinstance(column_property, (int, long, float)) and \'report-stat2-sans-bold\' or \'report-content-heading2\'">\n <table:table-cell tal:define="field python: editable_fields.get(column_id, None)" tal:attributes="table:style-name python:isinstance(column_property, (int, long, float)) and \'report-stat2-sans-bold\' or \'report-content-heading2\'">\n
<text:p tal:condition="python: field is None" tal:content="python: column_property" >\n <text:p tal:condition="python: field is None" tal:content="python: column_property">\n
</text:p>\n </text:p>\n
<text:p tal:condition="python: field is not None"\n <text:p tal:condition="python: field is not None"\n
tal:content="python: here.Localizer.erp5_ui.gettext(field.render_pdf(column_property)).encode(\'utf-8\')" >\n tal:content="python: field.render_pdf(column_property)">\n
</text:p>\n </text:p>\n
</table:table-cell>\n </table:table-cell>\n
</tal:block>\n </tal:block>\n
<tal:block tal:condition="python: column_property is None">\n <tal:block tal:condition="python: column_property is None">\n
<table:table-cell office:value-type=\'string\' table:style-name=\'report-content-heading2\' table:number-columns-spanned=\'1\' >\n <table:table-cell office:value-type=\'string\' table:style-name=\'report-content-heading2\' table:number-columns-spanned=\'1\'>\n
<text:p tal:content="python: \'\'" >\n <text:p tal:content="python: \'\'">\n
</text:p>\n </text:p>\n
</table:table-cell>\n </table:table-cell>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
<tal:block tal:condition="python: listboxline.isStatLine() or listboxline.isSummaryLine()" >\n <tal:block tal:condition="python: listboxline.isStatLine() or listboxline.isSummaryLine()">\n
<tal:block tal:repeat="column_item python: listboxline.getColumnItemList()">\n <tal:block tal:repeat="column_item python: listboxline.getColumnItemList()">\n
<tal:block tal:define="column_property python: column_item[1]; column_id python: column_item[0]">\n <tal:block tal:define="column_property python: column_item[1]; column_id python: column_item[0]">\n
<tal:block tal:condition="python: column_property is not None">\n <tal:block tal:condition="python: column_property is not None">\n
<table:table-cell table:style-name="report-stat2-sans-bold" table:number-columns-spanned=\'1\' tal:define="field python: editable_fields.get(column_id, None)" >\n <table:table-cell table:style-name="report-stat2-sans-bold-with-lines" table:number-columns-spanned=\'1\' tal:define="field python: editable_fields.get(column_id, None)"> \n
<text:p tal:condition="python: field is None" tal:content="python: column_property">\n <text:p tal:condition="python: field is None" tal:content="python: column_property">\n
</text:p>\n </text:p>\n
<text:p tal:condition="python: field is not None" tal:content="python:here.Localizer.erp5_ui.gettext(field.render_pdf(column_property)).encode(\'utf-8\')">\n <text:p tal:condition="python: field is not None" tal:content="python:field.render_pdf(column_property)">\n
</text:p>\n </text:p>\n
</table:table-cell>\n </table:table-cell>\n
</tal:block>\n </tal:block>\n
<tal:block tal:condition="python: column_property is None">\n <tal:block tal:condition="python: column_property is None">\n
<table:table-cell table:style-name="report-stat2-sans-bold" table:number-columns-spanned=\'1\' >\n <table:table-cell table:style-name="report-stat2-sans-bold-with-lines" table:number-columns-spanned=\'1\' >\n
</table:table-cell>\n </table:table-cell>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
...@@ -170,7 +170,6 @@ ...@@ -170,7 +170,6 @@
</table:table-row>\n </table:table-row>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
\n
<table:table-column table:style-name="co2"/>\n <table:table-column table:style-name="co2"/>\n
<table:table-row metal:define-slot="table_bottom_line">\n <table:table-row metal:define-slot="table_bottom_line">\n
<tal:block tal:repeat="listboxline python: listboxline_list">\n <tal:block tal:repeat="listboxline python: listboxline_list">\n
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
\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:condition="python: sheet_per_reportsection == 0">\n <tal:block tal:condition="python: sheet_per_reportsection == 0">\n
<table:table tal:attributes="table:name python:form.REQUEST[\'selection_name\'].split(\'_selection\')[0].replace(\'_\', \' \').capitalize()">\n <table:table tal:attributes="table:name python:here.getProperty(\'title\')">\n
<tal:block tal:repeat="report_item report_item_list">\n <tal:block tal:repeat="report_item report_item_list">\n
<tal:block metal:define-macro="make_report_item_table" tal:define="here python:report_item.getObject(portal_object); dummy python:report_item.pushReport(portal_object)">\n <tal:block metal:define-macro="make_report_item_table" tal:define="here python:report_item.getObject(portal_object); 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 | report_item/getTranslatedTitle">\n
......
2007-08-31 2007-09-04 rie
*modifies your_format
*change ods sheet's title of report_view and of form_list
2007-08-31 rie
*improve encoding *improve encoding
2007-08-30 rie 2007-08-30 rie
......
59 82
\ 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