Onboarding Page Account Admin Change

Issue-ID: PORTAL-644

Change-Id: I95e43b1a2d12dcb5a4bc56d374cc6d30d8aae3f3
Signed-off-by: statta <statta@research.att.com>

8 files changed, 309 insertions, 252 deletions

diff --git a/ecomp-portal-FE-common/client/app/services/users/users.service.js b/ecomp-portal-FE-common/client/app/services/users/users.service.js
index 045c674b..ed95bddf 100644
--- a/ecomp-portal-FE-common/client/app/services/users/users.service.js
+++ b/ecomp-portal-FE-common/client/app/services/users/users.service.js
@@ -201,7 +201,7 @@
                 // this.$log.debug('getUserAppRoles response: ', JSON.stringify(res))
                 // If response comes back as a redirected HTML page which IS NOT a success
                 if (this.utilsService.isValidJSON(res)== false ||  res.data.httpStatusCode == '500' || res.data.status == 'ERROR') {
-                    deferred.reject('UsersService::updateUserAppRoles: Failed'  + res.data.message);
+                    deferred.reject(' Error:'  + res.data.message);
                 } else {
                     // this.$log.info('UsersService::updateUserAppRoles: Succeeded');
                     deferred.resolve(res.data);
@@ -283,4 +283,4 @@
     }
     UsersService.$inject = ['$q', '$log', '$http', 'conf','uuid4', 'utilsService'];
     angular.module('ecompApp').service('usersService', UsersService)
-})();
+})();
\ No newline at end of file
diff --git a/ecomp-portal-FE-common/client/app/views/header/header.less b/ecomp-portal-FE-common/client/app/views/header/header.less
index 8d275a41..2da81f30 100644
--- a/ecomp-portal-FE-common/client/app/views/header/header.less
+++ b/ecomp-portal-FE-common/client/app/views/header/header.less
@@ -40,6 +40,12 @@
   z-index: 999;
 }
 
+.language {
+    float: left;
+    margin-top: -8px;
+}
+
+
 .logo-image {
           .portal-logo;
           display: inline-block;
diff --git a/ecomp-portal-FE-common/client/app/views/header/header.tpl.html b/ecomp-portal-FE-common/client/app/views/header/header.tpl.html
index ed240b9a..d0a87d76 100644
--- a/ecomp-portal-FE-common/client/app/views/header/header.tpl.html
+++ b/ecomp-portal-FE-common/client/app/views/header/header.tpl.html
@@ -36,235 +36,287 @@
   
   -->
 <div class="header-position">
-    <header class="b2b-header-tabs" b2b-header-responsive>
-        <ul class="header__items" role="navigation">
-<!-- Menu Icon and name -->
-            <li class="header__item icon__item" onclick="window.location = 'applicationsHome'">
-                <div ng-include class="profile-detail-extension" src="'app/views/header/header-logo.html'"></div>             
-                <span id="portal-title" class="portal-title" ng-bind="ecompTitle"></span>           	
-            </li>
-<!-- First Level menu -->
-            <li b2b-header-menu 
-            	id="megaMenu-{{item.text.split(' ').join('-')}}" 
-            	class="header__item b2b-headermenu" 
-            	ng-repeat="item in megaMenuDataObject" 
-            	ng-mousedown="loadFavorites(item.text)"  
-            	role="presentation">
-            	
-                <a href="javascript:void(0);" 
-                id="parentmenu-{{item.text.split(' ').join('-')}}-tabs"
-                class="menu__item" 
-                role="menuitem">{{item.text}}</a>
-                
-                <div class="header-secondary-wrapper" ng-if="item.active_yn=='Y'" ng-hide="hideMenus">
-                    <ul class="header-secondary" role="menu">
-<!-- Second Level menu -->
-                        <li class="header-subitem" 
-                        id="subItem-{{subItem.text.split(' ').join('-')}}"
-                        b2b-header-submenu 
-                        ng-repeat="i in item.children | orderBy : 'column'" 
-                        ng-mousemove="submenuLevelAction(i.text,i.column)" 
-                        role="presentation">
-           <!-- Favorites -->
-                        	<div ng-if="i.text=='Favorites'" >                       		
-                        		<a href="javascript:void(0);" class="menu__item" role="menuitem">{{i.text}}</a>                
-                        		<i id="favorite-star" data-size="large"  class="icon-star favorites-icon-active"></i>      		
-                        		<div class="header-columns-div" ng-show='favoritesWindow' ng-mouseleave="hideFavoritesWindow()" >
-                        			<div class="header-tertiary-wrapper" id="header-favorites">
-			                            <ul class="header-tertiary" role="menu">
-			                                <li role="presentation">
-			                                	<div                                                   
-                                                     ng-repeat="subItem in favoritesMenuItems"
-                                                     ng-show="showFavorites"
-                                                     
-                                                     id="favoritesMenuItems-{{subItem.text.split(' ').join('-')}}">
-                                                    <div class="fav-links">
-                                                        <i id="favorite-selector-favorites-list"
-                                                           class="icon-star favorites-icon-active"                                                       
-                                                           data-ng-click="removeAsFavoriteItem($event, subItem.menuId)"
-                                                           ng-mousedown="removeAsFavoriteItem($event, subItem.menuId)">
-                                                        </i>
-                                                        <a id="favorites-list" aria-label="{{subItem.text}}" ng-click="goToUrl(subItem)">{{subItem.text}}</a>
-                                                    </div>
-                                                </div>	
-                                                	                                	
-			                                    <div id="favorites-empty"  class="favorites-window-empty"   ng-show="emptyFavorites">
-			                                        <p id="p-no-favs-icon" class="no-fav-icon">
-			                                        	<span class="icon-star" ></span>
-			                                        </p>
-							                    	<p id="p-no-favs" class="largeText">{{'No Favorites'|T}}</p>
-							                        <p id="p-no-favs-desc"  class="normal">{{'Add your favorite items for quick access'|T}}.</p>
-				                                </div>
-			                                </li>
-			                            </ul>
-		                            </div>
-                        		</div>             	
-                        	</div>
-            <!-- Support or Help -->
-                        	<div ng-if="item.text=='Support' || item.text=='Help'" id="second-level-menus-help">                      	
-                        		<a id="second-level-menus-{{i.text.split(' ').join('-')}}-help" href="javascript:void(0);" ng-click="goToUrl(i);auditLog(i,'Support')" class="menu__item" role="menuitem">{{i.text| elipsis: 50}}</a>         	
-                        	</div>
-       		<!-- Others -->
-                        	<div ng-if="i.text!='Favorites' && (item.text!='Support' && item.text!='Help')" >
-                        		<a href="javascript:void(0);" class="menu__item" role="menuitem">{{i.text| elipsis: 50}}</a>
-	                            <div class="header-tertiary-wrapper" >
-		                            <ul class="third-level-menu"  role="menu" id="third-level-menus">
-<!-- Third Level menu -->	                 
-										
-			                                <li b2b-header-tertiarymenu ng-repeat="link in i.children | orderBy : 'column'" role="presentation" >
-			                                    <i id="level3-star-inactive-{{link.menuId}}" ng-cloak
-                                                    class="icon-star favorites-icon-inactive"  data-size="large"
-                                                    data-ng-click="setAsFavoriteItem($event, link.menuId)"
-                                                    ng-if="link.url.length > 1 && isUrlFavorite(link.menuId)==false">
-                                                </i>
-                                                <i id="level3-star-active-{{link.menuId}}" ng-cloak
-                                                   ng-if="link.url.length > 1 && isUrlFavorite(link.menuId)"
-                                                   class="icon-star favorites-icon-active ng-cloak"  data-size="large"
-                                                   data-ng-click="removeAsFavoriteItem($event, link.menuId)">
-                                                </i>                                              
-                                                
-			                                    <a class="third-level-title"
-                                                          aria-label="{{link.text | elipsis: 50}}"
-                                                          ng-click="goToUrl(link);auditLog(link,'application')">{{link.text| elipsis: 50}}</a>
-<!-- Fourth Level menu -->
-			                                    <div b2b-tertiary-link ng-repeat="title in link.children"  >
-			                                    	<i id="level4-star-inactive-{{title.menuId}}" ng-cloak
-		                                               class="icon-star favorites-icon-inactive"
-		                                               data-ng-click="setAsFavoriteItem($event, title.menuId)"
-		                                               ng-if="title.url.length > 1 && isUrlFavorite(title.menuId)==false">
-		                                            </i>
-		                                            <i id="level4-star-active-{{title.menuId}}" ng-cloak
-		                                               class="icon-star favorites-icon-active"
-		                                               data-ng-click="removeAsFavoriteItem($event, title.menuId)"
-		                                               ng-if="title.url.length > 1 && isUrlFavorite(title.menuId)">
-		                                            </i>
-			                                    	<a href="javascript:void(0);" class="header-tertiaryitem"  ng-class="{'disabled': title.disabled}" role="menuitem" ng-click="goToUrl(title);auditLog(title,'functional')">{{title.text | elipsis: 50}}</a>                                 	
-			                                    </div>
-			                                </li>	
-			                                
-			                                   
-		                              
-		                                                 
-		                            </ul>
-	                            </div>
-                        	</div>
-           
-                        </li>                        
-                    </ul>
-                </div>
-            </li>
-<!-- Right side of the Menu - User Icon and Notification flag -->
-            <div class="login-section">
-        <!-- Language Select -->
-				<select ng-controller="HeaderCtrl" ng-model="cur_lang" ng-change="switching(cur_lang)" style="float:right">
-					<option value="{{x.languageAlias}}" ng-repeat="x in langList">{{x.languageName}}</option>
-				</select>
-     <!-- User Icon -->
-            <li class="header__item profile" aria-haspopup="true">
-				<b2b-flyout>
-					<div b2b-flyout-toggler >
-						<div class="icon-people-oneperson" id="header-user-icon" tabindex="0" b2b-accessibility-click="13,32" aria-label="notifications" aria-haspopup="true" aria-expanded="{{flyoutOpened}}" role="button"></div>
-		          		<div id="login-snippet-text" class="login-snippet-text">{{header.isGuest ? 'Guest' : header.firstName}}</div>                  
-					</div>					
-		            <b2b-flyout-content horizontal-placement="center" vertical-placement="below">
-						<div  ng-controller="loginSnippetCtrl" >
-							<div id="reg-header-snippet">
-								<div tabindex="0" class="reg-profileDetails" id="reg-profiledetails-id">
-									<ul class="reg-Details-table">
-										<li>
-					                        <div class="reg-userName-table">
-					                            <div id="reg-userName-table-row">
-					                                <div id="reg-userName-table-cell">
-                              							<h3 >{{firstName}} {{lastName}}&nbsp;</h3>
-					                                    <span>&nbsp;</span>
-					                                </div>
-					                            </div>
-					                        </div>
-					                    </li>
-										<li><div class="reg-userEmail-label"><span class="reg-userEmail-label-spn reg-common-label-spn-txt" >{{'Email'|T}}<span class="visuallyhidden">:
-					                    </span></span></div></li>
-										<li><div class="reg-userEmail-value"><span class="reg-userEmail-value-spn">
-					                        {{loginSnippetEmail}}</span></div></li>
-					                    <li>&nbsp;</li>
-										<li><div class="reg-userRole-label"><span class="reg-userRole-label-spn reg-common-label-spn-txt">
-					                        {{'User Id'|T}}<span class="visuallyhidden">:</span></span></div></li>
-										<li><div class="reg-userRole-value"><span class="reg-userRole-value-spn">
-					                        {{loginSnippetUserid}}<span class="visuallyhidden"></span></span></div></li>
-					                    <li>&nbsp;</li>
-										<li><div class="reg-userLastLogin-label"><span class="reg-userLastLogin-label-spn reg-common-label-spn-txt">
-					                        {{'Last login'|T}}<span class="visuallyhidden">:</span></span></div></li>
-										<li><div class="reg-userLastLogin-value"><span class="reg-userLastLogin-value-spn">
-					                        {{ lastLogin | date : 'medium' }}<span class="visuallyhidden"></span></span></div></li>
-						                <li>&nbsp;</li>
-					 					<li>
-					               			<div class="display-userAppRoles-label">
-					                			<a href="javascript:void(0);"  ng-click="getUserApplicationRoles()"  class="icon-primary-accordion-plus" ng-class="{true: 'icon-primary-accordion-plus', false: 'icon-primary-accordion-minus'}[ !displayUserAppRoles]" ><span class="business-card-app-role">{{'Applications and Roles'|T}}</span></a>
-					                 		</div>
-					                 		<br>
-					                        <div class="display-userAppRoles-label display-userAppRoles-label-txt" ng-show="displayUserAppRoles">
-					                             <div ng-repeat="ua in userapproles track by  $index">
-				                                    <div class="reg-userApp-value">
-				                                    	<span class="reg-userApp-value-spn reg-common-label-spn-txt">{{ua.App}}<span class="visuallyhidden">:</span></span>
-													</div>							           
-					                                <div ng-repeat="role in ua.Roles track by  $index" class="reg-userAppRoles-value" >
-					              				 <span  ng-if="role.indexOf('global_')!=-1" id="required" style="color: Red;" visible="false"> *</span>
-					                           	<span class="reg-userAppRoles-value-spn">{{role}}</span>
-					                                </div>
-					                                <br>
-					                        	</div>
-					                     	</div>
-					                	</li>
+	<header class="b2b-header-tabs" b2b-header-responsive>
+		<ul class="header__items" role="navigation">
+			<!-- Menu Icon and name -->
+			<li class="header__item icon__item"
+				onclick="window.location = 'applicationsHome'">
+				<div ng-include class="profile-detail-extension"
+					src="'app/views/header/header-logo.html'"></div> <span
+				id="portal-title" class="portal-title" ng-bind="ecompTitle"></span>
+			</li>
+			<!-- First Level menu -->
+			<li b2b-header-menu id="megaMenu-{{item.text.split(' ').join('-')}}"
+				class="header__item b2b-headermenu"
+				ng-repeat="item in megaMenuDataObject"
+				ng-mousedown="loadFavorites(item.text)" role="presentation"><a
+				href="javascript:void(0);"
+				id="parentmenu-{{item.text.split(' ').join('-')}}-tabs"
+				class="menu__item" role="menuitem">{{item.text}}</a>
+
+				<div class="header-secondary-wrapper" ng-if="item.active_yn=='Y'"
+					ng-hide="hideMenus">
+					<ul class="header-secondary" role="menu">
+						<!-- Second Level menu -->
+						<li class="header-subitem"
+							id="subItem-{{subItem.text.split(' ').join('-')}}"
+							b2b-header-submenu
+							ng-repeat="i in item.children | orderBy : 'column'"
+							ng-mousemove="submenuLevelAction(i.text,i.column)"
+							role="presentation">
+							<!-- Favorites -->
+							<div ng-if="i.text=='Favorites'">
+								<a href="javascript:void(0);" class="menu__item" role="menuitem">{{i.text}}</a>
+								<i id="favorite-star" data-size="large"
+									class="icon-star favorites-icon-active"></i>
+								<div class="header-columns-div" ng-show='favoritesWindow'
+									ng-mouseleave="hideFavoritesWindow()">
+									<div class="header-tertiary-wrapper" id="header-favorites">
+										<ul class="header-tertiary" role="menu">
+											<li role="presentation">
+												<div ng-repeat="subItem in favoritesMenuItems"
+													ng-show="showFavorites"
+													id="favoritesMenuItems-{{subItem.text.split(' ').join('-')}}">
+													<div class="fav-links">
+														<i id="favorite-selector-favorites-list"
+															class="icon-star favorites-icon-active"
+															data-ng-click="removeAsFavoriteItem($event, subItem.menuId)"
+															ng-mousedown="removeAsFavoriteItem($event, subItem.menuId)">
+														</i> <a id="favorites-list" aria-label="{{subItem.text}}"
+															ng-click="goToUrl(subItem)">{{subItem.text}}</a>
+													</div>
+												</div>
+
+												<div id="favorites-empty" class="favorites-window-empty"
+													ng-show="emptyFavorites">
+													<p id="p-no-favs-icon" class="no-fav-icon">
+														<span class="icon-star"></span>
+													</p>
+													<p id="p-no-favs" class="largeText">{{'No
+														Favorites'|T}}</p>
+													<p id="p-no-favs-desc" class="normal">{{'Add your
+														favorite items for quick access'|T}}.</p>
+												</div>
+											</li>
+										</ul>
+									</div>
+								</div>
+							</div> <!-- Support or Help -->
+							<div ng-if="item.text=='Support' || item.text=='Help'"
+								id="second-level-menus-help">
+								<a id="second-level-menus-{{i.text.split(' ').join('-')}}-help"
+									href="javascript:void(0);"
+									ng-click="goToUrl(i);auditLog(i,'Support')" class="menu__item"
+									role="menuitem">{{i.text| elipsis: 50}}</a>
+							</div> <!-- Others -->
+							<div
+								ng-if="i.text!='Favorites' && (item.text!='Support' && item.text!='Help')">
+								<a href="javascript:void(0);" class="menu__item" role="menuitem">{{i.text|
+									elipsis: 50}}</a>
+								<div class="header-tertiary-wrapper">
+									<ul class="third-level-menu" role="menu" id="third-level-menus">
+										<!-- Third Level menu -->
+
+										<li b2b-header-tertiarymenu
+											ng-repeat="link in i.children | orderBy : 'column'"
+											role="presentation"><i
+											id="level3-star-inactive-{{link.menuId}}" ng-cloak
+											class="icon-star favorites-icon-inactive" data-size="large"
+											data-ng-click="setAsFavoriteItem($event, link.menuId)"
+											ng-if="link.url.length > 1 && isUrlFavorite(link.menuId)==false">
+										</i> <i id="level3-star-active-{{link.menuId}}" ng-cloak
+											ng-if="link.url.length > 1 && isUrlFavorite(link.menuId)"
+											class="icon-star favorites-icon-active ng-cloak"
+											data-size="large"
+											data-ng-click="removeAsFavoriteItem($event, link.menuId)">
+										</i> <a class="third-level-title"
+											aria-label="{{link.text | elipsis: 50}}"
+											ng-click="goToUrl(link);auditLog(link,'application')">{{link.text|
+												elipsis: 50}}</a> <!-- Fourth Level menu -->
+											<div b2b-tertiary-link ng-repeat="title in link.children">
+												<i id="level4-star-inactive-{{title.menuId}}" ng-cloak
+													class="icon-star favorites-icon-inactive"
+													data-ng-click="setAsFavoriteItem($event, title.menuId)"
+													ng-if="title.url.length > 1 && isUrlFavorite(title.menuId)==false">
+												</i> <i id="level4-star-active-{{title.menuId}}" ng-cloak
+													class="icon-star favorites-icon-active"
+													data-ng-click="removeAsFavoriteItem($event, title.menuId)"
+													ng-if="title.url.length > 1 && isUrlFavorite(title.menuId)">
+												</i> <a href="javascript:void(0);" class="header-tertiaryitem"
+													ng-class="{'disabled': title.disabled}" role="menuitem"
+													ng-click="goToUrl(title);auditLog(title,'functional')">{{title.text
+													| elipsis: 50}}</a>
+											</div></li>
+
+
+
+
 									</ul>
-					                <div ng-include class="profile-detail-extension" src="'app/views/header/header-extension.tpl.html'"></div>				                							
-					                <div id="reg-logout-div" class="logout-btn-div">
-					                     <button href="javascript:void(0)" id="allLogout" ng-click="allAppsLogout()" class="btn btn-alt btn-small">
-											{{'Log out'|T}}
-										</button>
-					                </div>
-						        </div>
+								</div>
 							</div>
-						</div>		
-		            </b2b-flyout-content>
-	       		</b2b-flyout>
-            </li> 
-    <!-- Notification flag -->
-            <li class="header__item notification" aria-haspopup="true" class="notification-li">
-            	<b2b-flyout>
-            		<div b2b-flyout-toggler class="notification-div">
-	            		<div class="notifications-count" ng-hide="notificationCount.count==0" ng-bind="notificationCount.count"></div>      	
-						<div id="megamenu-notification-button" class="icon-content-flag megamenu-notification-overrides" class="b2b-flyout-icon" tabindex="0" b2b-accessibility-click="13,32" aria-label="notifications" aria-haspopup="true" aria-expanded="{{flyoutOpened}}" role="button"></div>
-		            </div>
-		            <b2b-flyout-content horizontal-placement="center" vertical-placement="below">
-						<div class="notification-content" ng-controller="notificationCtrl" >
-							<div class="ng-scope">
-								<div id="notification" class="notificationBox ">
-									<div align ="right">
-					 					 <a id="notification-history-link" ui-sref="root.notificationHistory" class="notification-history-link-txt"> View All Recent Notifications </a>
-									</div>
-									<div class="notification-header">
-										<div class="notification-common-position">
-      										<p class="notification-heading">{{'Notifications'| T}}</p>
+
+						</li>
+					</ul>
+				</div></li>
+			<!-- Right side of the Menu - User Icon and Notification flag -->
+			<div class="login-section">
+					<!-- Language Select -->
+					<div ng-if="langList" class="language">
+						<select style="font: normal 12px Omnes-ECOMP-W02, Arial;" id="dropdown1" name="dropdown1" placeholder-text="Select Language" ng-model="cur_lang" ng-change="switching(cur_lang)">
+				            	<option ng-repeat="x in langList" value="{{x.languageAlias}}">{{x.languageName}}</option>
+				            </select>
+					</div>
+				<!-- User Icon -->
+				<li class="header__item profile" aria-haspopup="true"><b2b-flyout>
+					<div b2b-flyout-toggler>
+						<div class="icon-people-oneperson" id="header-user-icon"
+							tabindex="0" b2b-accessibility-click="13,32"
+							aria-label="notifications" aria-haspopup="true"
+							aria-expanded="{{flyoutOpened}}" role="button"></div>
+						<div id="login-snippet-text" class="login-snippet-text">{{header.isGuest
+							? 'Guest' : header.firstName}}</div>
+					</div>
+					<b2b-flyout-content horizontal-placement="center"
+						vertical-placement="below">
+					<div ng-controller="loginSnippetCtrl">
+						<div id="reg-header-snippet">
+							<div tabindex="0" class="reg-profileDetails"
+								id="reg-profiledetails-id">
+								<ul class="reg-Details-table">
+									<li>
+										<div class="reg-userName-table">
+											<div id="reg-userName-table-row">
+												<div id="reg-userName-table-cell">
+													<h3>{{firstName}} {{lastName}}&nbsp;</h3>
+													<span>&nbsp;</span>
+												</div>
+											</div>
 										</div>
-										<div class="notification-common-space"></div>
-									</div>
-									<div ng-show="notifications.length==0">
-										<div class="notification-main">
-											<div class="notification-main-ht">
-												<div align="center" class="icon-information notification-info-icon"></div>
+									</li>
+									<li><div class="reg-userEmail-label">
+											<span
+												class="reg-userEmail-label-spn reg-common-label-spn-txt">{{'Email'|T}}<span
+												class="visuallyhidden">: </span></span>
+										</div></li>
+									<li><div class="reg-userEmail-value">
+											<span class="reg-userEmail-value-spn">
+												{{loginSnippetEmail}}</span>
+										</div></li>
+									<li>&nbsp;</li>
+									<li><div class="reg-userRole-label">
+											<span class="reg-userRole-label-spn reg-common-label-spn-txt">
+												{{'User Id'|T}}<span class="visuallyhidden">:</span>
+											</span>
+										</div></li>
+									<li><div class="reg-userRole-value">
+											<span class="reg-userRole-value-spn">
+												{{loginSnippetUserid}}<span class="visuallyhidden"></span>
+											</span>
+										</div></li>
+									<li>&nbsp;</li>
+									<li><div class="reg-userLastLogin-label">
+											<span
+												class="reg-userLastLogin-label-spn reg-common-label-spn-txt">
+												{{'Last login'|T}}<span class="visuallyhidden">:</span>
+											</span>
+										</div></li>
+									<li><div class="reg-userLastLogin-value">
+											<span class="reg-userLastLogin-value-spn"> {{
+												lastLogin | date : 'medium' }}<span class="visuallyhidden"></span>
+											</span>
+										</div></li>
+									<li>&nbsp;</li>
+									<li>
+										<div class="display-userAppRoles-label">
+											<a href="javascript:void(0);"
+												ng-click="getUserApplicationRoles()"
+												class="icon-primary-accordion-plus"
+												ng-class="{true: 'icon-primary-accordion-plus', false: 'icon-primary-accordion-minus'}[ !displayUserAppRoles]"><span
+												class="business-card-app-role">{{'Applications and
+													Roles'|T}}</span></a>
+										</div> <br>
+										<div
+											class="display-userAppRoles-label display-userAppRoles-label-txt"
+											ng-show="displayUserAppRoles">
+											<div ng-repeat="ua in userapproles track by  $index">
+												<div class="reg-userApp-value">
+													<span
+														class="reg-userApp-value-spn reg-common-label-spn-txt">{{ua.App}}<span
+														class="visuallyhidden">:</span></span>
+												</div>
+												<div ng-repeat="role in ua.Roles track by  $index"
+													class="reg-userAppRoles-value">
+													<span ng-if="role.indexOf('global_')!=-1" id="required"
+														style="color: Red;" visible="false"> *</span> <span
+														class="reg-userAppRoles-value-spn">{{role}}</span>
+												</div>
+												<br>
 											</div>
-										<div>
-										<p class="notification-text">{{'No New Notifications'| T}}.</p>
-									</div>
-									
+										</div>
+									</li>
+								</ul>
+								<div ng-include class="profile-detail-extension"
+									src="'app/views/header/header-extension.tpl.html'"></div>
+								<div id="reg-logout-div" class="logout-btn-div">
+									<button href="javascript:void(0)" id="allLogout"
+										ng-click="allAppsLogout()" class="btn btn-alt btn-small">
+										{{'Log out'|T}}</button>
 								</div>
 							</div>
-							<div class="notification-main" ng-show="notifications.length>0">
-								<ul class="notifications-list">
-									<li class="item" data-id="5" ng-repeat="item in notifications">
-										<div class="icon">
-											<span class="important" ng-show="item.priority==2"/>
-											<span class="normal" ng-show="item.priority==1"/>
+						</div>
+					</div>
+					</b2b-flyout-content> </b2b-flyout></li>
+				<!-- Notification flag -->
+				<li class="header__item notification" aria-haspopup="true"
+					class="notification-li"><b2b-flyout>
+					<div b2b-flyout-toggler class="notification-div">
+						<div class="notifications-count"
+							ng-hide="notificationCount.count==0"
+							ng-bind="notificationCount.count"></div>
+						<div id="megamenu-notification-button"
+							class="icon-content-flag megamenu-notification-overrides"
+							class="b2b-flyout-icon" tabindex="0"
+							b2b-accessibility-click="13,32" aria-label="notifications"
+							aria-haspopup="true" aria-expanded="{{flyoutOpened}}"
+							role="button"></div>
+					</div>
+					<b2b-flyout-content horizontal-placement="center"
+						vertical-placement="below">
+					<div class="notification-content" ng-controller="notificationCtrl">
+						<div class="ng-scope">
+							<div id="notification" class="notificationBox ">
+								<div align="right">
+									<a id="notification-history-link"
+										ui-sref="root.notificationHistory"
+										class="notification-history-link-txt"> View All Recent
+										Notifications </a>
+								</div>
+								<div class="notification-header">
+									<div class="notification-common-position">
+										<p class="notification-heading">{{'Notifications'| T}}</p>
+									</div>
+									<div class="notification-common-space"></div>
+								</div>
+								<div ng-show="notifications.length==0">
+									<div class="notification-main">
+										<div class="notification-main-ht">
+											<div align="center"
+												class="icon-information notification-info-icon"></div>
 										</div>
+										<div>
+											<p class="notification-text">{{'No New Notifications'|
+												T}}.</p>
+										</div>
+
+									</div>
+								</div>
+								<div class="notification-main" ng-show="notifications.length>0">
+									<ul class="notifications-list">
+										<li class="item" data-id="5" ng-repeat="item in notifications">
+											<div class="icon">
+												<span class="important" ng-show="item.priority==2" /> <span
+													class="normal" ng-show="item.priority==1" />
+											</div>
 											<div class="details" ng-click="showDetailedJsonMessage(item)">
 												<span class="title" ng-bind="item.msgSource"></span> <span
 													class="title" ng-bind="item.msgHeader"></span> <span
@@ -273,28 +325,29 @@
 													ng-if="item.msgSource!=='EP'"
 													ng-bind="item.message| elipsis: 27"> </span>
 												<!-- <span class="date" ng-bind="item.time" ></span> -->
-												<mydate>{{item.time | date:'MM/dd/yyyy hh:mm:ss a Z'}}</mydate>
+												<mydate>{{item.time | date:'MM/dd/yyyy hh:mm:ss a
+												Z'}}</mydate>
 
 											</div>
-										<button type="button" ng-click="deleteNotification($index)" class="button-default button-dismiss js-dismiss">x</button>
-									</li>
-								</ul>
-							</div>
-							<div class="notification-footer">
-								<div class="notification-links">
-									<div class="notification-common-space"></div>
+											<button type="button" ng-click="deleteNotification($index)"
+												class="button-default button-dismiss js-dismiss">x</button>
+										</li>
+									</ul>
+								</div>
+								<div class="notification-footer">
+									<div class="notification-links">
+										<div class="notification-common-space"></div>
+									</div>
 								</div>
 							</div>
-						</div>					
-		            </b2b-flyout-content>
-		        </b2b-flyout>
-            </li>
-
-            <li class="header__item recommendation" aria-haspopup="true"
-							class="recommendation-li">
-            <div ng-include class="recommendation-detail-extension" src="'app/views/headerRecommendation/headerRecommendations.tpl.html'"></div> 
-            </li>            
-            </div>
-        </ul>
+						</div>
+					</div>
+					</b2b-flyout-content> </b2b-flyout></li>
+					<li class="header__item recommendation" aria-haspopup="true"
+						class="recommendation-li">
+						<div ng-include class="recommendation-detail-extension"
+							src="'app/views/headerRecommendation/headerRecommendations.tpl.html'"></div>
+					</li>
+		</ul>
 	</header>
 </div>
diff --git a/ecomp-portal-FE-common/client/app/views/role/popup_createedit_role.html b/ecomp-portal-FE-common/client/app/views/role/popup_createedit_role.html
index 5d4fc4d4..0429967f 100644
--- a/ecomp-portal-FE-common/client/app/views/role/popup_createedit_role.html
+++ b/ecomp-portal-FE-common/client/app/views/role/popup_createedit_role.html
@@ -130,7 +130,7 @@
 	 
 	 <div class="b2b-modal-footer">
 	 	<div class="cta-button-group in">	
-	 		<button id="button-app-save" class="btn btn-alt btn-small" size="small" ng-click="saveRole(role, editRoleFunction);" href="javascript:void(0)">Save</button>
+	 		<button id="button-app-save" class="btn btn-alt btn-small" size="small" ng-disabled="!(role.name)" ng-click="saveRole(role, editRoleFunction);" href="javascript:void(0)">Save</button>
 						
 			<button id="button-app-cancel" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')" role="button" tabindex="0" href="javascript:void(0)">Cancel</button>
 		</div>
diff --git a/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js b/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js
index b4813114..8765149e 100644
--- a/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js
+++ b/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js
@@ -152,11 +152,9 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS
             	   $scope.centralizedApps = res;
             	   for(var i = 0; i<res.length; i++){
             		      if(res[i].appId == 1){
-            		    	  $scope.getRolesForSelectedCentralizedApp(res[i].appId);
             		    	  $scope.apps.selectedCentralizedApp = res[i].appId;
             		    	  return;
             		      }  
-            		      $scope.getRolesForSelectedCentralizedApp(res[0].appId);
             		      $scope.apps.selectedCentralizedApp = res[0].appId;
             	   }
                 }
diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js
index 3df58daa..8c04fa57 100644
--- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js
+++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js
@@ -46,8 +46,8 @@
             var isSystemUser = false;
 
             $scope.ngRepeatDemo = [
-		        {id: 'userButton', value: 'true', labelvalue: 'user'},
-		        {id: 'systemUserButton', value: 'false', labelvalue: 'system'}
+		        {id: 'userButton', value: 'true', labelvalue: 'User'},
+		        {id: 'systemUserButton', value: 'false', labelvalue: 'System'}
 		    ]
             
             $scope.selectedvalueradioButtonGroup = {
diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html
index dc93006e..eab95f46 100644
--- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html
+++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html
@@ -77,7 +77,7 @@
 						</div>
 					</fieldset>
 		  <div class="systemUser" ng-show="selectedvalueradioButtonGroup.type =='false'" style="color: #5a5a5a;
-        font-family: Omnes-ECOMP-W02, Arial;font-size: 14px;margin-bottom: 8px; padding-left: 30px;">Enter system UserId</div>
+        font-family: Omnes-ECOMP-W02, Arial;font-size: 14px;margin-bottom: 8px; padding-left: 30px;">Enter system userId</div>
           <div ng-show="selectedvalueradioButtonGroup.type =='false'">
 				<input id="action-property-input"
 					class="adminForm-name-property-input" placeholder="xxxxxx@org.com"
@@ -158,4 +158,4 @@
 $(document).ready(function(){
     $(".ngdialog-close").attr('id','dialog-close');
 });
-</script>
+</script>
\ No newline at end of file
diff --git a/ecomp-portal-FE-common/client/app/views/users/users.tpl.html b/ecomp-portal-FE-common/client/app/views/users/users.tpl.html
index 40175810..538899d8 100644
--- a/ecomp-portal-FE-common/client/app/views/users/users.tpl.html
+++ b/ecomp-portal-FE-common/client/app/views/users/users.tpl.html
@@ -52,7 +52,7 @@
 						<div>
 							<input id="input-table-search" placeholder="Search" class="table-search-field" type="text" data-ng-model="users.searchString">
 						</div>
-						<button class="btn btn-alt btn-small" id="users-button-add"  ng-click="users.openAddNewUserModal()"><i class="icon-people-userbookmark" aria-hidden="true"></i>&nbsp;Add User</button> 
+						<button class="btn btn-alt btn-small" id="users-button-add"  ng-click="users.openAddNewUserModal()"><i class="icon-people-userbookmark" aria-hidden="true"></i>&nbsp;Add</button> 
 	                   	<button class="btn btn-alt btn-small" id="users-bulk-upload-button-add"  ng-click="users.openBulkUserUploadModal()"><i class="icon-arrows-upload" aria-hidden="true"></i>&nbsp;Bulk Upload</button>
 					</div>
                 </div>
@@ -113,4 +113,4 @@
         </div>
     </div>
 
-</div>
+</div>
\ No newline at end of file