From e859f5aaab0236b8c88de69153c7d681c27f56c8 Mon Sep 17 00:00:00 2001 From: cxiao Date: Fri, 12 Dec 2014 18:23:47 +0800 Subject: [PATCH] Add messenger location options --- webapp/app/js/controllers/cubeEdit.js | 12 ++++++------ webapp/app/js/services/message.js | 28 ++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js index 8e9887f..ce55239 100644 --- a/webapp/app/js/controllers/cubeEdit.js +++ b/webapp/app/js/controllers/cubeEdit.js @@ -212,13 +212,13 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio CubeService.update({}, {cubeDescData: $scope.state.cubeSchema, cubeName: $routeParams.cubeName, project: $scope.state.project}, function (request) { if (request.successful) { $scope.state.cubeSchema = request.cubeDescData; - MessageService.sendMsg($scope.cubeResultTmpl({'text':'Updated the cube successfully.',type:'success'}), 'success', {}, true); + MessageService.sendMsg($scope.cubeResultTmpl({'text':'Updated the cube successfully.',type:'success'}), 'success', {}, true, 'top_center'); if (design_form) { design_form.$invalid = true; } } else { - MessageService.sendMsg($scope.cubeResultTmpl({'text':'Failed to update the cube.','schema':$scope.state.cubeSchema}), 'error', {}, true); + MessageService.sendMsg($scope.cubeResultTmpl({'text':'Failed to update the cube.','schema':$scope.state.cubeSchema}), 'error', {}, true, 'top_center'); } //end loading loadingRequest.hide(); @@ -229,7 +229,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio var message =e.data.exception; var msg = !!(message) ? message : 'Failed to take action.'; - MessageService.sendMsg($scope.cubeResultTmpl({'text':msg,'schema':$scope.state.cubeSchema}), 'error', {}, true); + MessageService.sendMsg($scope.cubeResultTmpl({'text':msg,'schema':$scope.state.cubeSchema}), 'error', {}, true, 'top_center'); } else { SweetAlert.swal('Oops...', "Failed to take action.", 'error'); } @@ -241,7 +241,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio if (request.successful) { $scope.state.cubeSchema = request.cubeDescData; - MessageService.sendMsg($scope.cubeResultTmpl({'text':'Created the cube successfully.',type:'success'}), 'success', {}, true); + MessageService.sendMsg($scope.cubeResultTmpl({'text':'Created the cube successfully.',type:'success'}), 'success', {}, true, 'top_center'); } else { $scope.cubeMetaFrame.project = $scope.state.project; var e = request; @@ -249,7 +249,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio var message =e.data.exception; var msg = !!(message) ? message : 'Failed to take action.'; - MessageService.sendMsg($scope.cubeResultTmpl({'text':msg,'schema':$scope.state.cubeSchema}), 'error', {}, true); + MessageService.sendMsg($scope.cubeResultTmpl({'text':msg,'schema':$scope.state.cubeSchema}), 'error', {}, true, 'top_center'); } else { SweetAlert.swal('Oops...', "Failed to take action.", 'error'); } @@ -263,7 +263,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio var message =e.data.exception; var msg = !!(message) ? message : 'Failed to take action.'; - MessageService.sendMsg($scope.cubeResultTmpl({'text':msg,'schema':$scope.state.cubeSchema}), 'error', {}, true); + MessageService.sendMsg($scope.cubeResultTmpl({'text':msg,'schema':$scope.state.cubeSchema}), 'error', {}, true, 'top_center'); } else { SweetAlert.swal('Oops...', "Failed to take action.", 'error'); } diff --git a/webapp/app/js/services/message.js b/webapp/app/js/services/message.js index 93475ce..3c2c2f5 100644 --- a/webapp/app/js/services/message.js +++ b/webapp/app/js/services/message.js @@ -1,10 +1,9 @@ -KylinApp.service('MessageService', function () { - var options = { - extraClasses: 'messenger-fixed messenger-on-top', - theme: 'ice' - }; +KylinApp.service('MessageService', ['config_ui_messenger', function (config_ui_messenger) { - this.sendMsg = function (msg, type, actions, sticky) { + this.sendMsg = function (msg, type, actions, sticky, position) { + var options = { + 'theme': config_ui_messenger.theme + }; var data = { message: msg, @@ -18,6 +17,23 @@ KylinApp.service('MessageService', function () { data.hideAfter = false; } + // Specify the position, otherwise it will be default 'bottom_right'. + if (angular.isDefined(position) && config_ui_messenger.location.hasOwnProperty(position)) { + options.extraClasses = config_ui_messenger.location[position]; + } + Messenger(options).post(data); } +}]); + +KylinApp.value('config_ui_messenger', { + location: { + top_left: 'messenger-fixed messenger-on-top messenger-on-left', + top_center: 'messenger-fixed messenger-on-top', + top_right: 'messenger-fixed messenger-on-top message-on-right', + bottom_left: "messenger-fixed messenger-on-bottom messenger-on-left", + bottom_center: 'messenger-fixed messenger-on-bottom', + bottom_right: 'messenger-fixed messenger-on-bottom messenger-on-right' + }, + theme: 'ice' });