diff --git a/static/css/custom.css b/static/css/custom.css index 633172a..913eb92 100755 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -39,7 +39,7 @@ body.nav-sm .main_container .top_nav { } body.nav-sm .nav.side-menu li a { - text-align: left !important; + text-align: center !important; font-weight: 400; font-size: 13px; padding: 10px 5px; diff --git a/static/js/domoboard.js b/static/js/domoboard.js index 0eafebc..ead4aac 100644 --- a/static/js/domoboard.js +++ b/static/js/domoboard.js @@ -200,10 +200,15 @@ function redrawLineChart(sensor, idx, range, block) { }); } -function redrawBarChart(idxs, block) { +function redrawBarChart(idxs, block, barChartElementsNames) { var url = "/api?custom=bar_chart&idxs=" + idxs.join(); + var i = 0; requestAPI(url, function(d){ var data = JSON.parse(d); + for (var key in data) { + data[key]["l"] = barChartElementsNames[i]; + i++; + } block.setData(data); }); } diff --git a/templates/bar_charts.html b/templates/bar_charts.html index 1b2da23..a4bb5e5 100644 --- a/templates/bar_charts.html +++ b/templates/bar_charts.html @@ -15,22 +15,27 @@