dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 8977 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-11-12 16:56:38 +0100
message:
  (DV) Chart tips updated.
modified:
  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/scripts/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/css/style.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2012-11-12 14:06:23 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2012-11-12 15:53:28 +0000
@@ -360,6 +360,7 @@
 .x-tip .x-tip-body {
 	font-size: 10px;
 	color: #fff;
+	-webkit-text-stroke: 0.2px #fff;
 }
 
 .x-tip-anchor {
@@ -502,7 +503,7 @@
 /* Chart tips */
 .dv-chart-tips, .dv-chart-tips-pie {
     border-radius: 2px;
-    padding: 3px 4px 2px;
+    padding: 1px 4px 2px;
     border: 2px solid #777;
     background-color: #f1f1f1;
 }
@@ -511,11 +512,11 @@
 }
 
 .dv-chart-tips .x-tip-body, .dv-chart-tips-pie .x-tip-body {
-    padding: 4px;
     background-color: #f1f1f1;
-    font-size: 20px;
+    font-size: 13px;
     font-weight: normal;
     color: #444;
+	-webkit-text-stroke: 0;
 }
 .dv-chart-tips-pie .x-tip-body {
 	font-size: 13px;

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2012-11-12 14:06:23 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2012-11-12 15:53:28 +0000
@@ -846,7 +846,7 @@
 							trackMouse: true,
 							cls: 'dv-chart-tips',
 							renderer: function(si, item) {
-								this.update('' + item.value[1]);
+								this.update('<b>' + item.value[1] + '</b> (' + si.data[DV.conf.finals.data.domain] + ')');
 							}
 						};
 					},
@@ -3789,7 +3789,6 @@
 													},
 													listeners: {
 														load: function(s, node, r) {
-															console.log(r);
 															for (var i = 0; i < r.length; i++) {
 																r[i].data.text = DV.conf.util.jsonEncodeString(r[i].data.text);
 															}