summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeshu-Kumar-M <seshu.kumar.m@huawei.com>2016-11-03 16:04:44 +0800
committerSeshu-Kumar-M <seshu.kumar.m@huawei.com>2016-11-03 16:04:44 +0800
commit8c9f23269c843b2d2047625944019dff6445cfdb (patch)
tree40809a556e5e2467acb48034e1a5fa7c107f4f09
parent7d4c7b5b2da2b006ff21a97f17be3fa31fe8048f (diff)
GSO-100
Change-Id: I5c985573b838174d0da6e784373dffd6515d4921 Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
-rw-r--r--openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/InputData.html21
-rw-r--r--openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html9
2 files changed, 18 insertions, 12 deletions
diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/InputData.html b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/InputData.html
index 5d75323f..1aae9d23 100644
--- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/InputData.html
+++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/InputData.html
@@ -25,17 +25,20 @@
<link href="css/bootstrap.min.css" rel="stylesheet"/>
<link href="css/VMMain.css" rel="stylesheet"/>
<link href="css/bootstrap-table.min.css" rel="stylesheet"/>
+
<script type="text/javascript" src="js/jquery-1.11.2.min.js"></script>
- <script type="text/javascript" src="../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
+ <script type="text/javascript" src="../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
<script type="text/javascript" src="js/bootstrap.min.js"></script>
<script type="text/javascript" src="js/rest.js"></script>
- <script type="text/javascript" src="js/gsolcm.js"></script>
+ <script type="text/javascript" src="js/gsolcm.js"></script>
<script type="text/javascript" src="js/bootstrap-table.min.js"></script>
<script>
$(document).ready(function () {
- new lcmHandler();
+ new lcmHandler();
$('[data-toggle="tooltip"]').tooltip();
+
var params = new URLSearchParams(window.location.search.slice(1));
+
var jsonData = JSON.parse((params.get("json")));
if (jsonData != null) {
$("body").empty();
@@ -57,12 +60,12 @@
if(sdnControllerObj != undefined){
paramValue = sdnControllerObj.name;
}
- }
+ }
else{
- var nameObj = {name:key,showName:key};
- name = showName(nameObj);
- }
- $("body").append('<div class="mT15 form-group row" style="margin-top:35px;margin-left:25%"><div class="col-sm-6" align="right"><label class="control-label"><span style="font-size:16px;">'+ name + ':</span></label></div><div class="col-sm-6"><input type="text" name="" maxlength="256" style="margin-left:10px;width:250px;" data-toggle="tooltip" data-placement="top" title="'+ paramValue + '" value="'+ paramValue + '" readonly disabled/></div></div>');
+ var nameObj = {name:key,showName:key};
+ name = showName(nameObj);
+ }
+ $("body").append('<div class="mT15 form-group row" style="margin-top:35px;margin-left:15%"><div class="col-sm-5" align="left"><label class="control-label"><span style="font-size:16px;">'+ name + '</span></label></div><div class="col-sm-1" align="left"><span style="font-size:16px;">:</span></div><div class="col-sm-6"><input type="text" name="" maxlength="256" style="margin-left:10px;width:250px;padding-left: 5px" data-toggle="tooltip" data-placement="top" title="'+ paramValue + '" value="'+ paramValue + '" readonly disabled/></div></div>');
}
}
@@ -71,7 +74,7 @@
<style>
html, body {
- width: 800px;
+ width: 99%;/*800px;*/
}
</style>
</head>
diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html
index fad78378..89a521aa 100644
--- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html
+++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html
@@ -360,7 +360,8 @@
<div class="detail" style="margin:10px;border-radius:5px;">
<div class="detail-top" style="margin-top:10px;border-radius:5px;">
- <h3>Detailed Info</h3>
+ <span><h2 style="margin-left: 1%">Detailed Info</h2></span>
+
@@ -430,8 +431,10 @@
<div id="tabContainer" class="detail" style="border-radius:5px;display: none">
<div class="detail-top" style="margin-top:2px;border-radius:5px;">
- <h3>Detailed Info</h3>
- <div id="inpCont" style="display:none;">
+
+ <span><h2 style="margin-left: 1%">Detailed Info</h2></span>
+
+ <div id="inpCont" style="display:none;">
<object id="inputcontent" src="InputData.html" width="100%" height="300" type="text/html">
</object>
</div>