refactor(configs): move configs to pages modules

pull/3/head
alex 2016-02-25 14:31:12 +03:00
parent b7af0162ee
commit 789b6c34f3
6 changed files with 22 additions and 14 deletions

View File

@ -20,6 +20,7 @@
donut-chart donut-chart
donut-data='donutData' donut-data='donutData'
donut-colors='colors' donut-colors='colors'
donut-formatter='"currency"'> donut-formatter='"currency"'>
</div> </div>
</div> </div>

View File

@ -6,7 +6,11 @@
'use strict'; 'use strict';
angular.module('BlurAdmin.pages.charts.morris', []) angular.module('BlurAdmin.pages.charts.morris', [])
.config(routeConfig); .config(routeConfig).config(function(){
Morris.Donut.prototype.defaults.labelColor = 'rgba(255,255,255,0.8)';
Morris.Grid.prototype.gridDefaults.gridLineColor = 'rgba(255,255,255,0.8)';
Morris.Grid.prototype.gridDefaults.gridTextColor = 'rgba(255,255,255,0.8)';
});
/** @ngInject */ /** @ngInject */
function routeConfig($stateProvider) { function routeConfig($stateProvider) {

View File

@ -5,7 +5,12 @@
(function () { (function () {
'use strict'; 'use strict';
angular.module('BlurAdmin.pages.components.tree', []).config(routeConfig); angular.module('BlurAdmin.pages.components.tree', [])
.config(routeConfig)
.config(function(){
$.jstree.defaults.core.themes.url = true;
$.jstree.defaults.core.themes.dir = "assets/img/theme/vendor/jstree/dist/themes";
});
/** @ngInject */ /** @ngInject */
function routeConfig($stateProvider) { function routeConfig($stateProvider) {

View File

@ -9,7 +9,7 @@
.controller('TablesPageCtrl', TablesPageCtrl); .controller('TablesPageCtrl', TablesPageCtrl);
/** @ngInject */ /** @ngInject */
function TablesPageCtrl($scope, $filter) { function TablesPageCtrl($scope, $filter, editableOptions, editableThemes) {
$scope.smartTablePageSize = 10; $scope.smartTablePageSize = 10;
@ -704,6 +704,11 @@
$scope.users.push($scope.inserted); $scope.users.push($scope.inserted);
}; };
editableOptions.theme = 'bs3';
editableThemes['bs3'].submitTpl = '<button type="submit" class="btn btn-primary btn-with-icon"><i class="ion-checkmark-round"></i></button>';
editableThemes['bs3'].cancelTpl = '<button type="button" ng-click="$form.$cancel()" class="btn btn-default btn-with-icon"><i class="ion-close-round"></i></button>';
} }
})(); })();

View File

@ -9,7 +9,7 @@
.run(themeRun); .run(themeRun);
/** @ngInject */ /** @ngInject */
function themeRun($timeout, $rootScope, layoutSizes, editableOptions, editableThemes) { function themeRun($timeout, $rootScope, layoutSizes) {
$timeout(function () { $timeout(function () {
$rootScope.$pageFinishedLoading = true; $rootScope.$pageFinishedLoading = true;
}, 1000); }, 1000);
@ -19,13 +19,6 @@
}, 4000); }, 4000);
$rootScope.$isMenuCollapsed = window.innerWidth <= layoutSizes.resWidthCollapseSidebar; $rootScope.$isMenuCollapsed = window.innerWidth <= layoutSizes.resWidthCollapseSidebar;
editableOptions.theme = 'bs3';
editableThemes['bs3'].submitTpl = '<button type="submit" class="btn btn-primary btn-with-icon"><i class="ion-checkmark-round"></i></button>';
editableThemes['bs3'].cancelTpl = '<button type="button" ng-click="$form.$cancel()" class="btn btn-default btn-with-icon"><i class="ion-close-round"></i></button>';
$.jstree.defaults.core.themes.url = true;
$.jstree.defaults.core.themes.dir = "assets/img/theme/vendor/jstree/dist/themes";
} }
})(); })();

View File

@ -14,13 +14,13 @@
} }
} }
.jstree-default .jstree-clicked, .jstree-default .jstree-hovered { .jstree-default a.jstree-clicked, .jstree-default a.jstree-hovered {
background-color: rgba(0, 0, 0, 0.25); background-color: rgba(0, 0, 0, 0.25);
} }
.jstree-default .jstree-anchor, .jstree-default .jstree-wholerow{ .jstree-default a.jstree-anchor, .jstree-default a.jstree-wholerow{
&:hover{ &:hover{
background-color: rgba(0, 0, 0, 0.25); background-color: rgba(0, 0, 0, 0.15);
} }
} }