diff --git a/src/main/ui/static/activity/encourage/encourage.js b/src/main/ui/static/activity/encourage/encourage.js index aa5d19358..40addabc7 100644 --- a/src/main/ui/static/activity/encourage/encourage.js +++ b/src/main/ui/static/activity/encourage/encourage.js @@ -29,6 +29,7 @@ define(['angular', 'uiRouter'], function (angular) { $scope.loadEvents(); $scope.newEvent = function () { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/activity/encourage/templates/encourage_modify.html', controller: 'newEncourageEventCtrl' }).result.then(function () { @@ -145,6 +146,7 @@ define(['angular', 'uiRouter'], function (angular) { $scope.loadUseLogs(1); $scope.modifyEvent = function () { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/activity/encourage/templates/encourage_modify.html', controller: 'modifyEventCtrl', resolve: { diff --git a/src/main/ui/static/commons/services/commonDialog.js b/src/main/ui/static/commons/services/commonDialog.js index e69b39019..66c85d8af 100644 --- a/src/main/ui/static/commons/services/commonDialog.js +++ b/src/main/ui/static/commons/services/commonDialog.js @@ -73,6 +73,7 @@ define(['../app', 'angular'], function (app, angular) { }, inputText:function (cfg) { return $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl:'/static/commons/templates/text_input.html', size: cfg.size || 'sm', resolve:{ diff --git a/src/main/ui/static/commons/services/orderService.js b/src/main/ui/static/commons/services/orderService.js index 1c628772a..c500dfaf1 100644 --- a/src/main/ui/static/commons/services/orderService.js +++ b/src/main/ui/static/commons/services/orderService.js @@ -6,6 +6,7 @@ define(['../app'], function (app) { app.factory('orderService', ['$uibModal', function ($uibModal) { function openDetail(url) { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/commons/templates/order_detail.html', controller: 'orderDetailDialogCtrl', resolve: { diff --git a/src/main/ui/static/commons/templates/order_detail.html b/src/main/ui/static/commons/templates/order_detail.html index 14185b979..db32af8c2 100644 --- a/src/main/ui/static/commons/templates/order_detail.html +++ b/src/main/ui/static/commons/templates/order_detail.html @@ -215,4 +215,7 @@ +
+ +
diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js index d24ad86d6..46acd352f 100644 --- a/src/main/ui/static/config/bdprize/bdprize.js +++ b/src/main/ui/static/config/bdprize/bdprize.js @@ -113,6 +113,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) { $scope.loadRateConfigs(); $scope.editRateConfig = function () { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/bdprize/templates/rate_config_dialog.html', controller: 'bdRateConfigCtrl', resolve: { @@ -126,6 +127,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) { }; $scope.editBDLevels = function () { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/bdprize/templates/bd_level_config_dialog.html', size: 'lg', controller: 'bdLevelConfigCtrl' @@ -133,6 +135,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) { }; $scope.editCommissionConfig = function (monModal) { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/bdprize/templates/bd_commission_config_dialog.html', controller: 'bdCommissionConfigCtrl', size: 'lg', diff --git a/src/main/ui/static/config/managers/manager.js b/src/main/ui/static/config/managers/manager.js index 882412321..e9dac8f34 100644 --- a/src/main/ui/static/config/managers/manager.js +++ b/src/main/ui/static/config/managers/manager.js @@ -41,6 +41,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) { $scope.listManagers(); $scope.modifyManager = function (manager) { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/managers/templates/modify.html', controller: 'modifyManagerDialogCtrl', resolve: { diff --git a/src/main/ui/static/config/notice/notice.js b/src/main/ui/static/config/notice/notice.js index 49f8d8aae..a200062d6 100644 --- a/src/main/ui/static/config/notice/notice.js +++ b/src/main/ui/static/config/notice/notice.js @@ -61,6 +61,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' $scope.showNotice = function (notice) { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/commons/templates/notice_detail.html', controller: 'noticePreviewCtrl', resolve: { diff --git a/src/main/ui/static/config/organizations/organizations.js b/src/main/ui/static/config/organizations/organizations.js index aeb07c09b..5a09e8e70 100644 --- a/src/main/ui/static/config/organizations/organizations.js +++ b/src/main/ui/static/config/organizations/organizations.js @@ -506,6 +506,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) { $scope.listManagers(); $scope.modifyManager = function (manager) { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/managers/templates/modify.html', controller: 'modifyManagerCtrl', resolve: { @@ -531,6 +532,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) { }; $scope.newManager = function () { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/managers/templates/new_manager.html', controller: 'newManagerCtrl', resolve: { diff --git a/src/main/ui/static/config/sysconfigs/sysconfigs.js b/src/main/ui/static/config/sysconfigs/sysconfigs.js index a8a32ea2a..c8b600861 100644 --- a/src/main/ui/static/config/sysconfigs/sysconfigs.js +++ b/src/main/ui/static/config/sysconfigs/sysconfigs.js @@ -275,6 +275,7 @@ define(['angular', 'uiRouter'], function (angular) { }; $scope.moveFunction = function (func) { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/sysconfigs/templates/permission_choose_module.html', controller: 'permissionChooseModuleDialogCtrl', resolve: { @@ -292,6 +293,7 @@ define(['angular', 'uiRouter'], function (angular) { }; $scope.editFunctionInfo = function (func) { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/sysconfigs/templates/func_info_edit.html', controller: 'permissionFuncEditDialogCtrl', resolve: { @@ -334,6 +336,7 @@ define(['angular', 'uiRouter'], function (angular) { $scope.modules = modules.data; $scope.newModule = function () { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/sysconfigs/templates/permission_module_dialog.html', controller: 'moduleNewCtrl', resolve: { @@ -347,6 +350,7 @@ define(['angular', 'uiRouter'], function (angular) { }; $scope.editModule = function (mod) { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/sysconfigs/templates/permission_module_dialog.html', controller: 'moduleEditCtrl', resolve: { @@ -422,6 +426,7 @@ define(['angular', 'uiRouter'], function (angular) { }; $scope.addUnSub = function () { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/sysconfigs/templates/add_mail_unsub.html', controller: 'addUnSubDialogCtrl', size: 'sm' @@ -464,6 +469,7 @@ define(['angular', 'uiRouter'], function (angular) { app.controller('permissionPartnerConfigRootCtrl', ['$scope', '$http', '$uibModal', function ($scope, $http, $uibModal) { $scope.authorizeRole = function (roleMask) { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/sysconfigs/templates/permissionPartner_authorize_dialog.html', controller: 'permissionPartnerAuthorizeDialogCtrl', size: 'lg', @@ -528,6 +534,7 @@ define(['angular', 'uiRouter'], function (angular) { }; $scope.moveFunction = function (func) { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/sysconfigs/templates/permissionPartner_choose_module.html', controller: 'permissionPartnerChooseModuleDialogCtrl', resolve: { @@ -545,6 +552,7 @@ define(['angular', 'uiRouter'], function (angular) { }; $scope.editFunctionInfo = function (func) { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/sysconfigs/templates/PartnerFunc_info_edit.html', controller: 'permissionPartnerFuncEditDialogCtrl', resolve: { @@ -580,6 +588,7 @@ define(['angular', 'uiRouter'], function (angular) { $scope.modules = modules.data; $scope.newPartnerModule = function () { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/sysconfigs/templates/permissionPartner_module_dialog.html', controller: 'partnerModuleNewCtrl', resolve: { @@ -596,6 +605,7 @@ define(['angular', 'uiRouter'], function (angular) { }; $scope.editPartnerModule = function (mod) { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/sysconfigs/templates/permissionPartner_module_dialog.html', controller: 'partnerModuleEditCtrl', resolve: { diff --git a/src/main/ui/static/config/sysconfigs/templates/add_mail_unsub.html b/src/main/ui/static/config/sysconfigs/templates/add_mail_unsub.html index 6d24869d2..0c29c2c02 100644 --- a/src/main/ui/static/config/sysconfigs/templates/add_mail_unsub.html +++ b/src/main/ui/static/config/sysconfigs/templates/add_mail_unsub.html @@ -8,6 +8,12 @@
+
+
+
+
+ +
diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js index 9cf84e966..06ce0a528 100644 --- a/src/main/ui/static/menu/managerMenu.js +++ b/src/main/ui/static/menu/managerMenu.js @@ -64,6 +64,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) { $scope.editRateConfig = function () { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/bdprize/templates/rate_config_dialog.html', controller: 'bdRateConfigCtrl', resolve: { @@ -77,6 +78,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) { }; $scope.editBDLevels = function () { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/config/bdprize/templates/bd_level_config_dialog.html', controller: 'bdLevelConfigCtrl' }) diff --git a/src/main/ui/static/payment/merchantid/merchant_id_manager.js b/src/main/ui/static/payment/merchantid/merchant_id_manager.js index e8605865b..03cdaad63 100644 --- a/src/main/ui/static/payment/merchantid/merchant_id_manager.js +++ b/src/main/ui/static/payment/merchantid/merchant_id_manager.js @@ -182,6 +182,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS $scope.loadTempSubMerchantId(1); $scope.save = function () { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/payment/merchantid/templates/new_common_sub_merchant_id.html', controller: 'newCommonSubMerchantIdCtrl' }).result.then(function () { diff --git a/src/main/ui/static/payment/merchantid/templates/new_common_sub_merchant_id.html b/src/main/ui/static/payment/merchantid/templates/new_common_sub_merchant_id.html index 3e432fffe..83d4fea2b 100644 --- a/src/main/ui/static/payment/merchantid/templates/new_common_sub_merchant_id.html +++ b/src/main/ui/static/payment/merchantid/templates/new_common_sub_merchant_id.html @@ -15,10 +15,14 @@
+
+ +
+ diff --git a/src/main/ui/static/payment/product/product_manager.js b/src/main/ui/static/payment/product/product_manager.js index 861877603..71726d47a 100644 --- a/src/main/ui/static/payment/product/product_manager.js +++ b/src/main/ui/static/payment/product/product_manager.js @@ -68,6 +68,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }; $scope.addProduct = function () { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/payment/product/templates/add_product.html', controller: 'managerAddProductDialogCtrl', resolve: { @@ -81,6 +82,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }; $scope.editProduct = function (product) { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/payment/product/templates/add_product.html', controller: 'managerAddProductDialogCtrl', resolve: { diff --git a/src/main/ui/static/payment/product/templates/add_product.html b/src/main/ui/static/payment/product/templates/add_product.html index 55aac6437..2d3f08502 100644 --- a/src/main/ui/static/payment/product/templates/add_product.html +++ b/src/main/ui/static/payment/product/templates/add_product.html @@ -111,10 +111,15 @@ -
- +
diff --git a/src/main/ui/static/risk/risk.js b/src/main/ui/static/risk/risk.js index 8bfe25bf8..8d84298cd 100644 --- a/src/main/ui/static/risk/risk.js +++ b/src/main/ui/static/risk/risk.js @@ -262,6 +262,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS }; $scope.addAttention = function () { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/risk/templates/risk_add.html', controller: 'newRiskCtrl' }).result.then(function () { @@ -271,6 +272,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS $scope.editAttention = function (attention) { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/risk/templates/risk_merchant_edit.html', controller: 'editRiskCtrl', resolve:{ @@ -331,6 +333,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS }; $scope.save = function () { $uibModal.open({ + backdrop: 'static', keyboard: false, templateUrl: '/static/risk/templates/new_customer_blacklist.html', controller: 'newCustomerBlackListCtrl' }).result.then(function () { diff --git a/src/main/ui/static/risk/templates/new_customer_blacklist.html b/src/main/ui/static/risk/templates/new_customer_blacklist.html index 02e032830..2933fb637 100644 --- a/src/main/ui/static/risk/templates/new_customer_blacklist.html +++ b/src/main/ui/static/risk/templates/new_customer_blacklist.html @@ -19,6 +19,9 @@
+
+ +