From croberts@fedoraproject.org Wed Aug 19 23:57:27 2015
From: croberts@fedoraproject.org
To: cumin-developers@lists.fedorahosted.org
Subject: r5111 - in branches/noflash/cumin: python/cumin/grid resources
Date: Thu, 03 Nov 2011 20:15:20 +0000
Message-ID: <20111103201521.08CC21201EC@lists.fedorahosted.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5722695370692300545=="

--===============5722695370692300545==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: croberts
Date: 2011-11-03 20:15:19 +0000 (Thu, 03 Nov 2011)
New Revision: 5111

Modified:
   branches/noflash/cumin/python/cumin/grid/dashboard.strings
   branches/noflash/cumin/resources/app.js
Log:
Changes for non-flash graph axis formatting and the png pie chart replacement=
s.

Modified: branches/noflash/cumin/python/cumin/grid/dashboard.strings
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/noflash/cumin/python/cumin/grid/dashboard.strings	2011-11-03 15:=
12:45 UTC (rev 5110)
+++ branches/noflash/cumin/python/cumin/grid/dashboard.strings	2011-11-03 20:=
15:19 UTC (rev 5111)
@@ -209,11 +209,9 @@
 [DefinitionSet.pie_html]
  <script type=3D"text/javascript" charset=3D"utf-8">
  //<![CDATA[
-  window.addEvent("domready", function () {
      values =3D {pie_slices};
      colors =3D {colors};
-     updatePieChart("{id_nodots}", values, colors);
- });    =20
+     updatePieChart("{id_nodots}", values, colors);   =20
 //]]>
 </script>   =20
    =20

Modified: branches/noflash/cumin/resources/app.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/noflash/cumin/resources/app.js	2011-11-03 15:12:45 UTC (rev 5110)
+++ branches/noflash/cumin/resources/app.js	2011-11-03 20:15:19 UTC (rev 5111)
@@ -630,14 +630,13 @@
             format =3D $j.jqplot.config.defaultTickFormatString;
         }
         if (val > 1000000) {
-        	val =3D val / 100000
+        	val =3D val / 1000000
         	format =3D "%.2fM";
         }
-        if (val > 10000) {
-        	val =3D val / 100
+        if (val > 100000) {
+        	val =3D val / 10000
         	format =3D "%.2fk";
-        }
-       =20
+        }       =20
         tickval =3D $j.jqplot.sprintf(format, val);
     }
     else {
@@ -648,8 +647,8 @@
=20
 updatePieChart =3D function (piediv, vals, colors) {
 	  var data =3D vals;
-	 =20
-	  var plot1 =3D jQuery.jqplot (piediv, [data],
+	  $(piediv).empty();
+	  jQuery.jqplot (piediv, [data],
 	    {
 	      grid: {
             drawBorder: false,=20
@@ -660,18 +659,20 @@
 	      seriesDefaults: {
 	        renderer: jQuery.jqplot.PieRenderer,
 	        rendererOptions: {
-	          showDataLabels: false,
-	          dataLabels: 'value',
+	          showDataLabels: true,
+	          dataLabels: 'percent',
 	          dataLabelThreshold: 3,
 	          shadow:true,
 	          shadowOffset: 1,
 	          shadowAlpha: 0.06,
 	          shadowDepth: 5,
 	          padding:5,
-	          hilightMouseOver: false
+	          sliceMargin:3,
+	          diameter:null,
+	          highlightMouseOver: false
 	        }
 	      },
-	      legend: { show:false, location: 'e' },
+	      legend: { show:false},
 	      seriesColors: colors
 	    }
 	  );


--===============5722695370692300545==--