Author: croberts
Date: 2011-11-08 20:36:56 +0000 (Tue, 08 Nov 2011)
New Revision: 5122
Modified:
branches/noflash/cumin/python/cumin/grid/negotiator.strings
branches/noflash/cumin/python/cumin/stat.strings
Log:
Fixing leftlegend conflict for the negotiator quota editing legend. Also resolving the
updatePieChart function conflict.
Modified: branches/noflash/cumin/python/cumin/grid/negotiator.strings
===================================================================
--- branches/noflash/cumin/python/cumin/grid/negotiator.strings 2011-11-08 20:07:15 UTC
(rev 5121)
+++ branches/noflash/cumin/python/cumin/grid/negotiator.strings 2011-11-08 20:36:56 UTC
(rev 5122)
@@ -25,7 +25,7 @@
<script type="text/javascript" charset="utf-8">
//<![CDATA[
- updatePieChart = function (vals, legend) {
+ updateQuotaPieChart = function (vals, legend) {
var data = combineValsAndLegend(vals, legend);
colors = ['#4572A7', '#AA4643', '#89A54E', '#80699B',
'#3D96AE', '#000000', '#666600']
colors[vals.length-1]= "#B0B0B0";
@@ -58,21 +58,10 @@
);
}
- combineValsAndLegend = function (vals, legend) {
- var index, length;
- var result = [];
- result.length = vals.length; // Helps performance in some implemenations, harmless in
others
- for (index = 0, length = vals.length; index < length; ++index) {
- result[index] = [legend[index], vals[index]];
- }
- return result;
-
- }
-
window.addEvent("domready", function () {
values = {all_group_values};
legend = {all_group_names};
- updatePieChart(values, legend);
+ updateQuotaPieChart(values, legend);
});
@@ -244,7 +233,7 @@
values_array[i] = new_values[i]['value'];
legend_array[i] = new_values[i]['label'];
}
- updatePieChart(values_array, legend_array);
+ updateQuotaPieChart(values_array, legend_array);
}//end onchange
}) //end addEvents
Modified: branches/noflash/cumin/python/cumin/stat.strings
===================================================================
--- branches/noflash/cumin/python/cumin/stat.strings 2011-11-08 20:07:15 UTC (rev 5121)
+++ branches/noflash/cumin/python/cumin/stat.strings 2011-11-08 20:36:56 UTC (rev 5122)
@@ -301,7 +301,7 @@
<div>
<!-- don't put this data url inside the holder div, jqplot will kill it
on a zoom -->
<a rel="api" type="application/json"
href="{href}" style="display:none">Data</a>
- <div id="{id_nodots}_chart" class="jqplotgraph"
style="height:150px;width:400px;">
+ <div id="{id_nodots}_chart" class="jqplotgraph leftlegend"
style="height:150px;width:400px;">
<div class="loading"
style="display:none;"><span>Loading...</span></div>
</div>
</div>
Show replies by date