[Erp5-report] r24929 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Dec 17 15:02:04 2008
New Revision: 24929

URL: http://svn.erp5.org?rev=24929&view=rev
Log:
define different style macro for axis and legend, and use smaller font for axis

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_buildChart.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OOoChart_macroLibrary.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_buildChart.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_buildChart.xml?rev=24929&r1=24928&r2=24929&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_buildChart.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_buildChart.xml [utf8] Wed Dec 17 15:02:04 2008
@@ -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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OOoChart_macroLibrary.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OOoChart_macroLibrary.xml?rev=24929&r1=24928&r2=24929&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OOoChart_macroLibrary.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OOoChart_macroLibrary.xml [utf8] Wed Dec 17 15:02:04 2008
@@ -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
@@ -84,6 +84,21 @@
                           style:font-family-generic-complex="system"\n
                           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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=24929&r1=24928&r2=24929&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Wed Dec 17 15:02:04 2008
@@ -1,1 +1,1 @@
-1048
+1049