diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_getContentListAsODSReportSectionList.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_getContentListAsODSReportSectionList.xml index 3f1f2b9283e4a8fc08007262fbebea2eb4b3bfab..4a0900335daea88f946499547e3133b6f63432e4 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_getContentListAsODSReportSectionList.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_getContentListAsODSReportSectionList.xml @@ -90,7 +90,7 @@ for doc in portal.portal_selections.callSelectionFor(selection_name, context=for action_title= action[\'title\'] \n \n if action_title != \'History\' and action_title != \'Metadata\':\n - report_section_list.append(ReportSection(path=doc.getPath(), form_id=form_id, level=2, title=\'%s - %s\' % (title, translate(action_title))))\n + report_section_list.append(ReportSection(path=doc.getPath(), form_id=form_id, level=2, title=\'%s-%s\' % (title, translate(action_title))))\n \n return report_section_list\n </string> </value> diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_sheet_per_report_section.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_sheet_per_report_section.xml index 67c4e1be825c7344db52dbf6f7eb200e0900d514..c63a2f66e50cfcab14032ece9d742dd459a93854 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_sheet_per_report_section.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_sheet_per_report_section.xml @@ -163,7 +163,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Export a Sheet per ReportSection</string> </value> + <value> <string>Export A Sheet Per ReportSection</string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getDynamicODSStyleSheet.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getDynamicODSStyleSheet.xml index 2886cc30960b5339c095cab553032b9dd6ad5b7d..45e960d8692d9ff7739a4f53572854d96237a650 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getDynamicODSStyleSheet.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getDynamicODSStyleSheet.xml @@ -75,13 +75,17 @@ request = context.REQUEST\n landscape = int(request.get(\'landscape\', 0))\n if context.pt != \'form_list\':\n if landscape == 1:\n + #normal style sheet with preview of landscape\n return context.Base_getODSStyleSheetLandscape\n else:\n + #preview portrait(Default) \n return context.Base_getODSStyleSheet\n else:\n if landscape == 1:\n + #style sheet for list, there is under line in preview\n return context.Base_getODSStyleSheetListLandscape\n else:\n + #(Default)\n return context.Base_getODSStyleSheetListPortrait\n </string> </value> </item> diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml index 168bdefbbcac7a6bcf10d7f06a561feedc9fe522..9114b3abdf697bcee9e6686acf3c585c54096621 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml @@ -99,14 +99,15 @@ </table:table-header-rows>\n </tal:block>\n <tal:block metal:fill-slot=\'table_bottom_line\'>\n - <tal:block tal:replace="nothing"> don\'t write bottom line in case of this form_list, Page Format of OOo works instead of it.</tal:block>\n + <tal:block tal:replace="nothing"> don\'t write bottom line in case of this form_list, \'Page Format\' of OOo works instead of it.</tal:block>\n </tal:block>\n </tal:block>\n </tal:block>\n </table:table>\n </office:spreadsheet>\n </office:body>\n -</office:document-content> +</office:document-content>\n + ]]></string> </value> </item> diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml index 3ae0c81b084c6e5c7396b3f8830ed69ea9a6c595..37563ee2e086661b52333ef900fe1c702e38ba31 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml @@ -67,19 +67,18 @@ dQEAAAAA</string> </value> \n <tal:block tal:define="field_list python:form.get_fields_in_group(\'bottom\')">\n <tal:block tal:define="global column_len python:3"/>\n - <tal:block tal:repeat="field python:field_list[1:]">\n + <tal:block tal:define="field python:field_list[0]">\n <tal:block tal:condition="python:field.meta_type == \'ListBox\' or (field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type == \'ListBox\')">\n <tal:block tal:define="column_list python: field.get_value(\'columns\'); global column_len python: len(column_list)" />\n -\n </tal:block>\n </tal:block>\n </tal:block>\n \n - <table:table table:style-name=\'ta1\' table:print=\'false\' tal:attributes="table:name python: here.getTitle()">\n + <table:table table:style-name=\'ta1\' table:print=\'false\' tal:attributes="table:name python: unicode(here.getTitle(), \'utf-8\')">\n <tal:block metal:define-macro="form_layout">\n <tal:block tal:define="field_errors python: request.get(\'field_errors,{}\'); dummy python: request.set(\'here\', here)">\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="python: field_list not in [None, []]">\n <tal:block tal:repeat="field field_list">\n <tal:block tal:condition="python:field.meta_type != \'HiddenStringField\'">\n @@ -118,7 +117,7 @@ dQEAAAAA</string> </value> </tal:block>\n </tal:block>\n </tal:block>\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:repeat="field field_list">\n <tal:block metal:use-macro="here/field_ods_macro/macros/field" />\n </tal:block>\n diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml index 8946836fd03b858d35192bd8f11995c4f736f088..4c8bfc5dd7043eb58d9ebbd7dc7e00f44176e0af 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml @@ -59,8 +59,6 @@ \n <office:body metal:define-macro="form_layout">\n <office:spreadsheet>\n -\n - ** ##### listbox: must define the field listbox before calling this macro ! ##### **\n \n <tal:block metal:define-macro="listbox">\n <tal:block tal:define="listboxline_list python: listbox.get_value(\'default\', render_format=\'list\', REQUEST=request);\n diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/matrixbox_ods_macro.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/matrixbox_ods_macro.xml index ac1fce1148c441cf3259d750a50d28fa8538084a..0994199fb9ac9549e5660742b2d471b37a50c81f 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/matrixbox_ods_macro.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/matrixbox_ods_macro.xml @@ -48,33 +48,31 @@ <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ -<tal:block xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\' xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\' xmlns:metal=\'http://xml.zope.org/namespaces/metal\' office:version=\'1.0\' metal:define-macro="master">\n +<tal:block xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\' xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\' xmlns:metal=\'http://xml.zope.org/namespaces/metal\' office:version=\'1.0\' metal:define-macro="master" tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'>\n <tal:block metal:use-macro="here/style_macros/macros/style_macro"/>\n <office:scripts/>\n \n <office:body metal:define-macro="form_layout">\n <office:spreadsheet>\n \n - ** ## matrixbox: must define the field matrixbox before calling this macro ! ## **\n <tal:block metal:define-macro="matrixbox">\n <tal:block tal:define="list python:matrixbox.get_value(\'default\', render_format=\'list\', REQUEST=request)" >\n - <!--<tal:block tal:define="pon python:here.log(\'matrixbox\', \'%r\' % list)" />-->\n <tal:block tal:repeat="tab list">\n <tal:block tal:repeat="row tab">\n <table:table-row tal:condition="python: row != [None, None]" table:style-name=\'ro4\'>\n <tal:block tal:repeat="column row">\n - <tal:block tal:define="repeat_num repeat/column/number">\n - <tal:block tal:condition="python:repeat_num == 1">\n - <table:table-cell table:style-name=\'report-column-title\'>\n - <text:p tal:content="python: column" />\n - </table:table-cell>\n + <tal:block tal:define="repeat_num repeat/column/number">\n + <tal:block tal:condition="python:repeat_num == 1">\n + <table:table-cell table:style-name=\'report-column-title\'>\n + <text:p tal:content="python: column" />\n + </table:table-cell>\n + </tal:block>\n + <tal:block tal:condition="python:repeat_num == 2">\n + <table:table-cell table:style-name=\'report-content-heading2-with-lines\'>\n + <text:p tal:content="python: column" />\n + </table:table-cell>\n + </tal:block>\n </tal:block>\n - <tal:block tal:condition="python:repeat_num == 2">\n - <table:table-cell table:style-name=\'report-content-heading2-with-lines\'>\n - <text:p tal:content="python: column" />\n - </table:table-cell>\n - </tal:block>\n - </tal:block>\n </tal:block>\n </table:table-row>\n </tal:block>\n diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml index 1ad664e07befc9d32f6c32bcdfeedf80d347d20d..c9093d649644b9509adde81b1a839f8995908a14 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml @@ -59,9 +59,7 @@ <office:body>\n <office:spreadsheet>\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);global sheet_per_reportsection python: int(request.get(\'sheet_per_report_section\', 0));global column_len python:3">\n + <tal:block tal:define="report_item_list python:report_method(); field_errors python: request.get(\'field_errors,{}\'); dummy python: request.set(\'here\', here);global sheet_per_reportsection python: int(request.get(\'sheet_per_report_section\', 0));global column_len python:3">\n \n <tal:block tal:define="portal_object here/portal_url/getPortalObject"> \n <tal:block tal:condition="python: sheet_per_reportsection == 0">\n @@ -73,17 +71,17 @@ <tal:block tal:condition="report_item/getTitle" tal:define="level report_item/getLevel">\n <tal:block tal:condition="python: level == 1">\n <table:table-cell table:style-name="report-title" tal:attributes="table:number-columns-spanned python:column_len" office:value-type=\'string\' table:number-rows-spanned=\'1\'>\n - <text:p tal:content="report_item/getTitle" i18n:translate="" i18n:domain="ui"></text:p>\n + <text:p tal:content="report_item/getTitle" ></text:p>\n </table:table-cell>\n </tal:block>\n <tal:block tal:condition="python: level == 2">\n <table:table-cell table:style-name="report-title2" tal:attributes="table:number-columns-spanned python:column_len" office:value-type=\'string\' table:number-rows-spanned=\'1\'>\n - <text:p tal:content="report_item/getTitle" i18n:translate="" i18n:domain="ui"></text:p>\n + <text:p tal:content="report_item/getTitle" ></text:p>\n </table:table-cell>\n </tal:block>\n <tal:block tal:condition="python: level == 3">\n <table:table-cell table:style-name="report-title3" tal:attributes="table:number-columns-spanned python:column_len" office:value-type=\'string\' table:number-rows-spanned=\'1\'>\n - <text:p tal:content="report_item/getTitle" i18n:translate="" i18n:domain="ui"></text:p>\n + <text:p tal:content="report_item/getTitle"></text:p>\n </table:table-cell>\n </tal:block>\n </tal:block>\n @@ -110,7 +108,7 @@ <tal:block tal:condition="python: sheet_per_reportsection == 1">\n <tal:block tal:repeat="report_item python: report_item_list">\n <tal:block tal:condition="python: report_item.getFormId()">\n - <table:table tal:attributes="table:name report_item/getTitle">\n + <table:table tal:attributes="table:name python: unicode(report_item.getTitle(), \'utf-8\')">\n <tal:block metal:use-macro="here/report_view/macros/make_report_item_table"/>\n </table:table>\n </tal:block>\n diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/style_macros.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/style_macros.xml index 471dd4b21f5d4526b27cbed0f8cfe4472540d04c..f59130520163763a30d51f65d81ea9df9b102da4 100644 --- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/style_macros.xml +++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/style_macros.xml @@ -134,7 +134,8 @@ <style:paragraph-properties fo:text-align=\'center\' fo:margin-left=\'0cm\'/>\n </style:style>\n </office:automatic-styles>\n -</tal:block> +</tal:block>\n + ]]></string> </value> </item> diff --git a/bt5/erp5_ods_style/bt/change_log b/bt5/erp5_ods_style/bt/change_log index 575a9b793245b90a77955d6b74d32509ee1cd094..7353048d59277595e1ebfe472dfad821635a4896 100644 --- a/bt5/erp5_ods_style/bt/change_log +++ b/bt5/erp5_ods_style/bt/change_log @@ -1,3 +1,6 @@ +2007-08-31 +*improve encoding + 2007-08-30 rie *improve name of field and file *move global action into portal_properties diff --git a/bt5/erp5_ods_style/bt/revision b/bt5/erp5_ods_style/bt/revision index 7003e7fe1fa0b91d6e034f2f7ac38f2f5989f85c..fc9afb48e033d9a7d2a778e81ae0e9424950c1cd 100644 --- a/bt5/erp5_ods_style/bt/revision +++ b/bt5/erp5_ods_style/bt/revision @@ -1 +1 @@ -51 \ No newline at end of file +59 \ No newline at end of file