From a3a04c5887779e9ca8024a3e87ece109b8d9b0c1 Mon Sep 17 00:00:00 2001 From: statta Date: Fri, 23 Aug 2019 16:49:45 -0400 Subject: Onboarding Page Account Admin Change Issue-ID: PORTAL-644 Change-Id: I95e43b1a2d12dcb5a4bc56d374cc6d30d8aae3f3 Signed-off-by: statta --- .../client/app/services/users/users.service.js | 4 +- .../client/app/views/header/header.less | 6 + .../client/app/views/header/header.tpl.html | 535 +++++++++++---------- .../app/views/role/popup_createedit_role.html | 2 +- .../client/app/views/role/role-list-controller.js | 2 - .../users/new-user-dialogs/new-user.controller.js | 4 +- .../users/new-user-dialogs/new-user.modal.html | 4 +- .../client/app/views/users/users.tpl.html | 4 +- 8 files changed, 309 insertions(+), 252 deletions(-) (limited to 'ecomp-portal-FE-common/client/app') diff --git a/ecomp-portal-FE-common/client/app/services/users/users.service.js b/ecomp-portal-FE-common/client/app/services/users/users.service.js index 045c674b..ed95bddf 100644 --- a/ecomp-portal-FE-common/client/app/services/users/users.service.js +++ b/ecomp-portal-FE-common/client/app/services/users/users.service.js @@ -201,7 +201,7 @@ // this.$log.debug('getUserAppRoles response: ', JSON.stringify(res)) // If response comes back as a redirected HTML page which IS NOT a success if (this.utilsService.isValidJSON(res)== false || res.data.httpStatusCode == '500' || res.data.status == 'ERROR') { - deferred.reject('UsersService::updateUserAppRoles: Failed' + res.data.message); + deferred.reject(' Error:' + res.data.message); } else { // this.$log.info('UsersService::updateUserAppRoles: Succeeded'); deferred.resolve(res.data); @@ -283,4 +283,4 @@ } UsersService.$inject = ['$q', '$log', '$http', 'conf','uuid4', 'utilsService']; angular.module('ecompApp').service('usersService', UsersService) -})(); +})(); \ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/header/header.less b/ecomp-portal-FE-common/client/app/views/header/header.less index 8d275a41..2da81f30 100644 --- a/ecomp-portal-FE-common/client/app/views/header/header.less +++ b/ecomp-portal-FE-common/client/app/views/header/header.less @@ -40,6 +40,12 @@ z-index: 999; } +.language { + float: left; + margin-top: -8px; +} + + .logo-image { .portal-logo; display: inline-block; diff --git a/ecomp-portal-FE-common/client/app/views/header/header.tpl.html b/ecomp-portal-FE-common/client/app/views/header/header.tpl.html index ed240b9a..d0a87d76 100644 --- a/ecomp-portal-FE-common/client/app/views/header/header.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/header/header.tpl.html @@ -36,235 +36,287 @@ -->
-
- +
+ + -
-
    -
  • -
    - - +
    +
+ + +
  • +
    +
    +
    +
    + +
    +
    +
    + +
    +
    +

    {{'Notifications'| T}}

    +
    +
    +
    +
    +
    +
    +
    +
    +

    {{'No New Notifications'| + T}}.

    +
    + +
    +
    +
    +
      +
    • +
      + +
      - {{item.time | date:'MM/dd/yyyy hh:mm:ss a Z'}} + {{item.time | date:'MM/dd/yyyy hh:mm:ss a + Z'}}
      - -
      • -
    -
    -
    -
    -
    + +
    • + + +
    +
    +
    +
    - - - - - -
  • -
    -
    • - - + + + +
  • +
    +
    • + diff --git a/ecomp-portal-FE-common/client/app/views/role/popup_createedit_role.html b/ecomp-portal-FE-common/client/app/views/role/popup_createedit_role.html index 5d4fc4d4..0429967f 100644 --- a/ecomp-portal-FE-common/client/app/views/role/popup_createedit_role.html +++ b/ecomp-portal-FE-common/client/app/views/role/popup_createedit_role.html @@ -130,7 +130,7 @@
    - +
    diff --git a/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js b/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js index b4813114..8765149e 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js +++ b/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js @@ -152,11 +152,9 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS $scope.centralizedApps = res; for(var i = 0; i
    Enter system UserId
    + font-family: Omnes-ECOMP-W02, Arial;font-size: 14px;margin-bottom: 8px; padding-left: 30px;">Enter system userId
    + \ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/users/users.tpl.html b/ecomp-portal-FE-common/client/app/views/users/users.tpl.html index 40175810..538899d8 100644 --- a/ecomp-portal-FE-common/client/app/views/users/users.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/users/users.tpl.html @@ -52,7 +52,7 @@
    - +
    @@ -113,4 +113,4 @@ - + \ No newline at end of file -- cgit 1.2.3-korg