dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5838 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-01-31 16:57:02 +0100
message:
  (DV) Series mouseover tooltips implemented.
modified:
  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/css/style.css


--
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	2012-01-31 13:40:37 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-01-31 15:55:11 +0000
@@ -660,8 +660,9 @@
 					getTips: function() {
 						return {
 							trackMouse: true,
-							height: 31,
-							renderer: function(item) {
+							cls: 'dv-chart-tips',
+							renderer: function(si, item) {
+								this.update(item.value[1]);
 							}
 						};
 					},
@@ -758,7 +759,8 @@
 								markerConfig: {
 									type: 'circle',
 									radius: 4
-								}
+								},
+								tips: DV.util.chart.default.series.getTips()
 							});
 						}
 						return a;
@@ -794,10 +796,9 @@
 					getTips: function() {
 						return {
 							trackMouse: true,
-							height: 47,
+							cls: 'dv-chart-tips-pie',
 							renderer: function(item) {
-								this.setWidth((item.data[DV.conf.finals.data.domain].length * 8) + 15);
-								this.setTitle('<span class="dv-chart-tips">' + item.data[DV.conf.finals.data.domain] + '<br/><b>' + item.data[DV.state.series.names[0]] + '</b></span>');
+								this.update(item.data[DV.conf.finals.data.domain] + '<br/><b>' + item.data[DV.state.series.names[0]] + '</b>');
 							}
 						};
 					}
@@ -1474,7 +1475,8 @@
 				style: {
 					opacity: 0.8,
 					stroke: '#333'
-				}
+				},
+				tips: DV.util.chart.default.series.getTips()
 			});
 			if (DV.state.targetLineValue && !stacked) {
 				series.push(DV.util.chart.default.series.getTargetLine());
@@ -1504,7 +1506,8 @@
 				style: {
 					opacity: 0.8,
 					stroke: '#333'
-				}
+				},
+				tips: DV.util.chart.default.series.getTips()
 			});
 			if (DV.state.targetLineValue && !stacked) {
 				series.push(DV.util.chart.bar.series.getTargetLine());
@@ -1571,7 +1574,6 @@
                     type: 'pie',
                     field: DV.state.series.names[0],
                     showInLegend: true,
-                    tips: DV.util.chart.pie.series.getTips(),
                     label: {
                         field: DV.conf.finals.data.domain
                     },
@@ -1583,7 +1585,8 @@
                     style: {
                         opacity: 0.9,
 						stroke: '#555'
-                    }
+                    },
+                    tips: DV.util.chart.pie.series.getTips()
                 }],
                 theme: 'dv1'
             });

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2012-01-30 14:32:22 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2012-01-31 15:55:11 +0000
@@ -341,7 +341,7 @@
     -ms-border-radius: 2px 2px 2px 2px;
     -khtml-border-radius: 2px 2px 2px 2px;
     border-radius: 2px 2px 2px 2px;
-    padding: 2px 5px 2px 2px;
+    padding: 0 2px;
     border-width: 2px;
     border-style: solid;
     background-color: #f1f1f1;
@@ -491,10 +491,11 @@
 }
 
 /* Chart tips */
-.dv-chart-tips {
-    font-size: 13px;
-    padding: 0 0 3px 3px;
-    font-weight: normal;
+.dv-chart-tips .x-tip-body {
+    font-size: 27px;
+}
+.dv-chart-tips-pie .x-tip-body {
+    font-size: 17px;
 }
 
 /* Window */