dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5244 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-11-30 12:28:41 +0100
message:
  Minor fixes.
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-11-29 16:43:52 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-11-30 11:27:50 +0000
@@ -349,6 +349,7 @@
                 len = len ? len : DV.state.series.names.length;
                 return {
                     position: len > 6 ? 'right' : 'top',
+                    labelFont: '13px arial',
                     boxStroke: '#ffffff',
                     boxStrokeWidth: 0,
                     padding: 0
@@ -362,10 +363,10 @@
                     'stroke-width': 0.2
                 };
             },
-            getTitle: function() {
+            getTitle: function(isPie) {
                 return {
                     type: 'text',
-                    text: DV.init.isInit ? 'Example chart' : DV.state.filter.names[0],
+                    text: DV.init.isInit ? 'Example chart' : isPie ? DV.state.filter.names[0] + ' / ' + DV.state.series.names[0] : DV.state.filter.names[0],
                     font: 'bold 15px arial',
                     fill: '#222',
                     width: 300,
@@ -898,7 +899,7 @@
                 shadow: true,
                 store: DV.store.chart,
                 insetPadding: 60,
-                items: DV.util.chart.getTitle(),
+                items: DV.util.chart.getTitle(true),
                 legend: DV.util.chart.getLegend(DV.state.category.names.length),
                 series: [{
                     type: 'pie',
@@ -1867,9 +1868,9 @@
                                         shadowOffset: 1,
                                         items: [
                                             {
-                                                text: 'PNG',
+                                                text: 'Image',
                                                 iconCls: 'dv-menu-item-png',
-                                                minWidth: 80,
+                                                minWidth: 90,
                                                 handler: function() {
                                                     b.execute(DV.conf.finals.image.png);
                                                 }
@@ -1877,7 +1878,7 @@
                                             {
                                                 text: 'PDF',
                                                 iconCls: 'dv-menu-item-pdf',
-                                                minWidth: 80,
+                                                minWidth: 90,
                                                 handler: function() {
                                                     b.execute(DV.conf.finals.image.pdf);
                                                 }