X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Frd.component.html;h=61e0b458d9555be95c0de6acc2d647ff7eeda203;hb=refs%2Fchanges%2F72%2F2272%2F8;hp=9aa2a04ffaec24ef570d434f65e28357ad35aa13;hpb=1379dce23d47c42d169ed13a337bbee827714830;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/rd.component.html b/webapp-frontend/src/app/rd.component.html
index 9aa2a04f..61e0b458 100644
--- a/webapp-frontend/src/app/rd.component.html
+++ b/webapp-frontend/src/app/rd.component.html
@@ -2,7 +2,7 @@
   ========================LICENSE_START=================================
   O-RAN-SC
   %%
-  Copyright (C) 2019 AT&T Intellectual Property and Nokia
+  Copyright (C) 2019 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.
@@ -18,33 +18,32 @@
   ========================LICENSE_END===================================
   -->
 <!-- Slide Menu-->
-<mat-drawer-container autosize>
-  <mat-drawer #drawer mode="push">
-  <section class="menu-header">
+<mat-drawer-container autosize [hasBackdrop]=true>
+  <mat-drawer #drawer mode="push" [ngClass]="{'side-menu__dark': darkModeActive}">
+    <section class="menu-header" [ngClass]="{'menu-header__dark': darkModeActive}">
+      <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 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>
 
       <div class="profile-image__container">
         <img src="assets/profile_default.png" alt="profile-image"
@@ -56,71 +55,78 @@
       </div>
     </section>
     <section #sidenav class="menu-body">
-       <rd-sidenav-list></rd-sidenav-list>
+      <rd-sidenav-list (sidenavClose)="drawer.toggle()"></rd-sidenav-list>
     </section>
     <section class="menu-footer">
-
+      <mat-nav-list [ngClass]="{'dark': darkModeActive}">
+        <a mat-list-item (click)="openInstanceSelectorDialog(); drawer.toggle()">
+          <mat-icon>link</mat-icon> <span class="nav-caption">{{selectedInstanceName}}</span>
+        </a>
+      </mat-nav-list>
     </section>
-</mat-drawer>
-
-<mat-drawer-content>
-<div class="root__container">
-
-  <header [ngClass]="{'main__header-dark': darkModeActive}" class="main__header">
-
-    <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"
-              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>
-
-    <h3 class="date__text"></h3>
-
-    <div class="mode-toggle__container">
-      <span class="mode-toggle__text">Light</span>
-      <label class="toggle-button__container">
-        <input (click)="modeToggleSwitch()" type="checkbox" class="mode-toggle__input"/>
-        <span [ngClass]="{'mode-toggle__bg-checked': darkModeActive}" class="mode-toggle__bg"></span>
-        <span [ngClass]="{'mode-toggle__circle-checked': darkModeActive}" class="mode-toggle__circle"></span>
-      </label>
-      <span class="mode-toggle__text">Dark</span>
-    </div>
+  </mat-drawer>
+
+  <mat-drawer-content>
+    <div class="root__container">
+
+      <header [ngClass]="{'main__header-dark': darkModeActive}" class="main__header">
+
+        <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"
+                  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>    </div>
+
+        <div class="mode-toggle__container">
+          <span class="mode-toggle__text">Light</span>
+          <label class="toggle-button__container">
+            <input (click)="modeToggleSwitch()" type="checkbox" class="mode-toggle__input" />
+            <span [ngClass]="{'mode-toggle__bg-checked': darkModeActive}" class="mode-toggle__bg"></span>
+            <span [ngClass]="{'mode-toggle__circle-checked': darkModeActive}" class="mode-toggle__circle"></span>
+          </label>
+          <span class="mode-toggle__text">Dark</span>
+        </div>
+
+      </header>
+
+      <!-- Main Content -->
+      <main class="main__container" [ngClass]="{'main-container__bg-dark': darkModeActive}">
+        <div class=main__container__body [ngClass]="{'dark-theme': darkModeActive}">
+          <div class="main-container__bg"></div>
+          <router-outlet></router-outlet>
+        </div>
+      </main>
+
+      <!-- Footer -->
+      <footer class="main__footer" [ngClass]="{'main-footer__bg-dark': darkModeActive}">
+        <div class="main-footer-licence">
+          <rd-footer></rd-footer>
+        </div>
+        <button mat-flat-button  color="primary" class="main-footer-instance" (click)="openInstanceSelectorDialog()" >
+          <span> {{selectedInstanceName}} </span>
+        </button>
+      </footer>
 
-  </header>
-
-  <!-- Main Content -->
-  <main class="main__container">
-    <div class = main__container__body>
-      <div class="main-container__bg" [ngClass]="{'main-container__bg-dark': darkModeActive}"></div>
-      <router-outlet></router-outlet>
-    </div>
-  </main>
-
-  <!-- Footer -->
-  <footer class="main__footer">
-    <div class="main-footer__bg" [ngClass]="{'main-footer__bg-dark': darkModeActive}">
-      <rd-footer></rd-footer>
     </div>
-  </footer>
-
-</div>
-</mat-drawer-content>
+  </mat-drawer-content>
 </mat-drawer-container>