allow functions to be given for easypiechart barColor; fixes #1089; fixes #958
Costa Tsaousis (ktsaou) committed
Oct 9, 2016 at 11:42 UTC
654c8cd75e26046996824d7d79294c8e625c0bf6
9 files changed
+19
-9
web/dashboard.html
+1
-1
@@ -652,4 +652,4 @@ So, to avoid flashing the charts, we destroy and re-create the charts on each up
652
<!-- <script> netdataServer = "http://box:19999"; </script> -->
653
654
<!-- load the dashboard manager - it will do the rest -->
655
-<script type="text/javascript" src="dashboard.js?v20161008-1"></script>
655
+<script type="text/javascript" src="dashboard.js?v20161009-1"></script>
web/dashboard.js
+11
-1
@@ -4997,8 +4997,18 @@
4997
state.easyPieChartUnits.style.top = unittop.toString() + 'px';
4998
state.element_chart.appendChild(state.easyPieChartUnits);
4999
5000
+ var barColor = self.data('easypiechart-barcolor');
5001
+ if(typeof barColor === 'undefined' || barColor === null)
5002
+ barColor = state.chartColors()[0];
5003
+ else {
5004
+ // <div ... data-easypiechart-barcolor="(function(percent){return(percent < 50 ? '#5cb85c' : percent < 85 ? '#f0ad4e' : '#cb3935');})" ...></div>
5005
+ var tmp = eval(barColor);
5006
+ if(typeof tmp === 'function')
5007
+ barColor = tmp;
5008
+ }
5009
+
5010
chart.easyPieChart({
5001
- barColor: self.data('easypiechart-barcolor') || state.chartColors()[0], //'#ef1e25',
5011
+ barColor: barColor,
5012
trackColor: self.data('easypiechart-trackcolor') || NETDATA.themes.current.easypiechart_track,
5013
scaleColor: self.data('easypiechart-scalecolor') || NETDATA.themes.current.easypiechart_scale,
5014
scaleLength: self.data('easypiechart-scalelength') || 5,
web/demo.html
+1
-1
@@ -20,7 +20,7 @@
20
<meta property="og:title" content="netdata - real-time performance monitoring, done right!"/>
21
<meta property="og:description" content="Stunning real-time dashboards, blazingly fast and extremely interactive. Zero configuration, zero dependencies, zero maintenance." />
22
</head>
23
-<script type="text/javascript" src="dashboard.js?v20161008-1"></script>
23
+<script type="text/javascript" src="dashboard.js?v20161009-1"></script>
24
<body>
25
26
<div style="width: 100%; text-align: center;">
web/demo2.html
+1
-1
@@ -21,7 +21,7 @@
21
<meta property="og:description" content="Stunning real-time dashboards, blazingly fast and extremely interactive. Zero configuration, zero dependencies, zero maintenance." />
22
</head>
23
<script>var netdataTheme = 'slate';</script>
24
-<script type="text/javascript" src="http://my-netdata.io/dashboard.js?v20161008-1"></script>
24
+<script type="text/javascript" src="http://my-netdata.io/dashboard.js?v20161009-1"></script>
25
<body>
26
27
<div class="container" style="width: 90%; padding-top: 10px; text-align: center; color: #AAA">
web/demosites.html
+1
-1
@@ -52,7 +52,7 @@
52
and that you have chown it to be owned by netdata:netdata
53
-->
54
<!-- <script type="text/javascript" src="http://my.server:19999/dashboard.js"></script> -->
55
- <script type="text/javascript" src="dashboard.js?v20161008-1"></script>
55
+ <script type="text/javascript" src="dashboard.js?v20161009-1"></script>
56
57
<script>
58
// --- OPTIONS FOR THE CHARTS --
web/goto-host-from-alarm.html
+1
-1
@@ -18,7 +18,7 @@
18
var netdataTheme = 'slate';
19
var netdataShowHelp = true;
20
</script>
21
-<script type="text/javascript" src="dashboard.js?v20161008-1"></script>
21
+<script type="text/javascript" src="dashboard.js?v20161009-1"></script>
22
23
<script>
24
var urlOptions = {
web/index.html
+1
-1
@@ -3083,4 +3083,4 @@
3083
</div>
3084
</body>
3085
</html>
3086
-<script type="text/javascript" src="dashboard.js?v20161008-1"></script>
3086
+<script type="text/javascript" src="dashboard.js?v20161009-1"></script>
web/registry.html
+1
-1
@@ -169,7 +169,7 @@ var netdataRegistryCallback = function(machines_array) {
169
and that you have chown it to be owned by netdata:netdata
170
-->
171
<!-- <script type="text/javascript" src="http://my.server:19999/dashboard.js"></script> -->
172
-<script type="text/javascript" src="dashboard.js?v20161008-1"></script>
172
+<script type="text/javascript" src="dashboard.js?v20161009-1"></script>
173
174
<script>
175
// Set options for TV operation
web/tv.html
+1
-1
@@ -50,7 +50,7 @@ var netdataTheme = 'slate'; // this is dark
50
and that you have chown it to be owned by netdata:netdata
51
-->
52
<!-- <script type="text/javascript" src="http://my.server:19999/dashboard.js"></script> -->
53
-<script type="text/javascript" src="dashboard.js?v20161008-1"></script>
53
+<script type="text/javascript" src="dashboard.js?v20161009-1"></script>
54
55
<script>
56
// Set options for TV operation