aboutsummaryrefslogtreecommitdiffstats
path: root/login
diff options
context:
space:
mode:
authorseshukm <seshu.kumar.m@huawei.com>2017-03-28 19:11:57 +0530
committerseshukm <seshu.kumar.m@huawei.com>2017-03-28 19:11:57 +0530
commit27dbd49326f49dbf94c48835be3b671c35521901 (patch)
tree256358348e7f1a2948276ac082b99c5b88ac5592 /login
parent9744cec780babefc9993d7a2069745a893c7fdf8 (diff)
Integration of the pages to the main UI
IssueId: CLIENT-189 Change-Id: I2376a7356c37b7316cd0ec0c56bf28e3e7d4b977 Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
Diffstat (limited to 'login')
-rw-r--r--login/src/main/webapp/login/html/menu.html12
-rw-r--r--login/src/main/webapp/login/js/app.js3
2 files changed, 9 insertions, 6 deletions
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
})