From 5b82c7fd3749604464927e6a14717d5a0cae1ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Wed, 17 Dec 2008 14:02:04 +0000 Subject: [PATCH] define different style macro for axis and legend, and use smaller font for axis git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24929 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_core/ERP5Site_buildChart.xml | 2 +- .../erp5_core/OOoChart_macroLibrary.xml | 17 ++++++++++++++++- product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_buildChart.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_buildChart.xml index 3847e9a9f4..d127dfa16c 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_buildChart.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_buildChart.xml @@ -133,7 +133,7 @@ \n <style:style style:name="chart_legend" style:family="chart">\n <style:graphic-properties draw:fill="none"/>\n - <tal:block metal:use-macro="here/OOoChart_macroLibrary/macros/text_style_properties" />\n + <tal:block metal:use-macro="here/OOoChart_macroLibrary/macros/legend_text_style_properties" />\n </style:style>\n \n <style:style style:name="chart_picture" style:family="chart">\n diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OOoChart_macroLibrary.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OOoChart_macroLibrary.xml index 4d0a36a8d0..fe26a9becd 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OOoChart_macroLibrary.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OOoChart_macroLibrary.xml @@ -71,7 +71,7 @@ xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n office:version=\'1.0\'>\n \n - <tal:block metal:define-macro="text_style_properties">\n + <tal:block metal:define-macro="legend_text_style_properties">\n <style:text-properties fo:font-family="\'DejaVu Sans\'"\n style:font-family-generic="swiss"\n style:font-pitch="variable"\n @@ -85,6 +85,21 @@ style:font-pitch-complex="variable"\n style:font-size-complex="18pt"/>\n </tal:block>\n +\n + <tal:block metal:define-macro="text_style_properties">\n + <style:text-properties fo:font-family="\'DejaVu Sans\'"\n + style:font-family-generic="swiss"\n + style:font-pitch="variable"\n + fo:font-size="10pt"\n + style:font-family-asian="\'DejaVu Sans\'"\n + style:font-family-generic-asian="system"\n + style:font-pitch-asian="variable"\n + style:font-size-asian="10pt"\n + style:font-family-complex="Tahoma"\n + style:font-family-generic-complex="system"\n + style:font-pitch-complex="variable"\n + style:font-size-complex="10pt"/>\n + </tal:block>\n \n <tal:block metal:define-macro="line_style_properties">\n <style:style tal:attributes="style:name string:${style_prefix}${column_id}"\n diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index a47db8f483..6409db2562 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -1048 \ No newline at end of file +1049 \ No newline at end of file -- 2.30.9