From ef7aaebff30559d8f81ceb0e95d66a7726f529b2 Mon Sep 17 00:00:00 2001
From: "Sarkar, Anand (as0481)" <as0481@att.com>
Date: Tue, 11 Jun 2019 13:53:46 -0400
Subject: [PATCH] Left menu overlap main content fix

Change RAN Connection setup dialog text

Signed-off-by: Sarkar, Anand (as0481) <as0481@att.com>
Issue-Id: RICPLT-1338
Change-Id: I36a6f068d604aff9515fb4c300ad6d1633852dee
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
---
 docs/release-notes.rst                             |  1 +
 webapp-frontend/src/app/app.component.css          | 24 ++++++++---
 webapp-frontend/src/app/app.component.html         | 48 ++++++++++++++++------
 webapp-frontend/src/app/app.component.ts           |  3 +-
 .../ran-connection-dialog.component.html           |  2 +-
 5 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index d3533e74..033bdf79 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -31,6 +31,7 @@ Version 1.0.4, 13 June 2019
 * Update E2 manager client to spec version 20190611
 * Adjust CSS and HTML for main container positioning
 * Revise config property keys to use URL (not basepath)
+* Left menu overlap main content fix
 
 Version 1.0.3, 28 May 2019
 --------------------------
diff --git a/webapp-frontend/src/app/app.component.css b/webapp-frontend/src/app/app.component.css
index b8d1778a..7e78c4d3 100644
--- a/webapp-frontend/src/app/app.component.css
+++ b/webapp-frontend/src/app/app.component.css
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file 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.
@@ -34,11 +34,11 @@
 mat-sidenav-container, mat-sidenav-content, mat-sidenav {
     height: 100%;
 }
- 
+
 mat-sidenav {
     width: 250px;
 }
- 
+
 main {
     padding: 10px;
 }
@@ -119,6 +119,18 @@ main {
   box-shadow: 0 0.5rem 2rem rgba(0, 0, 255, 0.2);
 }
 
+mat-drawer {
+  width: 340px;
+}
+
+mat-drawer-content {
+  overflow: overlay;
+}
+
+.menumargin-top {
+    margin-top: 10px;
+}
+
 .greeting__text {
   grid-area: greeting;
   font-size: 1.25rem;
@@ -172,7 +184,7 @@ main {
 }
 
 .home_bg_image{
-    height:40em; 
+    height:40em;
     background-size:cover;
     width:auto;
     background-image:url('../assets/intelligence.png');
@@ -277,7 +289,7 @@ main {
   cursor: pointer;
 }
 
-.logo__icon {  
+.logo__icon {
   height: 2rem;
   margin-left: 1rem;
 }
diff --git a/webapp-frontend/src/app/app.component.html b/webapp-frontend/src/app/app.component.html
index 1a6a6407..fa5ddb3d 100644
--- a/webapp-frontend/src/app/app.component.html
+++ b/webapp-frontend/src/app/app.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file 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.
@@ -18,11 +18,34 @@
   ========================LICENSE_END===================================
   -->
 <!-- Slide Menu-->
-<aside class="side-menu__container" [ngClass]="{'side-menu__container-active': showMenu}" (click)="toggleMenu()">
-    <nav class="slide-menu" [ngClass]="{'slide-menu-active': showMenu}" (click)="$event.stopImmediatePropagation();">
-    <section class="menu-header">
-      
-      <span class="greeting__text">RIC Dashboard</span>
+<mat-drawer-container autosize>
+  <mat-drawer #drawer mode="push">
+  <section class="menu-header">
+
+    <div class="left__section3Col" *ngIf="drawer.opened"  [ngClass]="{'menumargin-top': drawer.opened}">
+      <svg (click)="drawer.toggle()" class="hamburger__icon" id="Menu_Burger_Icon" data-name="Menu Burger Icon"
+           viewBox="31.5 30 49.9 32">
+        <rect id="Rectangle_9" width="49.9" height="4" [ngClass]="{'hamburger__icon__fill-dark': darkModeActive}"
+              class="hamburger__icon__fill" data-name="Rectangle 9" rx="2"
+              transform="translate(31.5 58)"/>
+        <rect id="Rectangle_10" width="49.9" height="4" [ngClass]="{'hamburger__icon__fill-dark': darkModeActive}"
+              class="hamburger__icon__fill" data-name="Rectangle 10" rx="2"
+              transform="translate(31.5 44)"/>
+        <rect id="Rectangle_11" width="49.9" height="4" [ngClass]="{'hamburger__icon__fill-dark': darkModeActive}"
+              class="hamburger__icon__fill" data-name="Rectangle 11" rx="2"
+              transform="translate(31.5 30)"/>
+      </svg>
+      <img src="../../assets/oran-logo.png" width="180%" height="100%" style="position: relative; z-index: 50"/>
+      <svg class="logo__icon" viewBox="150.3 22.2 313.7 42.8">
+        <text [ngClass]="{'logo__text-dark': darkModeActive}" class="logo__text" fill="#432c85"
+              font-size="30" font-weight="600"
+              letter-spacing=".1em" transform="translate(149 56)">
+          <tspan x="0" y="0">RIC Dashboard</tspan>
+        </text>
+      </svg>
+
+    </div>
+
       <div class="profile-image__container">
         <img src="assets/profile_default.png" alt="profile-image"
              class="profile__image">
@@ -38,16 +61,15 @@
     <section class="menu-footer">
 
     </section>
-  </nav>
-
-</aside>
+</mat-drawer>
 
+<mat-drawer-content>
 <div class="root__container">
 
   <header [ngClass]="{'main__header-dark': darkModeActive}" class="main__header">
 
-    <div class="left__section3Col">
-      <svg (click)="toggleMenu()" class="hamburger__icon" id="Menu_Burger_Icon" data-name="Menu Burger Icon"
+    <div class="left__section3Col" *ngIf="!drawer.opened">
+      <svg (click)="drawer.toggle()" class="hamburger__icon" id="Menu_Burger_Icon" data-name="Menu Burger Icon"
            viewBox="31.5 30 49.9 32">
         <rect id="Rectangle_9" width="49.9" height="4" [ngClass]="{'hamburger__icon__fill-dark': darkModeActive}"
               class="hamburger__icon__fill" data-name="Rectangle 9" rx="2"
@@ -99,3 +121,5 @@
   </footer>
 
 </div>
+</mat-drawer-content>
+</mat-drawer-container>
\ No newline at end of file
diff --git a/webapp-frontend/src/app/app.component.ts b/webapp-frontend/src/app/app.component.ts
index 15c8832c..a071606e 100644
--- a/webapp-frontend/src/app/app.component.ts
+++ b/webapp-frontend/src/app/app.component.ts
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import {Component, OnInit} from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import {UiService} from './services/ui/ui.service';
 
 @Component({
@@ -30,7 +30,6 @@ export class AppComponent implements OnInit {
   darkModeActive: boolean;
 
   constructor(public ui: UiService) {
-
   }
 
   ngOnInit() {
diff --git a/webapp-frontend/src/app/ran-connection/ran-connection-dialog.component.html b/webapp-frontend/src/app/ran-connection/ran-connection-dialog.component.html
index a8e17ce2..500e763e 100644
--- a/webapp-frontend/src/app/ran-connection/ran-connection-dialog.component.html
+++ b/webapp-frontend/src/app/ran-connection/ran-connection-dialog.component.html
@@ -25,7 +25,7 @@
 <form [formGroup]="ranDialogForm" novalidate autocomplete="off" (ngSubmit)="setupConnection(ranDialogForm.value)">
   <div mat-dialog-content>
     <div name="rantype">
-      <label id="request-type-radio-group-label">Select the RAN type:</label>
+      <label id="request-type-radio-group-label">RAN type:</label>
       <mat-radio-group aria-label="RAN type" formControlName="ranType">
         <mat-radio-button value="endc">EN-DC</mat-radio-button>
         <mat-radio-button value="x2">X2</mat-radio-button>
-- 
2.16.6