diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-08-18 14:37:47 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-08-18 14:39:46 -0400 |
| commit | f03552714077df2a3f11fe33a81342558dfe1705 (patch) | |
| tree | 2ad3b77f2b1fd1f0390a7d4614cd3d050b6f6f38 /ecomp-sdk/epsdk-app-overlay/src | |
| parent | a2f5a35c06a526b05e4efd9fe275d6639bf22cd3 (diff) | |
Repair centralized-role feature.
Also show ONAP logo in EPSDK-app header top left.
Issue: PORTAL-21, PORTAL-81
Change-Id: I46953123219d4f7a239ca6c5a05890a3769ed2ea
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src')
4 files changed, 7 insertions, 3 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js index 109c1c7b..d7adaf36 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js @@ -741,6 +741,7 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal $scope.saveRole = function() { var errorMsg; + if($scope.role.id == null || $scope.role.id == undefined ){ $scope.role = { 'id':null, 'created':null, @@ -759,7 +760,7 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal 'toggleActiveImage':" / static fusion images inactive.png ", 'editUrl':" role.htm ? role_id = null", }; - + } // Validate non-empty priority as integer if ($scope.role.priority && $scope.role.priority != '' && isNaN(parseInt($scope.role.priority))) { errorMsg = 'Priority must be an integer.'; diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2Header.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2Header.html index 5c0e2bcc..d0748e1d 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2Header.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2Header.html @@ -2,8 +2,7 @@ <header class="b2b-header-tabs" b2b-header-responsive ng-show="{{showHeader}}"> <ul class="header__items" role="navigation"> <li class="header__item icon__item" tabindex="0" ng-click="returnToPortal()"> - <span class="icon-primary-att-globe"></span> - <span class="globe-text">ECOMP Portal</span> + <div ng-include src="'app/fusion/scripts/DS2-view-models/header-logo.html'"></div> </li> <li b2b-header-menu class="header__item b2b-headermenu" ng-repeat="item in menuItems" role="presentation"> <a href="javascript:void(0);" class="menu__item" role="menuitem" ng-bind="item.text"></a> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/styles/ecomp.css b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/styles/ecomp.css index 9a0716a5..e593c24a 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/styles/ecomp.css +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/styles/ecomp.css @@ -167,4 +167,8 @@ p,a{ .left-menu-child { margin-left: 37px; +} + +.header-image{ + height:28px; }
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusionapp/icons/logo_onap_transbg.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusionapp/icons/logo_onap_transbg.png Binary files differnew file mode 100644 index 00000000..8d601009 --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusionapp/icons/logo_onap_transbg.png |
