From 7891d371ed46a7e46d12b06ca1aa6958a2829ca4 Mon Sep 17 00:00:00 2001 From: Arshad Ali Date: Thu, 3 Sep 2020 13:31:05 +0800 Subject: [PATCH 1/6] Edit tool tips --- .../admin/directiveViews/configure-mobile.client.view.html | 2 +- .../modules/forms/admin/views/edit-fields.client.modal.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/public/modules/forms/admin/directiveViews/configure-mobile.client.view.html b/src/public/modules/forms/admin/directiveViews/configure-mobile.client.view.html index 5322131fee..2e3452e282 100644 --- a/src/public/modules/forms/admin/directiveViews/configure-mobile.client.view.html +++ b/src/public/modules/forms/admin/directiveViews/configure-mobile.client.view.html @@ -4,7 +4,7 @@ Verified? diff --git a/src/public/modules/forms/admin/views/edit-fields.client.modal.html b/src/public/modules/forms/admin/views/edit-fields.client.modal.html index 594a27319e..1c42a504af 100644 --- a/src/public/modules/forms/admin/views/edit-fields.client.modal.html +++ b/src/public/modules/forms/admin/views/edit-fields.client.modal.html @@ -288,7 +288,7 @@

search-enabled="true" ng-model="vm.field.dateValidation.selectedDateValidation" ng-change="vm.handleDateValidationChange()" - style="margin-bottom: 0" + style="margin-bottom: 0;" > {{$select.selected}} Verified? @@ -942,7 +942,7 @@

search-enabled="true" ng-model="vm.field.ValidationOptions.selectedValidation" ng-change="vm.resetCustomValidationParams(vm.field); vm.setFocus()" - style="margin-bottom: 0" + style="margin-bottom: 0;" > {{$select.selected}} Date: Thu, 3 Sep 2020 15:42:29 +0800 Subject: [PATCH 2/6] Configure mobile directive should open verified sms modal --- .../configure-mobile.client.view.html | 6 +++- .../configure-mobile.client.directive.js | 32 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/public/modules/forms/admin/directiveViews/configure-mobile.client.view.html b/src/public/modules/forms/admin/directiveViews/configure-mobile.client.view.html index 2e3452e282..2fb2c545fc 100644 --- a/src/public/modules/forms/admin/directiveViews/configure-mobile.client.view.html +++ b/src/public/modules/forms/admin/directiveViews/configure-mobile.client.view.html @@ -14,7 +14,11 @@ ng-class="field.isVerifiable? 'toggle-selector-on' : ''" onclick="" > - +
diff --git a/src/public/modules/forms/admin/directives/configure-mobile.client.directive.js b/src/public/modules/forms/admin/directives/configure-mobile.client.directive.js index a472821408..0c8cb472d0 100644 --- a/src/public/modules/forms/admin/directives/configure-mobile.client.directive.js +++ b/src/public/modules/forms/admin/directives/configure-mobile.client.directive.js @@ -14,5 +14,37 @@ function configureMobileDirective() { name: '=', characterLimit: '=', }, + controller: [ + '$uibModal', + '$scope', + function ($uibModal, $scope) { + $scope.openVerifiedSMSModal = function () { + $scope.verifiedSMSModal = $uibModal.open({ + animation: true, + backdrop: 'static', + keyboard: false, + templateUrl: 'modules/forms/admin/views/pop-up.client.modal.html', + windowClass: 'pop-up-modal-window', + controller: 'PopUpModalController', + controllerAs: 'vm', + resolve: { + externalScope: function () { + return { + title: 'Verified SMS', + confirmButtonText: 'OK, Noted', + description: ` + FormSG provides free verified SMS up to 10,000 responses + per form. If you expect >10k responses, please contact us to + arrange billing for verified SMS. Failure to do so risks your form + being deactivated for submissions. + `, + } + }, + }, + }) + } + }, + ], } } From f9fd5ce56f94604661cb8aa55a4b5e9b75556fb3 Mon Sep 17 00:00:00 2001 From: Arshad Ali Date: Thu, 3 Sep 2020 15:45:49 +0800 Subject: [PATCH 3/6] Remove unused css that prevents modal from stacking --- .../forms/admin/directives/edit-form.client.directive.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/public/modules/forms/admin/directives/edit-form.client.directive.js b/src/public/modules/forms/admin/directives/edit-form.client.directive.js index da9f1bd01b..a87dca866f 100644 --- a/src/public/modules/forms/admin/directives/edit-form.client.directive.js +++ b/src/public/modules/forms/admin/directives/edit-form.client.directive.js @@ -200,8 +200,7 @@ function editFormController( backdrop: 'static', keyboard: false, templateUrl: 'modules/forms/admin/views/edit-fields.client.modal.html', - windowClass: 'edit-modal-window full-page-modal modal-on-top', - backdropClass: 'custom-modal-backdrop', + windowClass: 'edit-modal-window full-page-modal', resolve: { externalScope: function () { return { From 37b1d9640c8415f4bf42363f0cfb5076b64ac802 Mon Sep 17 00:00:00 2001 From: Arshad Ali Date: Thu, 3 Sep 2020 15:50:14 +0800 Subject: [PATCH 4/6] Only show modal when toggling on verified sms --- .../configure-mobile.client.directive.js | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/src/public/modules/forms/admin/directives/configure-mobile.client.directive.js b/src/public/modules/forms/admin/directives/configure-mobile.client.directive.js index 0c8cb472d0..35c7c7e3fc 100644 --- a/src/public/modules/forms/admin/directives/configure-mobile.client.directive.js +++ b/src/public/modules/forms/admin/directives/configure-mobile.client.directive.js @@ -19,30 +19,33 @@ function configureMobileDirective() { '$scope', function ($uibModal, $scope) { $scope.openVerifiedSMSModal = function () { - $scope.verifiedSMSModal = $uibModal.open({ - animation: true, - backdrop: 'static', - keyboard: false, - templateUrl: 'modules/forms/admin/views/pop-up.client.modal.html', - windowClass: 'pop-up-modal-window', - controller: 'PopUpModalController', - controllerAs: 'vm', - resolve: { - externalScope: function () { - return { - title: 'Verified SMS', - confirmButtonText: 'OK, Noted', - description: ` + const isTogglingOnVerifiedSms = !$scope.field.isVerifiable + $scope.verifiedSMSModal = + isTogglingOnVerifiedSms && + $uibModal.open({ + animation: true, + backdrop: 'static', + keyboard: false, + templateUrl: 'modules/forms/admin/views/pop-up.client.modal.html', + windowClass: 'pop-up-modal-window', + controller: 'PopUpModalController', + controllerAs: 'vm', + resolve: { + externalScope: function () { + return { + title: 'Verified SMS', + confirmButtonText: 'OK, Noted', + description: ` FormSG provides free verified SMS up to 10,000 responses per form. If you expect >10k responses, please contact us to arrange billing for verified SMS. Failure to do so risks your form being deactivated for submissions. `, - } + } + }, }, - }, - }) + }) } }, ], From 12c62d1872bca9caeb3b41b76072d0202be70d64 Mon Sep 17 00:00:00 2001 From: Arshad Ali Date: Thu, 3 Sep 2020 16:10:05 +0800 Subject: [PATCH 5/6] Ensure that supportFormLink is defined in verified sms modal --- .../configure-mobile.client.directive.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/public/modules/forms/admin/directives/configure-mobile.client.directive.js b/src/public/modules/forms/admin/directives/configure-mobile.client.directive.js index 35c7c7e3fc..a27fda5bc6 100644 --- a/src/public/modules/forms/admin/directives/configure-mobile.client.directive.js +++ b/src/public/modules/forms/admin/directives/configure-mobile.client.directive.js @@ -17,7 +17,13 @@ function configureMobileDirective() { controller: [ '$uibModal', '$scope', - function ($uibModal, $scope) { + '$translate', + function ($uibModal, $scope, $translate) { + // Get support form link from translation json. + $translate('LINKS.SUPPORT_FORM_LINK').then((supportFormLink) => { + $scope.supportFormLink = supportFormLink + }) + $scope.openVerifiedSMSModal = function () { const isTogglingOnVerifiedSms = !$scope.field.isVerifiable $scope.verifiedSMSModal = @@ -36,12 +42,11 @@ function configureMobileDirective() { title: 'Verified SMS', confirmButtonText: 'OK, Noted', description: ` - FormSG provides free verified SMS up to 10,000 responses - per form. If you expect >10k responses, please contact us to - arrange billing for verified SMS. Failure to do so risks your form - being deactivated for submissions. - `, + FormSG provides free verified SMS up to 10,000 responses + per form. If you expect >10k responses, please contact us + to arrange billing for verified SMS. Failure to do so risks your form + being deactivated for submissions. + `, } }, }, From c28cff95a88b1f4b12d905ef8c31a41e8051d716 Mon Sep 17 00:00:00 2001 From: Arshad Ali Date: Thu, 3 Sep 2020 18:00:28 +0800 Subject: [PATCH 6/6] lint --- .../modules/forms/admin/views/edit-fields.client.modal.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/public/modules/forms/admin/views/edit-fields.client.modal.html b/src/public/modules/forms/admin/views/edit-fields.client.modal.html index 1c42a504af..ed1ebe7e34 100644 --- a/src/public/modules/forms/admin/views/edit-fields.client.modal.html +++ b/src/public/modules/forms/admin/views/edit-fields.client.modal.html @@ -288,7 +288,7 @@

search-enabled="true" ng-model="vm.field.dateValidation.selectedDateValidation" ng-change="vm.handleDateValidationChange()" - style="margin-bottom: 0;" + style="margin-bottom: 0" > {{$select.selected}} search-enabled="true" ng-model="vm.field.ValidationOptions.selectedValidation" ng-change="vm.resetCustomValidationParams(vm.field); vm.setFocus()" - style="margin-bottom: 0;" + style="margin-bottom: 0" > {{$select.selected}}