diff options
Diffstat (limited to 'ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin')
3 files changed, 33 insertions, 19 deletions
diff --git a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.js b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.js index 466998a3..49605e59 100644 --- a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.js +++ b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.js @@ -51,22 +51,22 @@ portalAdminsService.addPortalAdmin(this.selectedUser.orgUserId) .then(() => { $log.debug("NewPortalAdminModalCtrl::addNewPortalAdmin: portal admin added successfully"); - $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); }).catch(err => { if(err.status === 409) { //Conflict confirmBoxService.showInformation('This user already exists as a portal admin!').then(function (isConfirmed) { - $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); }); } else { confirmBoxService.showInformation('There was a unknown problem adding the portal admin. ' + 'Please try again later. Error Status: '+ err.status).then(function (isConfirmed) { - $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); }); } }); } }).catch(err => { confirmBoxService.showInformation('There was a unknown problem adding the portal admin. ' + 'Please try again later. Error Status: '+ err.status).then(function (isConfirmed) { - $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); }); $log.error('portalAdminsService.addPortalAdmin error status: '+ err.status); }); diff --git a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html index 206dc168..8205e840 100644 --- a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html +++ b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html @@ -17,23 +17,37 @@ limitations under the License. ================================================================================ --> -<div class="new-admin-modal"> + +<style> + .title{ + border-bottom: none !important; + } +</style> +<div> + <div class="b2b-modal-header"> + <h2 class="heading-medium" id="newAdmin">Add New Portal Admin</h2> + + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" id="pa-div-close-button" + ng-click="$dismiss('cancel')"></button> + </div> + </div> - <div class="search-users"> + <div class="b2b-modal-body"> + <search-users search-title="" selected-user="newPortalAdmin.selectedUser"></search-users> + </div> - <search-users search-title="Add New Portal Admin" - selected-user="newPortalAdmin.selectedUser"></search-users> + <div class="b2b-modal-footer"> + <div class="cta-button-group in"> + <button id="pa-search-users-button-save" class="btn btn-alt btn-small" + ng-click="newPortalAdmin.selectedUser && newPortalAdmin.addNewPortalAdmin()" + ng-class="{disabled: !newPortalAdmin.selectedUser}">Save</button> + <button id="pa-search-users-button-cancel" + class="btn btn-alt btn-small" ng-click="$dismiss('cancel')">Cancel</button> + </div> + </div> - <div class="dialog-control"> - - <button id="pa-search-users-button-save" class="btn btn-alt btn-small" - ng-click="newPortalAdmin.selectedUser && newPortalAdmin.addNewPortalAdmin()" - ng-class="{disabled: !newPortalAdmin.selectedUser}">Save - </button> - <button id="pa-search-users-button-cancel" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Cancel</button> - </div> - </div> -</div> + </div> <script> $(document).ready(function(){ diff --git a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.less b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.less index f8e1960c..7c8e5ff1 100644 --- a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.less +++ b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.less @@ -7,7 +7,7 @@ .admin-app-roles { .title { //.n18r; - .dGray18r; //AT&T Dark Gray + .dGray18r; border-bottom: @blue-active 3px solid; } |