From: seshukm <seshu.kumar.m@huawei.com>
Date: Tue, 28 Mar 2017 13:41:57 +0000 (+0530)
Subject: Integration of the pages to the main UI
X-Git-Tag: release/mercury~69
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=27dbd49326f49dbf94c48835be3b671c35521901;p=vnfsdk%2Frefrepo.git

Integration of the pages to the main UI

IssueId: CLIENT-189

Change-Id: I2376a7356c37b7316cd0ec0c56bf28e3e7d4b977
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
---

diff --git a/login/src/main/webapp/login/html/menu.html b/login/src/main/webapp/login/html/menu.html
index 58fbcc9b..2cdfd6f0 100644
--- a/login/src/main/webapp/login/html/menu.html
+++ b/login/src/main/webapp/login/html/menu.html
@@ -94,8 +94,8 @@
         </div>
     </div>
 
-    <div id="page-main-wrapper">
-        <div id="page-header">
+    <div id="page-main-wrapper" style="height:100%;">
+        <div id="page-header" >
             <div id="page-header-wrapper" class="clearfix">
                 <div class="top-icon-bar dropdown">
                     <a href="javascript:;" title="" class="user-ico clearfix" data-toggle="dropdown">
@@ -121,8 +121,10 @@
                 </div>
             </div>
         </div>
-        <div id="rightContainer" class="col-sm-8 col-md-9 col-lg-9">
-            <ui-view></ui-view>
-        </div>
+
+       <div id="rightContainer" class="col-sm-8 col-md-9 col-lg-9" style="height:100%; width:100%">
+			  <ui-view></ui-view>
+          
+        </div> 
     </div>
 </div>
\ No newline at end of file
diff --git a/login/src/main/webapp/login/js/app.js b/login/src/main/webapp/login/js/app.js
index 6357335d..cf647974 100644
--- a/login/src/main/webapp/login/js/app.js
+++ b/login/src/main/webapp/login/js/app.js
@@ -39,7 +39,8 @@ var app = angular.module("POCApp", ["ui.router", "ngTable"])
             })
             .state("menu.resourceManagement", {
                 url: "/resourceManagement",
-                templateUrl : "/openoui/resmgr/index.html",
+               // templateUrl : "/openoui/resmgr/index.html",
+		template : "<iframe src='../../openoui/resmgr/index.html' height=100% width=100%> </iframe>",
                 controller : "resourceManagementCtrl",
                 authenticate: true
             })