jinql
/
blur-admin
mirror of https://github.com/akveo/blur-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(dashboard): fix traffic and line charts

pull/46/head
KostyaDanovsky 2016-05-12 12:13:34 +03:00 committed by kostya.danovsky
parent 5322ca6740
commit 86750dce86
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js
View File

@ -9,8 +9,8 @@
.controller('DashboardLineChartCtrl', DashboardLineChartCtrl); .controller('DashboardLineChartCtrl', DashboardLineChartCtrl);
/** @ngInject */ /** @ngInject */
function DashboardLineChartCtrl(layoutColors, layoutPaths, baUtil) { function DashboardLineChartCtrl(layoutColors, layoutPaths, layoutTheme, baUtil) {
var graphColor = layoutColors.primary; var graphColor = layoutTheme.blur ? '#000000' : layoutColors.primary;
var chartData = [ var chartData = [
{ date: new Date(2012, 11), value: 0, value0: 0 }, { date: new Date(2012, 11), value: 0, value0: 0 },
{ date: new Date(2013, 0), value: 15000, value0: 19000}, { date: new Date(2013, 0), value: 15000, value0: 19000},

4
src/app/pages/dashboard/trafficChart/TrafficChartCtrl.js
View File

@ -9,7 +9,9 @@
.controller('TrafficChartCtrl', TrafficChartCtrl); .controller('TrafficChartCtrl', TrafficChartCtrl);
/** @ngInject */ /** @ngInject */
function TrafficChartCtrl(layoutColors, $scope) { function TrafficChartCtrl($scope, layoutColors, layoutTheme) {
$scope.transparent = layoutTheme.blur;
var palette = layoutColors.bgColorPalette; var palette = layoutColors.bgColorPalette;
$scope.doughnutData = [ $scope.doughnutData = [
{ {

2
src/app/pages/dashboard/trafficChart/trafficChart.html
View File

@ -1,4 +1,4 @@
<div class="channels-block transparent"> <div class="channels-block" ng-class="{'transparent': transparent}">
<div class="chart-bg"></div> <div class="chart-bg"></div>
<div class="traffic-chart" id="trafficChart"> <div class="traffic-chart" id="trafficChart">
<div class="canvas-holder"> <div class="canvas-holder">