From 21a8761f684745bb300e075c7e98ad897ace9eed Mon Sep 17 00:00:00 2001
From: st782s <statta@research.att.com>
Date: Tue, 30 Jan 2018 17:29:36 -0500
Subject: Security/ Package Name changes

Issue-ID: PORTAL-174, PORTAL-157, PORTAL-156, PORTAL-148, PORTAL-145,
PORTAL-140, PORTAL-133, PORTAL-121, PORTAL-111, PORTAL-88

Includes security fixes, Role Centralization, replace certain ECOMP
occurrences etc

Change-Id: I3c8b706709c6b92e646e3cbe50c2d660e8a46ef4
Signed-off-by: st782s <statta@research.att.com>
---
 .../ionicons-2.0.1/css/ecomp-ionicons.css          |  12 +
 ecomp-portal-FE-os/client/configurations/dev.json  |  17 +-
 .../client/configurations/integ.json               |  17 +-
 ecomp-portal-FE-os/client/index.html               |  13 +-
 ecomp-portal-FE-os/client/src/app.js               |  40 +-
 ecomp-portal-FE-os/client/src/app.less             |   4 +
 .../directives/right-menu/right-menu.directive.js  |  43 ++-
 .../src/directives/right-menu/right-menu.less      |  38 +-
 .../src/directives/right-menu/right-menu.tpl.html  |   6 +-
 .../search-users/search-users.controller.js        |  41 +-
 .../src/directives/search-users/search-users.less  |  40 +-
 .../directives/search-users/search-users.tpl.html  |  12 +-
 ecomp-portal-FE-os/client/src/router.js            |  40 +-
 .../recommendation/recommendation.service.js       |  40 +-
 .../services/support/session/session.service.js    |  40 +-
 .../services/userProfile/userProfile.service.js    |  44 ++-
 .../client/src/styles/ecomp-abs.less               |  38 +-
 .../application-details.controller.js              |  40 +-
 .../application-details.controller.spec.js         |  40 +-
 .../application-details.modal.html                 | 429 +++++++++++----------
 .../views/applications/applications.controller.js  |  41 +-
 .../applications/applications.controller.spec.js   |  40 +-
 .../src/views/applications/applications.tpl.html   |   6 +-
 .../client/src/views/catalog/get-accessswitch.html |  37 ++
 .../views/dashboard/dashboard-extension.tpl.html   |  39 +-
 .../client/src/views/footer/footer.controller.js   |  40 +-
 .../src/views/footer/footer.controller.spec.js     |  40 +-
 .../client/src/views/footer/footer.less            |  39 +-
 .../client/src/views/footer/footer.tpl.html        |   6 +-
 .../menu-details.delete.modal.html                 |   6 +-
 .../functionalMenu/functionalMenu.controller.js    |  40 +-
 .../views/functionalMenu/functionalMenu.tpl.html   |   6 +-
 .../src/views/functionalMenu/jqTreeContextMenu.js  |  40 +-
 .../src/views/header/header-extension.tpl.html     |  37 ++
 .../client/src/views/header/header-logo.html       |  37 ++
 .../profile-edit.controller.js                     |  40 +-
 .../profile-edit-dialogs/profile-edit.modal.html   |   6 +-
 .../profile-edit-dialogs/profile-edit.modal.less   |  39 +-
 .../headerRecommendations.controller.js            |  40 +-
 .../headerRecommendations.tpl.html                 |   6 +-
 .../client/src/views/search/search.controller.js   |  40 +-
 .../src/views/search/search.controller.spec.js     |  40 +-
 .../client/src/views/search/search.tpl.html        |   6 +-
 .../contact-us/contact-us-table-header.html        |   3 +
 .../views/support/contact-us/contact-us.aux.html   |   6 +-
 .../views/support/get-access/get-accessinfo.html   |   6 +-
 .../client/src/views/tabs/tabs.tpl.html            |   6 +-
 .../client/src/views/userbar/userbar.controller.js |  40 +-
 .../client/src/views/userbar/userbar.tpl.html      |   6 +-
 .../client/utils/test-utils/test-utils.js          |  40 +-
 50 files changed, 1247 insertions(+), 525 deletions(-)
 create mode 100644 ecomp-portal-FE-os/client/src/views/support/contact-us/contact-us-table-header.html

(limited to 'ecomp-portal-FE-os/client')

diff --git a/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css b/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css
index 708a4a65..0b23d3e9 100644
--- a/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css
+++ b/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css
@@ -68,6 +68,10 @@
 .icon-datanetwork-softwareasaservice:before,
 .icon-datanetwork-messaging2:before,
 .icon-controls-moreapplications:before,
+.icon-people-groupcollaboration:before,
+.icon-controls-settingsconnectedactivity:before,
+.icon-content-grid2:before,
+.icon-retail-gallery:before,
 .icon-arrows-upload:before { 
 	display: inline-block; 
 	font-family: "Ionicons"; 
@@ -208,3 +212,11 @@
 .icon-datanetwork-messaging2:before { content: "\f132"; }
 
 .icon-controls-moreapplications:before { content: "\f20b"; }
+
+.icon-people-groupcollaboration:before { content: "\f47c"; }
+
+.icon-controls-settingsconnectedactivity:before { content: "\f411"; }
+
+.icon-content-grid2:before { content: "\f440"; }
+
+.icon-retail-gallery:before  { content: "\f481"; }
\ No newline at end of file
diff --git a/ecomp-portal-FE-os/client/configurations/dev.json b/ecomp-portal-FE-os/client/configurations/dev.json
index c9bcade6..3b959f1c 100644
--- a/ecomp-portal-FE-os/client/configurations/dev.json
+++ b/ecomp-portal-FE-os/client/configurations/dev.json
@@ -1,5 +1,9 @@
 {
 	"api": {
+		"singleAppInfo":"http://localhost:8080/ecompportal/portalApi/singleAppInfo",
+		"singleAppInfoById":"http://localhost:8080/ecompportal/portalApi/singleAppInfoById",
+		"syncRolesFromExternalAuthSystem":"http://localhost:8080/ecompportal/portalApi/syncRoles",
+		"syncFunctionsFromExternalAuthSystem":"http://localhost:8080/ecompportal/portalApi/syncFunctions",
 		"userApps": "http://localhost:8080/ecompportal/portalApi/userApps",
 		"persUserApps": "http://localhost:8080/ecompportal/portalApi/persUserApps",
 		"appCatalog": "http://localhost:8080/ecompportal/portalApi/appCatalog",
@@ -59,17 +63,17 @@
 		"saveNotification": "http://localhost:8080/ecompportal/portalApi/saveNotification",
 		"getNotificationRoles":"http://localhost:8080/ecompportal/portalApi/notificationRole",
 		"getRole": "http://localhost:8080/ecompportal/portalApi/get_role",
-		"getRoles": "http://localhost:8080/ecompportal/portalApi/get_roles",
+		"getRoles": "http://localhost:8080/ecompportal/portalApi/get_roles/:appId",
 		"toggleRole": "http://localhost:8080/ecompportal/portalApi/role_list/toggleRole",
 		"removeRole": "http://localhost:8080/ecompportal/portalApi/role_list/removeRole",
-		"saveRole": "http://localhost:8080/ecompportal/portalApi/role/saveRole.htm",
+		"saveRole": "http://localhost:8080/ecompportal/portalApi/role/saveRole/:appId",
 		"toggleRoleRoleFunction": "http://localhost:8080/ecompportal/portalApi/role/removeRoleFunction.htm",
 		"addRoleRoleFunction": "http://localhost:8080/ecompportal/portalApi/role/addRoleFunction.htm",
 		"toggleRoleChildRole": "http://localhost:8080/ecompportal/portalApi/role/removeChildRole.htm",
 		"addRoleChildRole": "http://localhost:8080/ecompportal/portalApi/role/addChildRole.htm",
-		"getRoleFunctions": "http://localhost:8080/ecompportal/portalApi/get_role_functions",
-		"saveRoleFunction": "http://localhost:8080/ecompportal/portalApi/role_function_list/saveRoleFunction.htm",
-		"removeRoleFunction": "http://localhost:8080/ecompportal/portalApi/role_function_list/removeRoleFunction.htm",
+		"getRoleFunctions": "http://localhost:8080/ecompportal/portalApi/get_role_functions/:appId",
+		"saveRoleFunction": "http://localhost:8080/ecompportal/portalApi/role_function_list/saveRoleFunction/:appId",
+		"removeRoleFunction": "http://localhost:8080/ecompportal/portalApi/role_function_list/removeRoleFunction/:appId",
 		"userAppsOrderBySortPref": "http://localhost:8080/ecompportal/portalApi/userAppsOrderBySortPref",
 		"userAppsOrderByName": "http://localhost:8080/ecompportal/portalApi/userAppsOrderByName",
 		"saveUserAppsSortingPreference": "http://localhost:8080/ecompportal/portalApi/saveUserAppsSortingPreference",
@@ -92,7 +96,8 @@
 		"userApplicationRoles":"http://localhost:8080/ecompportal/portalApi/userApplicationRoles",
 		"ecompTitle":"http://localhost:8080/ecompportal/portalApi/ecompTitle",
 		"loggedinUser" : "http://localhost:8080/ecompportal/portalApi/loggedinUser",
-		"modifyLoggedinUser" : "http://localhost:8080/ecompportal/portalApi/modifyLoggedinUser"
+		"modifyLoggedinUser" : "http://localhost:8080/ecompportal/portalApi/modifyLoggedinUser",
+		"centralizedApps": "http:/localhost:8080/ecompportal/portalApi/centralizedApps"
 	},
 	"cookieDomain": "onap.org"
 }
diff --git a/ecomp-portal-FE-os/client/configurations/integ.json b/ecomp-portal-FE-os/client/configurations/integ.json
index c3791a5c..46fd7725 100644
--- a/ecomp-portal-FE-os/client/configurations/integ.json
+++ b/ecomp-portal-FE-os/client/configurations/integ.json
@@ -1,5 +1,9 @@
 {
 	"api": {
+		"singleAppInfo":"portalApi/singleAppInfo",
+		"singleAppInfoById":"portalApi/singleAppInfoById",
+		"syncRolesFromExternalAuthSystem":"portalApi/syncRoles",
+		"syncFunctionsFromExternalAuthSystem":"portalApi/syncFunctions",
 		"userApps": "portalApi/userApps",
 		"persUserApps": "portalApi/persUserApps",
 		"appCatalog": "portalApi/appCatalog",
@@ -59,17 +63,17 @@
 		"saveNotification": "portalApi/saveNotification",
 		"getNotificationRoles":"portalApi/notificationRole",
 		"getRole": "portalApi/get_role",
-		"getRoles": "portalApi/get_roles",
+		"getRoles": "portalApi/get_roles/:appId",
 		"toggleRole": "portalApi/role_list/toggleRole",
 		"removeRole": "portalApi/role_list/removeRole",
-		"saveRole": "portalApi/role/saveRole.htm",
+		"saveRole": "portalApi/role/saveRole/:appId",
 		"toggleRoleRoleFunction": "portalApi/role/removeRoleFunction.htm",
 		"addRoleRoleFunction": "portalApi/role/addRoleFunction.htm",
 		"toggleRoleChildRole": "portalApi/role/removeChildRole.htm",
 		"addRoleChildRole": "portalApi/role/addChildRole.htm",
-		"getRoleFunctions": "portalApi/get_role_functions",
-		"saveRoleFunction": "portalApi/role_function_list/saveRoleFunction.htm",
-		"removeRoleFunction": "portalApi/role_function_list/removeRoleFunction.htm",
+		"getRoleFunctions": "portalApi/get_role_functions/:appId",
+		"saveRoleFunction": "portalApi/role_function_list/saveRoleFunction/:appId",
+		"removeRoleFunction": "portalApi/role_function_list/removeRoleFunction/:appId",
 		"userAppsOrderBySortPref": "portalApi/userAppsOrderBySortPref",
 		"userAppsOrderByName": "portalApi/userAppsOrderByName",
 		"saveUserAppsSortingPreference": "portalApi/saveUserAppsSortingPreference",
@@ -92,7 +96,8 @@
 		"userApplicationRoles":"portalApi/userApplicationRoles",
 		"ecompTitle":"portalApi/ecompTitle",
 		"loggedinUser" : "portalApi/loggedinUser",
-		"modifyLoggedinUser" : "portalApi/modifyLoggedinUser"
+		"modifyLoggedinUser" : "portalApi/modifyLoggedinUser",
+		"centralizedApps": "portalApi/centralizedApps" 
 	},
 	"cookieDomain": "onap.org"
 }
diff --git a/ecomp-portal-FE-os/client/index.html b/ecomp-portal-FE-os/client/index.html
index e65b7009..e5023821 100644
--- a/ecomp-portal-FE-os/client/index.html
+++ b/ecomp-portal-FE-os/client/index.html
@@ -2,11 +2,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -19,7 +19,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -92,6 +92,7 @@
 
 </head>
 <body ng-app="ecompApp">
+<base href="" id="baseHref">
 <script>
 	    if (!String.prototype.includes) {
 		  String.prototype.includes = function(search, start) {
@@ -119,7 +120,7 @@
 
 	    
 		var base = window.location.pathname.substring(0, window.location.pathname.indexOf("/",2)+1);
-		document.write("<base href='" + base + "' />");
+		document.getElementById('baseHref').href = base;
 
 		
 	    
@@ -247,6 +248,7 @@
   <script src="app/services/portal-admins/portal-admins.service.js"></script>
   <script src="app/services/recommendation/recommendation.service.js"></script>
   <script src="app/services/role/role.service.js"></script>
+  <script src="app/services/scheduler/scheduler.service.js"></script>
   <script src="app/services/support/getAccess/get-access.service.js"></script>
   <script src="app/services/support/session/session.service.js"></script>
   <script src="app/services/userProfile/userProfile.service.js"></script>
@@ -268,6 +270,7 @@
   <script src="app/views/dashboard/dashboard-widget.controller.js"></script>
   <script src="app/views/dashboard/dashboard.controller.js"></script>
   <script src="app/views/dashboard/newsticker.controller.js"></script>
+  <script src="app/views/errors/error.controller.js"></script>
   <script src="app/views/footer/footer.controller.js"></script>
   <script src="app/views/functionalMenu/functionalMenu-dialog/menu-details.controller.js"></script>
   <script src="app/views/functionalMenu/functionalMenu.controller.js"></script>
@@ -281,10 +284,12 @@
   <script src="app/views/portal-admin/new-portal-admin/new-portal-admin.controller.js"></script>
   <script src="app/views/portal-admin/portal-admin-controller.js"></script>
   <script src="app/views/role/role-controller.js"></script>
+  <script src="app/views/role/role-create-edit-popup-controller.js"></script>
   <script src="app/views/role/role-function-list-controller.js"></script>
   <script src="app/views/role/role-list-controller.js"></script>
   <script src="app/views/role/rolefunctionpopupController.js"></script>
   <script src="app/views/role/rolepopupmodelController.js"></script>
+  <script src="app/views/scheduler/scheduler.controller.js"></script>
   <script src="app/views/search/search.controller.js"></script>
   <script src="app/views/sidebar/sidebar.controller.js"></script>
   <script src="app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.js"></script>
diff --git a/ecomp-portal-FE-os/client/src/app.js b/ecomp-portal-FE-os/client/src/app.js
index 8a1897fc..173074fa 100644
--- a/ecomp-portal-FE-os/client/src/app.js
+++ b/ecomp-portal-FE-os/client/src/app.js
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * eCOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 'use strict';
 
diff --git a/ecomp-portal-FE-os/client/src/app.less b/ecomp-portal-FE-os/client/src/app.less
index bf7a96e5..9797de44 100644
--- a/ecomp-portal-FE-os/client/src/app.less
+++ b/ecomp-portal-FE-os/client/src/app.less
@@ -97,4 +97,8 @@ body {
 .errorContent p{
     font-size: 28px;
     margin-left: 120px;
+}
+
+.information-message-body{
+	word-break: break-all;
 }
\ No newline at end of file
diff --git a/ecomp-portal-FE-os/client/src/directives/right-menu/right-menu.directive.js b/ecomp-portal-FE-os/client/src/directives/right-menu/right-menu.directive.js
index 92207dfa..45aded98 100644
--- a/ecomp-portal-FE-os/client/src/directives/right-menu/right-menu.directive.js
+++ b/ecomp-portal-FE-os/client/src/directives/right-menu/right-menu.directive.js
@@ -1,24 +1,39 @@
 /*-
- * ================================================================================
- * eCOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
- */
-/**
- * Created by nnaffar on 1/28/16.
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 (function () {
     class RightMenu {
diff --git a/ecomp-portal-FE-os/client/src/directives/right-menu/right-menu.less b/ecomp-portal-FE-os/client/src/directives/right-menu/right-menu.less
index 05755536..d976a453 100644
--- a/ecomp-portal-FE-os/client/src/directives/right-menu/right-menu.less
+++ b/ecomp-portal-FE-os/client/src/directives/right-menu/right-menu.less
@@ -1,5 +1,39 @@
-/**
- * Created by nnaffar on 1/28/16.
+/*-
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 @sidebar-width: 200px;
 @transition-duration: 0.25s;
diff --git a/ecomp-portal-FE-os/client/src/directives/right-menu/right-menu.tpl.html b/ecomp-portal-FE-os/client/src/directives/right-menu/right-menu.tpl.html
index 08054b20..f252da5a 100644
--- a/ecomp-portal-FE-os/client/src/directives/right-menu/right-menu.tpl.html
+++ b/ecomp-portal-FE-os/client/src/directives/right-menu/right-menu.tpl.html
@@ -2,11 +2,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -19,7 +19,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
diff --git a/ecomp-portal-FE-os/client/src/directives/search-users/search-users.controller.js b/ecomp-portal-FE-os/client/src/directives/search-users/search-users.controller.js
index e6e7661b..10ebfd2e 100644
--- a/ecomp-portal-FE-os/client/src/directives/search-users/search-users.controller.js
+++ b/ecomp-portal-FE-os/client/src/directives/search-users/search-users.controller.js
@@ -1,23 +1,40 @@
 /*-
- * ================================================================================
- * eCOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-
 'use strict';
 (function () {
     class SearchUsersCtrl {
diff --git a/ecomp-portal-FE-os/client/src/directives/search-users/search-users.less b/ecomp-portal-FE-os/client/src/directives/search-users/search-users.less
index 605abfc8..adeb4395 100644
--- a/ecomp-portal-FE-os/client/src/directives/search-users/search-users.less
+++ b/ecomp-portal-FE-os/client/src/directives/search-users/search-users.less
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * eCOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
  .search-users-directive{
   .title {
diff --git a/ecomp-portal-FE-os/client/src/directives/search-users/search-users.tpl.html b/ecomp-portal-FE-os/client/src/directives/search-users/search-users.tpl.html
index 288029d6..40eabcfc 100644
--- a/ecomp-portal-FE-os/client/src/directives/search-users/search-users.tpl.html
+++ b/ecomp-portal-FE-os/client/src/directives/search-users/search-users.tpl.html
@@ -2,11 +2,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -19,7 +19,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -36,7 +36,7 @@
   ECOMP is a trademark and service mark of AT&T Intellectual Property.
   -->
 <div class="search-users-directive">
-    <form name="searchUsersForm" novalidate>
+    <form name="searchUsersForm" novalidate method="post">
         <div class="title" ng-bind="searchUsers.searchTitle"></div>
         <div class="main">
            <div ng-show="searchUsers.showSearch">
@@ -128,11 +128,11 @@
 					</div>
 					<div class="input-new-user-div" >
 						  <div class="">*Login Password</div>
-						  <input  type="password" ng-model="searchUsers.newUser.loginPwd"/>
+						  <input  type="password" ng-model="searchUsers.newUser.loginPwd"    autocomplete="off"/>
 					</div>
 					<div class="input-new-user-div" >
 						  <div class="">*Confirm Login Password</div>
-						  <input  type="password" ng-model="searchUsers.newUser.loginPwdCheck"/>
+						  <input  type="password" ng-model="searchUsers.newUser.loginPwdCheck"  autocomplete="off"/>
 					</div>
 				<div ng-show="searchUsers.newUser.loginPwdCheck.length>=searchUsers.newUser.loginPwd.length&&searchUsers.newUser.loginPwdCheck.length>0&&searchUsers.newUser.loginPwd!=searchUsers.newUser.loginPwdCheck"
 						style="color: #cf2a2a; font-size: 12px;">
diff --git a/ecomp-portal-FE-os/client/src/router.js b/ecomp-portal-FE-os/client/src/router.js
index 1b9cb5c5..a63080a1 100644
--- a/ecomp-portal-FE-os/client/src/router.js
+++ b/ecomp-portal-FE-os/client/src/router.js
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * eCOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 'use strict';
 
diff --git a/ecomp-portal-FE-os/client/src/services/recommendation/recommendation.service.js b/ecomp-portal-FE-os/client/src/services/recommendation/recommendation.service.js
index 2fe1d80f..2f4b2d87 100644
--- a/ecomp-portal-FE-os/client/src/services/recommendation/recommendation.service.js
+++ b/ecomp-portal-FE-os/client/src/services/recommendation/recommendation.service.js
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 
 /*As Recommendation code belongs to internal use  Just kept an empty file in order to avoid 404 errors in the browser console */
\ No newline at end of file
diff --git a/ecomp-portal-FE-os/client/src/services/support/session/session.service.js b/ecomp-portal-FE-os/client/src/services/support/session/session.service.js
index eca3719e..e44dc3ed 100644
--- a/ecomp-portal-FE-os/client/src/services/support/session/session.service.js
+++ b/ecomp-portal-FE-os/client/src/services/support/session/session.service.js
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * eCOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 'use strict';
 
diff --git a/ecomp-portal-FE-os/client/src/services/userProfile/userProfile.service.js b/ecomp-portal-FE-os/client/src/services/userProfile/userProfile.service.js
index 76a778f3..36e6d6e3 100644
--- a/ecomp-portal-FE-os/client/src/services/userProfile/userProfile.service.js
+++ b/ecomp-portal-FE-os/client/src/services/userProfile/userProfile.service.js
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * eCOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 'use strict';
 
@@ -113,7 +131,9 @@
                     } else {
                         if (this.debug)
                         	this.$log.debug('UserProfileService::getFunctionalMenuStaticInfo Succeeded');
-                        deferred.resolve(res.data);
+                        // saving the userId at session level
+                        sessionStorage.userId = res.data.userId;
+                        deferred.resolve(res.data);                        
                     }
                 }).catch( status => {
                     this.$log.error('UserProfileService::getFunctionalMenuStaticInfo caught exception: ' + JSON.stringify(status));
diff --git a/ecomp-portal-FE-os/client/src/styles/ecomp-abs.less b/ecomp-portal-FE-os/client/src/styles/ecomp-abs.less
index 1562375c..817ef9fb 100644
--- a/ecomp-portal-FE-os/client/src/styles/ecomp-abs.less
+++ b/ecomp-portal-FE-os/client/src/styles/ecomp-abs.less
@@ -1,4 +1,40 @@
-//portal abs table component
+/*-
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
 .c-ecomp-portal-abs-table{
     width: 100%;
     height: 600px;
diff --git a/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.js b/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.js
index 689329f5..1a7ef544 100644
--- a/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.js
+++ b/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.js
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * eCOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 'use strict';
 (function () {
diff --git a/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.spec.js b/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.spec.js
index 34042c14..626aa152 100644
--- a/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.spec.js
+++ b/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.spec.js
@@ -1,19 +1,37 @@
 /*-
- * ================================================================================
- * eCOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
diff --git a/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.modal.html b/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.modal.html
index 13fb8e7a..3d221a3d 100644
--- a/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.modal.html
+++ b/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.modal.html
@@ -2,11 +2,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -19,7 +19,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -35,229 +35,230 @@
  
   ECOMP is a trademark and service mark of AT&T Intellectual Property.
   -->
-<div class="application-details-modal">
 
-		<div class="b2b-modal-header">
-			<h2 class="account-details-title" id="application-details-title">Application Details</h2>
-
-			<div class="corner-button in">
-				<button type="button" class="close" aria-label="Closhhhe"
-					ng-click="$dismiss('cancel')"></button>
-			</div>
-		</div>
-
-		<div class="b2b-modal-body">
-    <div class="app-properties-main" scroll-top="appDetails.scrollApi">
-        <form name="appForm" novalidate autocomplete="off">
-            <!-- We can remove this script once we get to Firefox version 47
-                  autocomplete="off" won't work until v47 -->
-           <!--  <script type="text/javascript">
-                document.getElementById("appForm").reset();
-            </script> -->
-            <div id="app-left-container" class="left-container">
-                <div class="property-label checkbox-label"> 
-					<label for="checkbox-app-is-restricted" class="checkbox"> 
-		                <input type="checkbox" ng-model="appDetails.app.restrictedApp" id="checkbox-app-is-restricted" ng-disabled="appDetails.isEditMode" ng-checked="appDetails.app.restrictedApp"/> 
-		                <i class="skin"></i> 
-		                <span>Hyperlink only application</span> 
-		            </label> 
-				</div>       
-                <div class="property required">
-                    <div class="property-label">Application Name</div>
-                    <input id="input-app-name"  type="text"
-                           ng-model="appDetails.app.name"
-                           maxlength="100"
-                           name="name"
-                           ng-pattern="/^[a-zA-Z0-9_\-\s\&]*$/"
-                           required/>
-
-                    <div id="error-container-conflict" class="error-container" ng-show="appDetails.conflictMessages.name" id="conflictMessages-name">
-                        <small id="app-name-error-conflict" class="err-message" ng-bind="appDetails.conflictMessages.name"></small>
-                    </div>
-                    <div id="error-container-edit" class="error-container" ng-show="appForm.name.$dirty || appDetails.isEditMode">
-                        <div ng-messages="appForm.name.$error" class="error-container">
-                            <small id="app-name-error-required" class="err-message" ng-message="required">Application name is required</small>
-                            <small id="app-name-error-alpha-num" class="err-message" ng-message="pattern">Application name must be alphanumeric</small>
-                        </div>
-                    </div>
-                </div>
-                <!--<div class="property">-->
-                <!--<div class="property-label">Description</div>-->
-                <!--<input class="input-field" type="text" ng-model="appDetails.app.description"/>-->
-                <!--</div>-->
-                <!--<div class="property">-->
-                <!--<div class="property-label">Notes</div>-->
-                <!--<input class="input-field" type="text" ng-model="appDetails.app.notes"/>-->
-                <!--</div>-->
-                <div class="property required">
-                    <div id="url-property-label" class="property-label">URL</div>
-                    <input  id="input-app-url"
-                           ng-model="appDetails.app.url"
-                           maxlength="256"
-                           name="url"
-                           type="url" placeholder="https://"
-                           ng-pattern="appDetails.ECOMP_URL_REGEX"
-                           required />
-                    <div id="app-error-url" class="error-container" ng-show="appDetails.conflictMessages.url" id="div-app-name-err-url">
-                        <small class="err-message" ng-bind="appDetails.conflictMessages.url"></small>
-                    </div>
-                    <div id="app-error-url-message" class="error-container" ng-show="appForm.url.$dirty || appDetails.isEditMode">
-                        <div ng-messages="appForm.url.$error" class="error-container">
-                            <small id="error-app-url-req" class="err-message" ng-message="required">Application URL is required</small>
-                            <!--<small id="error-app-url-invalid" class="err-message" ng-message="pattern">Application URL must be a valid URL</small>-->
-                            <small id="error-app-url-invalid" class="err-message" ng-show="appForm.url.$error.url">Application URL must be a valid URL</small>
-                        </div>
-                    </div>
-                    <!--<span class="err-message" ng-show="appForm.url.$error.url"> Not valid URL!</span>-->
-                </div>
+<div class="b2b-modal-header">
+	<h2 class="account-details-title" id="application-details-title">Application
+		Details</h2>
+	<div class="corner-button in">
+		<button type="button" class="close" id="div-confirm-close-button"
+			aria-label="Close" ng-click="$dismiss('cancel')"></button>
+	</div>
+</div>
+<div class="b2b-modal-body">
+	<div class="application-details-modal">
+		<div class="app-properties-main" scroll-top="appDetails.scrollApi">
+			<form name="appForm" novalidate autocomplete="off">
+				<div id="app-left-container" class="left-container">
+					<div class="property-label checkbox-label">
+						<label for="checkbox-app-is-restricted" class="checkbox">
+							<input type="checkbox" ng-model="appDetails.app.restrictedApp"
+							id="checkbox-app-is-restricted"
+							ng-disabled="appDetails.isEditMode"
+							ng-checked="appDetails.app.restrictedApp" /> <i class="skin"></i>
+							<span>Hyperlink only application</span>
+						</label>
+					</div>
+					<div class="property required">
+						<div class="property-label">Application Name</div>
+						<input id="input-app-name" type="text"
+							ng-model="appDetails.app.name" maxlength="100" name="name"
+							ng-pattern="/^[a-zA-Z0-9_\-\s\&]*$/" required />
 
+						<div id="error-container-conflict" class="error-container"
+							ng-show="appDetails.conflictMessages.name"
+							id="conflictMessages-name">
+							<small id="app-name-error-conflict" class="err-message"
+								ng-bind="appDetails.conflictMessages.name"></small>
+						</div>
+						<div id="error-container-edit" class="error-container"
+							ng-show="appForm.name.$dirty || appDetails.isEditMode">
+							<div ng-messages="appForm.name.$error" class="error-container">
+								<small id="app-name-error-required" class="err-message"
+									ng-message="required">Application name is required</small> <small
+									id="app-name-error-alpha-num" class="err-message"
+									ng-message="pattern">Application name must be
+									alphanumeric</small>
+							</div>
+						</div>
+					</div>
+					<div class="property required">
+						<div id="url-property-label" class="property-label">URL</div>
+						<input id="input-app-url" ng-model="appDetails.app.url"
+							maxlength="256" name="url" type="url" placeholder="https://"
+							ng-pattern="appDetails.ECOMP_URL_REGEX" required />
+						<div id="app-error-url" class="error-container"
+							ng-show="appDetails.conflictMessages.url"
+							id="div-app-name-err-url">
+							<small class="err-message"
+								ng-bind="appDetails.conflictMessages.url"></small>
+						</div>
+						<div id="app-error-url-message" class="error-container"
+							ng-show="appForm.url.$dirty || appDetails.isEditMode">
+							<div ng-messages="appForm.url.$error" class="error-container">
+								<small id="error-app-url-req" class="err-message"
+									ng-message="required">Application URL is required</small>
+								<!--<small id="error-app-url-invalid" class="err-message" ng-message="pattern">Application URL must be a valid URL</small>-->
+								<small id="error-app-url-invalid" class="err-message"
+									ng-show="appForm.url.$error.url">Application URL must
+									be a valid URL</small>
+							</div>
+						</div>
+						<!--<span class="err-message" ng-show="appForm.url.$error.url"> Not valid URL!</span>-->
+					</div>
 
-                <div class="property" ng-show="!appDetails.app.restrictedApp">
-                    <div class="property-label">Rest API URL</div>
-                    <input  id="input-app-rest-url"
-                           ng-model="appDetails.app.restUrl"
-                           name="restUrl"
-                           type="url" placeholder="https://"
-                           ng-pattern="appDetails.ECOMP_URL_REGEX"
-                           maxlength="256"/>
-                    <div id="app-error-rest-message" class="error-container" ng-show="appForm.restUrl.$dirty || appDetails.isEditMode">
-                        <div ng-messages="appForm.restUrl.$error" class="error-container">
-                            <!--<small class="err-message" ng-message="pattern">Application REST URL must be a valid URL</small>-->
-                            <small class="err-message" ng-show="appForm.restUrl.$error.url">Application REST URL must be a valid URL</small>
-                        </div>
-                    </div>
-                </div>
 
-                <div class="property required" ng-show="!appDetails.app.restrictedApp">
-                    <div id="username-property-label"  class="property-label">Username</div>
-                    <input  type="text"
-                           ng-model="appDetails.app.username"
-                           name="username"
-                           maxlength="256"
-                           ng-required="!appDetails.app.restrictedApp"/>
-                    <div id="app-error-username-container" class="error-container" ng-show="appForm.username.$dirty || appDetails.isEditMode">
-                        <div ng-messages="appForm.username.$error" class="error-container">
-                            <small  id="error-appusername-reqd" class="err-message" ng-message="required">My Logins App Username is required</small>
-                        </div>
-                    </div>
-                </div>
-                <div class="property required" ng-show="!appDetails.app.restrictedApp">
-                    <div id="pwd-property-label"  class="property-label">Password</div>
-                    <input  type="password"  id="input-mylogins-password"
-                           ng-model="appDetails.app.appPassword" autocomplete="new-password"
-                           name="appPassword"
-                           maxlength="256"
-                           ng-required="!appDetails.app.restrictedApp"/>
-                    <div id="app-error-password-container" class="error-container" ng-show="appForm.appPassword.$dirty || appDetails.isEditMode">
-                        <div ng-messages="appForm.appPassword.$error" class="error-container">
-                            <small id="error-mylogins-password-reqd" class="err-message" ng-message="required">My Logins App Password is required</small>
-                        </div>
-                    </div>
+					<div class="property required" ng-show="!appDetails.app.restrictedApp">
+						<div class="property-label">Rest API URL</div>
+						<input id="input-app-rest-url" ng-model="appDetails.app.restUrl"
+							name="restUrl" type="url" placeholder="https://"
+							ng-pattern="appDetails.ECOMP_URL_REGEX" maxlength="256"
+							ng-required="!appDetails.app.restrictedApp" />
+						<div id="app-error-rest-message" class="error-container"
+							ng-show="appForm.restUrl.$dirty || appDetails.isEditMode">
+							<div ng-messages="appForm.restUrl.$error" class="error-container">
+								<small class="err-message" ng-show="appForm.restUrl.$error.url">Application
+									REST URL must be a valid URL</small>
+							</div>
+						</div>
+					</div>
 
-	                <div class="property" ng-show="!appDetails.app.restrictedApp">
-	                    <div id="pwd-property-label"  class="property-label">Name Space</div>
-	                    <input  type="text"  id="input-mylogins-auth-namespace"
-	                           ng-model="appDetails.app.nameSpace" 
-	                           name="appAuthNameSpace"
-	                           maxlength="256"/>
-	                </div>                                    
-                </div>
-            </div>
-            <div class="right-container">
-                <div class="property">
-                    <div class="property-label">Upload Image</div>
-                    <input type="file" id="input-app-image-upload"
-                           class="input-file-field"
-                           accept="image/*"
-                           ng-model="appDetails.originalImage"
-                           name="appImage"
-                           image-upload="appDetails.originalImage"
-                           image-upload-resize-max-height="300"
-                           image-upload-resize-max-width="360"
-                           image-upload-resize-quality="0.7"
-                           image-upload-api="appDetails.imageApi" style="height: 24px;"/>
+					<div class="property required"
+						ng-show="!appDetails.app.restrictedApp">
+						<div id="username-property-label" class="property-label">Username</div>
+						<input type="text" ng-model="appDetails.app.username"
+							name="username" maxlength="256"
+							ng-required="!appDetails.app.restrictedApp" />
+						<div id="app-error-username-container" class="error-container"
+							ng-show="appForm.username.$dirty || appDetails.isEditMode">
+							<div ng-messages="appForm.username.$error"
+								class="error-container">
+								<small id="error-appusername-reqd" class="err-message"
+									ng-message="required">My Logins App Username is
+									required</small>
+							</div>
+						</div>
+					</div>
+					<div class="property required"
+						ng-show="!appDetails.app.restrictedApp">
+						<div id="pwd-property-label" class="property-label">Password</div>
+						<input type="password" id="input-mylogins-password"
+							ng-model="appDetails.app.appPassword" autocomplete="new-password"
+							name="appPassword" maxlength="256"
+							ng-required="!appDetails.app.restrictedApp" />
+						<div id="app-error-password-container" class="error-container"
+							ng-show="appForm.appPassword.$dirty || appDetails.isEditMode">
+							<div ng-messages="appForm.appPassword.$error"
+								class="error-container">
+								<small id="error-mylogins-password-reqd" class="err-message"
+									ng-message="required">My Logins App Password is
+									required</small>
+							</div>
+						</div>
 
-                    <div id="app-error-image-upload" class="error-container" ng-show="appForm.appImage.$dirty">
-                        <div ng-messages="appForm.appImage.$error" class="error-container">
-                            <small id="error-app-invalid-image" class="err-message" ng-message="mimeType">Uploaded file must be an image</small>
-                            <small id="error-app-invalid-image-size" class="err-message" ng-message="imageSize">Image file must be smaller than 1MB</small>
-                        </div>
-                    </div>
+						<div class="property" ng-show="!appDetails.app.restrictedApp">
+							<div id="pwd-property-label" class="property-label">Name
+								Space</div>
+							<input type="text" id="input-mylogins-auth-namespace"
+								ng-model="appDetails.app.nameSpace" name="appAuthNameSpace"
+								maxlength="256" />
+						</div>
+					</div>
+				</div>
+				<div class="right-container">
+					<div class="property">
+						<div class="property-label">Upload Image</div>
+						<input type="file" id="input-app-image-upload"
+							class="input-file-field" accept="image/*"
+							ng-model="appDetails.originalImage" name="appImage"
+							image-upload="appDetails.originalImage"
+							image-upload-resize-max-height="300"
+							image-upload-resize-max-width="360"
+							image-upload-resize-quality="0.7"
+							image-upload-api="appDetails.imageApi" style="height: 24px;" />
 
-                    <div class="property-label preview">
-                        <span class="left-label">Preview</span>
-                        <span class="remove" ng-click="appDetails.removeImage()">Remove</span>
-                    </div>
-                    <img id="image-app-preview" class="image-preview" ng-src="{{appDetails.app.imageLink || appDetails.app.thumbnail || appDetails.emptyImgForPreview}}"/>
-                    <div id="property-communication-inbox" class="property" ng-show="!appDetails.app.restrictedApp">
-                        <div id="property-communication-inbox-label" class="property-label">Communication Inbox</div>
-                        <input  type="text" id="input-UEB-topicname"
-                               ng-model="appDetails.app.uebTopicName"
-                               name="uebTopicName" readonly="readonly"/>
-                    </div>
+						<div id="app-error-image-upload" class="error-container"
+							ng-show="appForm.appImage.$dirty">
+							<div ng-messages="appForm.appImage.$error"
+								class="error-container">
+								<small id="error-app-invalid-image" class="err-message"
+									ng-message="mimeType">Uploaded file must be an image</small> <small
+									id="error-app-invalid-image-size" class="err-message"
+									ng-message="imageSize">Image file must be smaller than
+									1MB</small>
+							</div>
+						</div>
 
-                    <div id="property-communication-key" class="property" ng-show="!appDetails.app.restrictedApp">
-                        <div id="property-communication-key-label" class="property-label">Communication Key</div>
-                        <input  type="text" id="input-UEB-communication-key"
-                               ng-model="appDetails.app.uebKey"
-                               name="uebKey" readonly="readonly" />
-                    </div>
+						<div class="property-label preview">
+							<span class="left-label">Preview</span> <span class="remove"
+								ng-click="appDetails.removeImage()">Remove</span>
+						</div>
+						<img id="image-app-preview" class="image-preview"
+							ng-src="{{appDetails.app.imageLink || appDetails.app.thumbnail || appDetails.emptyImgForPreview}}" />
+						<div id="property-communication-inbox" class="property"
+							ng-show="!appDetails.app.restrictedApp">
+							<div id="property-communication-inbox-label"
+								class="property-label">Communication Inbox</div>
+							<input type="text" id="input-UEB-topicname"
+								ng-model="appDetails.app.uebTopicName" name="uebTopicName"
+								readonly="readonly" />
+						</div>
 
-                    <div id="property-communication-secret" class="property" ng-show="!appDetails.app.restrictedApp">
-                        <div id="property-communication-secret-label" class="property-label">Communication Secret</div>
-                        <input  type="text" id="input-UEB-communication-secret"
-                               ng-model="appDetails.app.uebSecret"
-                               name="uebSecret" readonly="readonly" />
-                    </div>
+						<div id="property-communication-key" class="property"
+							ng-show="!appDetails.app.restrictedApp">
+							<div id="property-communication-key-label" class="property-label">Communication
+								Key</div>
+							<input type="text" id="input-UEB-communication-key"
+								ng-model="appDetails.app.uebKey" name="uebKey"
+								readonly="readonly" />
+						</div>
 
-                    <div id="property-guest-access" class="property">
-                        <label for="checkbox-app-is-open" class="checkbox"> 
-		                <input type="checkbox" ng-model="appDetails.app.isOpen" id="checkbox-app-is-open" ng-checked="appDetails.app.isOpen || appDetails.app.restrictedApp" ng-disabled="appDetails.app.restrictedApp"/> 
-		                <i class="skin"></i> 
-		                <span>Allow guest access</span> 
-		            </label> 
-                    </div>
-                    <div id="property-active" class="property">
-                     <label for="checkbox-app-is-enabled" class="checkbox"> 
-		                <input type="checkbox" ng-model="appDetails.app.isEnabled" id="checkbox-app-is-enabled"/> 
-		                <i class="skin"></i> 
-		                <span>Active</span> 
-		            </label>    
-                    </div> <br/>
-                    <div id="property-is-central-auth" class="property" ng-show="!appDetails.app.restrictedApp">
-                     <label for="checkbox-app-is-central-auth" class="checkbox"> 
-		                <input type="checkbox" ng-model="appDetails.app.isCentralAuth" id="checkbox-app-is-central-auth"/> 
-		                <i class="skin"></i> 
-		                <span>Centralized</span> 
-		            </label>    
-                    </div>
+						<div id="property-communication-secret" class="property"
+							ng-show="!appDetails.app.restrictedApp">
+							<div id="property-communication-secret-label"
+								class="property-label">Communication Secret</div>
+							<input type="text" id="input-UEB-communication-secret"
+								ng-model="appDetails.app.uebSecret" name="uebSecret"
+								readonly="readonly" />
+						</div>
 
-                </div>
+						<div id="property-guest-access" class="property">
+							<label for="checkbox-app-is-open" class="checkbox"> <input
+								type="checkbox" ng-model="appDetails.app.isOpen"
+								id="checkbox-app-is-open"
+								ng-checked="appDetails.app.isOpen || appDetails.app.restrictedApp"
+								ng-disabled="appDetails.app.restrictedApp" /> <i class="skin"></i>
+								<span>Allow guest access</span>
+							</label>
+						</div>
+						<div id="property-active" class="property">
+							<label for="checkbox-app-is-enabled" class="checkbox"> <input
+								type="checkbox" ng-model="appDetails.app.isEnabled"
+								id="checkbox-app-is-enabled" /> <i class="skin"></i> <span>Active</span>
+							</label>
+						</div>
+						<br />
+						<div id="property-is-central-auth" class="property"
+							ng-show="!appDetails.app.restrictedApp">
+							<label for="checkbox-app-is-central-auth" class="checkbox">
+								<input type="checkbox" ng-model="appDetails.app.isCentralAuth"
+								id="checkbox-app-is-central-auth" /> <i class="skin"></i> <span>Centralized</span>
+							</label>
+						</div>
 
-            </div>
-        </form>
-    </div>
-	</div>
-		
-			<br>
-			<div class="b2b-modal-footer">
-				<div class="dialog-control">
-				<span class="ecomp-save-spinner" ng-show="appDetails.isSaving"></span> 
-				<button id="button-save-app" class="btn btn-alt btn-small" ng-class="{disabled: appForm.$invalid}" ng-click="appDetails.saveChanges()">Save</button> 	
-						<button id="button-notification-cancel" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')"role="button" tabindex="0">Cancel</button>
-						
-						
 					</div>
-			</div>
-			
-			
-			
 
+				</div>
+			</form>
+		</div>
+	</div>
 </div>
-
-
-<script type="application/javascript">
-    $(document).ready(function(){
-        $(".ngdialog-content").css("top","-150px")
-    });
-</script>
\ No newline at end of file
+<div class="b2b-modal-footer">
+	<div align="right">
+		<span class="ecomp-save-spinner" ng-show="appDetails.isSaving"></span>
+		<button id="button-save-app" class="btn btn-alt btn-small"
+			ng-class="{disabled: appForm.$invalid}"
+			ng-click="appDetails.saveChanges()">Save</button>
+		<button id="button-notification-cancel" class="btn btn-alt btn-small"
+			ng-click="$dismiss('cancel')" role="button" tabindex="0">Cancel</button>
+	</div>
+</div>
\ No newline at end of file
diff --git a/ecomp-portal-FE-os/client/src/views/applications/applications.controller.js b/ecomp-portal-FE-os/client/src/views/applications/applications.controller.js
index d1c2b091..5eb9dbba 100644
--- a/ecomp-portal-FE-os/client/src/views/applications/applications.controller.js
+++ b/ecomp-portal-FE-os/client/src/views/applications/applications.controller.js
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * eCOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 'use strict';
 (function () {
@@ -83,6 +101,7 @@
                     templateUrl: 'app/views/applications/application-details-dialog/application-details.modal.html',
                     controller: 'AppDetailsModalCtrl as appDetails',
                     sizeClass: 'modal-large', 
+                	windowClass:"modal-docked",
                     resolve: {
     					items: function () {
         	        	  return data;
diff --git a/ecomp-portal-FE-os/client/src/views/applications/applications.controller.spec.js b/ecomp-portal-FE-os/client/src/views/applications/applications.controller.spec.js
index 32cc3a1f..626aa152 100644
--- a/ecomp-portal-FE-os/client/src/views/applications/applications.controller.spec.js
+++ b/ecomp-portal-FE-os/client/src/views/applications/applications.controller.spec.js
@@ -1,19 +1,37 @@
 /*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
diff --git a/ecomp-portal-FE-os/client/src/views/applications/applications.tpl.html b/ecomp-portal-FE-os/client/src/views/applications/applications.tpl.html
index 8414ee26..e354e419 100644
--- a/ecomp-portal-FE-os/client/src/views/applications/applications.tpl.html
+++ b/ecomp-portal-FE-os/client/src/views/applications/applications.tpl.html
@@ -2,11 +2,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -19,7 +19,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
diff --git a/ecomp-portal-FE-os/client/src/views/catalog/get-accessswitch.html b/ecomp-portal-FE-os/client/src/views/catalog/get-accessswitch.html
index 5cda74a4..53da9ebd 100644
--- a/ecomp-portal-FE-os/client/src/views/catalog/get-accessswitch.html
+++ b/ecomp-portal-FE-os/client/src/views/catalog/get-accessswitch.html
@@ -1,3 +1,40 @@
+<!--
+  ============LICENSE_START==========================================
+  ONAP Portal
+  ===================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ===================================================================
+ 
+  Unless otherwise specified, all software contained herein is licensed
+  under the Apache License, Version 2.0 (the "License");
+  you may not use this software except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+              http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ 
+  Unless otherwise specified, all documentation contained herein is licensed
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+  you may not use this documentation except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+              https://creativecommons.org/licenses/by/4.0/
+ 
+  Unless required by applicable law or agreed to in writing, documentation
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ 
+  ============LICENSE_END============================================
+ 
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  -->
 <div class="gridster-box-content"
 	ng-style="{'cursor':'pointer',
 			'background-image': 'url('+(item.imageLink)+')',
diff --git a/ecomp-portal-FE-os/client/src/views/dashboard/dashboard-extension.tpl.html b/ecomp-portal-FE-os/client/src/views/dashboard/dashboard-extension.tpl.html
index aae5519f..ed175048 100644
--- a/ecomp-portal-FE-os/client/src/views/dashboard/dashboard-extension.tpl.html
+++ b/ecomp-portal-FE-os/client/src/views/dashboard/dashboard-extension.tpl.html
@@ -1 +1,38 @@
-<!-- This is a dummy placeholder  -->
\ No newline at end of file
+<!--
+  ============LICENSE_START==========================================
+  ONAP Portal
+  ===================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ===================================================================
+ 
+  Unless otherwise specified, all software contained herein is licensed
+  under the Apache License, Version 2.0 (the "License");
+  you may not use this software except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+              http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ 
+  Unless otherwise specified, all documentation contained herein is licensed
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+  you may not use this documentation except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+              https://creativecommons.org/licenses/by/4.0/
+ 
+  Unless required by applicable law or agreed to in writing, documentation
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ 
+  ============LICENSE_END============================================
+ 
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  -->
+You do not have access to any application or function in ONAP.
diff --git a/ecomp-portal-FE-os/client/src/views/footer/footer.controller.js b/ecomp-portal-FE-os/client/src/views/footer/footer.controller.js
index d21c829e..e58c9934 100644
--- a/ecomp-portal-FE-os/client/src/views/footer/footer.controller.js
+++ b/ecomp-portal-FE-os/client/src/views/footer/footer.controller.js
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 'use strict';
 (function () {
diff --git a/ecomp-portal-FE-os/client/src/views/footer/footer.controller.spec.js b/ecomp-portal-FE-os/client/src/views/footer/footer.controller.spec.js
index 32cc3a1f..626aa152 100644
--- a/ecomp-portal-FE-os/client/src/views/footer/footer.controller.spec.js
+++ b/ecomp-portal-FE-os/client/src/views/footer/footer.controller.spec.js
@@ -1,19 +1,37 @@
 /*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
diff --git a/ecomp-portal-FE-os/client/src/views/footer/footer.less b/ecomp-portal-FE-os/client/src/views/footer/footer.less
index 0004b02b..923430c6 100644
--- a/ecomp-portal-FE-os/client/src/views/footer/footer.less
+++ b/ecomp-portal-FE-os/client/src/views/footer/footer.less
@@ -1,4 +1,41 @@
-.w-ecomp-footer {
+/*-
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+ .w-ecomp-footer {
     z-index: 101;
     background-color: #222;
     position: absolute;
diff --git a/ecomp-portal-FE-os/client/src/views/footer/footer.tpl.html b/ecomp-portal-FE-os/client/src/views/footer/footer.tpl.html
index b4220711..a9fd704a 100644
--- a/ecomp-portal-FE-os/client/src/views/footer/footer.tpl.html
+++ b/ecomp-portal-FE-os/client/src/views/footer/footer.tpl.html
@@ -2,11 +2,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -19,7 +19,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
diff --git a/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu-dialog/menu-details.delete.modal.html b/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu-dialog/menu-details.delete.modal.html
index ff2be605..9a9dad35 100644
--- a/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu-dialog/menu-details.delete.modal.html
+++ b/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu-dialog/menu-details.delete.modal.html
@@ -2,11 +2,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -19,7 +19,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
diff --git a/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.controller.js b/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.controller.js
index 0ff46e4d..8843006c 100644
--- a/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.controller.js
+++ b/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.controller.js
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 'use strict';
 (function () {
diff --git a/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.tpl.html b/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.tpl.html
index ed658f75..cbde4365 100644
--- a/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.tpl.html
+++ b/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.tpl.html
@@ -2,11 +2,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -19,7 +19,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
diff --git a/ecomp-portal-FE-os/client/src/views/functionalMenu/jqTreeContextMenu.js b/ecomp-portal-FE-os/client/src/views/functionalMenu/jqTreeContextMenu.js
index dba442c8..d9610353 100644
--- a/ecomp-portal-FE-os/client/src/views/functionalMenu/jqTreeContextMenu.js
+++ b/ecomp-portal-FE-os/client/src/views/functionalMenu/jqTreeContextMenu.js
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 (function ($) {
 	if (!$.fn.tree) {
diff --git a/ecomp-portal-FE-os/client/src/views/header/header-extension.tpl.html b/ecomp-portal-FE-os/client/src/views/header/header-extension.tpl.html
index 8c7ee407..80f0a366 100644
--- a/ecomp-portal-FE-os/client/src/views/header/header-extension.tpl.html
+++ b/ecomp-portal-FE-os/client/src/views/header/header-extension.tpl.html
@@ -1,3 +1,40 @@
+<!--
+  ============LICENSE_START==========================================
+  ONAP Portal
+  ===================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ===================================================================
+ 
+  Unless otherwise specified, all software contained herein is licensed
+  under the Apache License, Version 2.0 (the "License");
+  you may not use this software except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+              http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ 
+  Unless otherwise specified, all documentation contained herein is licensed
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+  you may not use this documentation except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+              https://creativecommons.org/licenses/by/4.0/
+ 
+  Unless required by applicable law or agreed to in writing, documentation
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ 
+  ============LICENSE_END============================================
+ 
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  -->
 <button href="javascript:void(0)" id="allLogout" ng-click="editProfile()" class="btn btn-alt btn-small">
 	Profile
 </button>
\ No newline at end of file
diff --git a/ecomp-portal-FE-os/client/src/views/header/header-logo.html b/ecomp-portal-FE-os/client/src/views/header/header-logo.html
index 0ab0560e..15e20225 100644
--- a/ecomp-portal-FE-os/client/src/views/header/header-logo.html
+++ b/ecomp-portal-FE-os/client/src/views/header/header-logo.html
@@ -1 +1,38 @@
+<!--
+  ============LICENSE_START==========================================
+  ONAP Portal
+  ===================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ===================================================================
+ 
+  Unless otherwise specified, all software contained herein is licensed
+  under the Apache License, Version 2.0 (the "License");
+  you may not use this software except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+              http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ 
+  Unless otherwise specified, all documentation contained herein is licensed
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+  you may not use this documentation except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+              https://creativecommons.org/licenses/by/4.0/
+ 
+  Unless required by applicable law or agreed to in writing, documentation
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ 
+  ============LICENSE_END============================================
+ 
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  -->
 <img src="assets/images/onap-logo.png" alt="Onap Logo" class="onap-title-logo" >
diff --git a/ecomp-portal-FE-os/client/src/views/header/profile-edit-dialogs/profile-edit.controller.js b/ecomp-portal-FE-os/client/src/views/header/profile-edit-dialogs/profile-edit.controller.js
index 4720e752..c1357fa8 100644
--- a/ecomp-portal-FE-os/client/src/views/header/profile-edit-dialogs/profile-edit.controller.js
+++ b/ecomp-portal-FE-os/client/src/views/header/profile-edit-dialogs/profile-edit.controller.js
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * eCOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 'use strict';
 (function () {
diff --git a/ecomp-portal-FE-os/client/src/views/header/profile-edit-dialogs/profile-edit.modal.html b/ecomp-portal-FE-os/client/src/views/header/profile-edit-dialogs/profile-edit.modal.html
index 3f857a24..7afa59c2 100644
--- a/ecomp-portal-FE-os/client/src/views/header/profile-edit-dialogs/profile-edit.modal.html
+++ b/ecomp-portal-FE-os/client/src/views/header/profile-edit-dialogs/profile-edit.modal.html
@@ -2,11 +2,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -19,7 +19,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
diff --git a/ecomp-portal-FE-os/client/src/views/header/profile-edit-dialogs/profile-edit.modal.less b/ecomp-portal-FE-os/client/src/views/header/profile-edit-dialogs/profile-edit.modal.less
index b103f304..8c83468e 100644
--- a/ecomp-portal-FE-os/client/src/views/header/profile-edit-dialogs/profile-edit.modal.less
+++ b/ecomp-portal-FE-os/client/src/views/header/profile-edit-dialogs/profile-edit.modal.less
@@ -1,4 +1,41 @@
-.profile-detail-modal {
+/*-
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+ .profile-detail-modal {
   height: 430px;
   margin-left: 20px;
   
diff --git a/ecomp-portal-FE-os/client/src/views/headerRecommendation/headerRecommendations.controller.js b/ecomp-portal-FE-os/client/src/views/headerRecommendation/headerRecommendations.controller.js
index 0c152062..9841bfb8 100644
--- a/ecomp-portal-FE-os/client/src/views/headerRecommendation/headerRecommendations.controller.js
+++ b/ecomp-portal-FE-os/client/src/views/headerRecommendation/headerRecommendations.controller.js
@@ -1,20 +1,38 @@
 /*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 /*As Recommendation code belongs to internal use  Just kept an empty file in order to avoid 404 errors in the browser console */
\ No newline at end of file
diff --git a/ecomp-portal-FE-os/client/src/views/headerRecommendation/headerRecommendations.tpl.html b/ecomp-portal-FE-os/client/src/views/headerRecommendation/headerRecommendations.tpl.html
index 4ab34e50..67dae350 100644
--- a/ecomp-portal-FE-os/client/src/views/headerRecommendation/headerRecommendations.tpl.html
+++ b/ecomp-portal-FE-os/client/src/views/headerRecommendation/headerRecommendations.tpl.html
@@ -2,11 +2,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -19,7 +19,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
diff --git a/ecomp-portal-FE-os/client/src/views/search/search.controller.js b/ecomp-portal-FE-os/client/src/views/search/search.controller.js
index 3cb22bfd..a520d00d 100644
--- a/ecomp-portal-FE-os/client/src/views/search/search.controller.js
+++ b/ecomp-portal-FE-os/client/src/views/search/search.controller.js
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 'use strict';
 (function () {
diff --git a/ecomp-portal-FE-os/client/src/views/search/search.controller.spec.js b/ecomp-portal-FE-os/client/src/views/search/search.controller.spec.js
index 32cc3a1f..626aa152 100644
--- a/ecomp-portal-FE-os/client/src/views/search/search.controller.spec.js
+++ b/ecomp-portal-FE-os/client/src/views/search/search.controller.spec.js
@@ -1,19 +1,37 @@
 /*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
diff --git a/ecomp-portal-FE-os/client/src/views/search/search.tpl.html b/ecomp-portal-FE-os/client/src/views/search/search.tpl.html
index 2b65eee8..570b029d 100644
--- a/ecomp-portal-FE-os/client/src/views/search/search.tpl.html
+++ b/ecomp-portal-FE-os/client/src/views/search/search.tpl.html
@@ -2,11 +2,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -19,7 +19,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
diff --git a/ecomp-portal-FE-os/client/src/views/support/contact-us/contact-us-table-header.html b/ecomp-portal-FE-os/client/src/views/support/contact-us/contact-us-table-header.html
new file mode 100644
index 00000000..ac835b82
--- /dev/null
+++ b/ecomp-portal-FE-os/client/src/views/support/contact-us/contact-us-table-header.html
@@ -0,0 +1,3 @@
+<th id="th-functionalItem-0" b2b-table-header sortable="false">Category</th>
+<th id="th-functionalItem-1" b2b-table-header sortable="false">ONAP Functions</th>
+<th id="th-functionalItem-2" b2b-table-header sortable="false">ONAP Applications</th>
\ No newline at end of file
diff --git a/ecomp-portal-FE-os/client/src/views/support/contact-us/contact-us.aux.html b/ecomp-portal-FE-os/client/src/views/support/contact-us/contact-us.aux.html
index f8327478..dccf0d7d 100644
--- a/ecomp-portal-FE-os/client/src/views/support/contact-us/contact-us.aux.html
+++ b/ecomp-portal-FE-os/client/src/views/support/contact-us/contact-us.aux.html
@@ -2,11 +2,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -19,7 +19,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
diff --git a/ecomp-portal-FE-os/client/src/views/support/get-access/get-accessinfo.html b/ecomp-portal-FE-os/client/src/views/support/get-access/get-accessinfo.html
index b02f9c7b..1d1aa7d9 100644
--- a/ecomp-portal-FE-os/client/src/views/support/get-access/get-accessinfo.html
+++ b/ecomp-portal-FE-os/client/src/views/support/get-access/get-accessinfo.html
@@ -2,11 +2,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -19,7 +19,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
diff --git a/ecomp-portal-FE-os/client/src/views/tabs/tabs.tpl.html b/ecomp-portal-FE-os/client/src/views/tabs/tabs.tpl.html
index b0ebcfbf..c61f74e2 100644
--- a/ecomp-portal-FE-os/client/src/views/tabs/tabs.tpl.html
+++ b/ecomp-portal-FE-os/client/src/views/tabs/tabs.tpl.html
@@ -2,11 +2,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -19,7 +19,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
diff --git a/ecomp-portal-FE-os/client/src/views/userbar/userbar.controller.js b/ecomp-portal-FE-os/client/src/views/userbar/userbar.controller.js
index 4e2b10b9..b8e816c2 100644
--- a/ecomp-portal-FE-os/client/src/views/userbar/userbar.controller.js
+++ b/ecomp-portal-FE-os/client/src/views/userbar/userbar.controller.js
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * eCOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 'use strict';
 
diff --git a/ecomp-portal-FE-os/client/src/views/userbar/userbar.tpl.html b/ecomp-portal-FE-os/client/src/views/userbar/userbar.tpl.html
index e8c4d4a3..f0e04aa4 100644
--- a/ecomp-portal-FE-os/client/src/views/userbar/userbar.tpl.html
+++ b/ecomp-portal-FE-os/client/src/views/userbar/userbar.tpl.html
@@ -2,11 +2,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -19,7 +19,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
diff --git a/ecomp-portal-FE-os/client/utils/test-utils/test-utils.js b/ecomp-portal-FE-os/client/utils/test-utils/test-utils.js
index 7d03fb97..4542aff3 100644
--- a/ecomp-portal-FE-os/client/utils/test-utils/test-utils.js
+++ b/ecomp-portal-FE-os/client/utils/test-utils/test-utils.js
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * eCOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 /**
  * Created by nnaffar on 1/10/16.
-- 
cgit 1.2.3-korg