summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-app-overlay
diff options
context:
space:
mode:
authorSunder Tattavarada <statta@research.att.com>2020-06-26 14:23:02 +0000
committerGerrit Code Review <gerrit@onap.org>2020-06-26 14:23:02 +0000
commitbc1952f16bd12d8e5315ef6e3bdb39df2b09f44d (patch)
tree409b249d8bec25a7accea84ec42f4a773fff8b34 /ecomp-sdk/epsdk-app-overlay
parentccb2b1b2fbaf58a5545f32c86d30778c17c03f6f (diff)
parentac3e6521354606657fb83b409f330bd658d17910 (diff)
Merge "Portal SDK UI Issues -Tab icon -Grid elements size correction -Drag & Delete icons misalignment -Left menu collapse functionality (CSS/ Arrows) -App name in header"
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay')
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.html6
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts2
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html12
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.ts2
4 files changed, 14 insertions, 8 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.html
index 59ab1c4e..77ced1b1 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.html
@@ -7,7 +7,7 @@
<ul class="navbar-nav ml-auto">
<li class="nav-item dropdown" ngbDropdown>
<a href="javascript:void(0)" class="nav-link" ngbDropdownToggle>
- <i class="fa fa-user"></i> {{userFirstName}} <b class="caret"></b>
+ <i class="icon ion-md-person"></i> {{userFirstName}} <b class="caret"></b>
</a>
<div class="dropdown-menu-right" ngbDropdownMenu>
@@ -16,10 +16,10 @@
<br/>
<div ><span class="reg-userEmail-value-spn">
- <div>Email:</div>{{userEmail}}</span></div>
+ <div style="font-weight: bold;">Email:</div>{{userEmail}}</span></div>
<br/>
<div ><span class="reg-userEmail-value-spn">
- <div>userId:</div>{{userId}}</span></div>
+ <div style="font-weight: bold;">User Id:</div>{{userId}}</span></div>
<br/>
<div id="reg-logout-div" style="padding-top: 8px">
<a href="{{logOutURL}}" id="allLogout" class="btn btn-primary">
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts
index 994c53a5..8cfcdbe4 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts
@@ -86,7 +86,7 @@ export class HeaderComponent implements OnInit {
}
this.pushRightClass = 'push-right';
- this.appName= 'ONAP Portal' ;
+ this.appName= 'Portal SDK' ;
let result = this.headerService.getTopMenuItems();
result.subscribe(res => {
this.response = res;
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html
index e640f84f..5f8a2ec5 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html
@@ -1,7 +1,11 @@
-<div class="sidebar" [ngClass]="{'siderbar-height': showHeader, 'siderbar-height-noHeader': !showHeader}" >
+<div class="sidebar" [ngClass]="{'siderbar-height': showHeader, 'siderbar-height-noHeader': !showHeader, collapsed:collapsed}" >
<nav [ngClass]="{sidebarPushRight: isActive, collapsed: collapsed}">
<div class="toggle-button" [ngClass]="{collapsed: collapsed}" (click)="toggleCollapsed()">
- <i class="fa fa-angle-double-{{collapsed?'right':'left'}}"></i>&nbsp;
+ <!--<i class="fa fa-angle-double-{{collapsed?'right':'left'}}"></i>&nbsp;-->
+ <i class="icon ion-md-arrow-{{collapsed?'dropright':'dropleft'}}" style="float:right"></i>
+ <i class="icon ion-md-arrow-{{collapsed?'dropright':'dropleft'}}" style="float:right"></i>&nbsp;
+
+
</div>
<div class="list-group" *ngFor="let menu of menuData ; index as item">
@@ -23,7 +27,7 @@
<a href="javascript:void(0)" class="list-group-item"
(click)="addExpandClass(menu.name)">
<i class="{{menu.imageSrc}}"></i>&nbsp;
- <i style="float: right;" class="icon ion-ios-add-circle-outline"></i>&nbsp;
+ <i *ngIf = "!collapsed" style="float: right;" class="icon ion-ios-add-circle-outline"></i>&nbsp;
<span>{{menu.name}}</span>
</a>
<li class="nested" [class.expand]="showMenu === menu.name">
@@ -45,4 +49,4 @@
</div>
</div>
</nav>
-</div> \ No newline at end of file
+</div> \ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.ts
index 6487d745..fbe38c9d 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.ts
@@ -144,6 +144,8 @@ export class SidebarComponent implements OnInit {
} else {
this.showMenu = element;
}
+ this.collapsed=false;
+ this.collapsedEvent.emit(false);
}
toggleCollapsed() {