diff options
| author |   Seshu-Kumar-M <seshu.kumar.m@huawei.com> | 2016-11-03 15:40:47 +0800 |
|---|---|---|
| committer | Seshu-Kumar-M <seshu.kumar.m@huawei.com> | 2016-11-03 15:40:47 +0800 |
| commit | 9730bb60742e17d4880716922541ddb2a589d638 (patch) | |
| tree | 948887ebd3a34dc989041c66afbf10674cbdb3ad | |
| parent | fa92c703fe15864a83aa01652a184c1bc8529d8b (diff) | |
GSO-100
Change-Id: Ie6ef49e61cbf2c59b4d4590c38c546a544bac443
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
| -rw-r--r-- | openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/accorTables.html | 8 | ||||
| -rw-r--r-- | openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html | 25 |
2 files changed, 21 insertions, 12 deletions
diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/accorTables.html b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/accorTables.html index 09c27904..5de335d7 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/accorTables.html +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/accorTables.html @@ -40,7 +40,7 @@ var jsonData = [];
var object = {};
- debugger;
+
if("SSAR" === serviceType)
{
object.nodeType = "sdn"
@@ -57,9 +57,9 @@ - //TODO check for the
+ //TODO check for the type and update the tab
console.log("jsonData length: " + jsonData.length);
- for (i = 0; i < jsonData.length; i++) {
+ /* for (i = 0; i < jsonData.length; i++) {
// console.log("jsonData Name: " + jsonData[i].nodeType);
if (jsonData[i].nodeType.indexOf('sdn') != -1) {
//$("#sdnoLink").text(jsonData[i].name.toUpperCase());
@@ -77,7 +77,7 @@ else {
}
- }
+ } */
$("#overlayContObj").attr('data', 'overlayvpn.html?serviceId='+serviceId);
$("#underlayContObj").attr('data', 'underlayvpn.html?serviceId='+serviceId);
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 2a352cd0..fad78378 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html @@ -41,7 +41,7 @@ new lcmHandler();
$('.modal-dialog').draggable();
- $("#detailCont").show();
+ // $("#detailCont").show();
var jsondata = loadGetServiceData();
$.each(jsondata,function(k,v){
@@ -60,10 +60,10 @@ $(this).addClass('current').siblings().removeClass('current');
});
$("#topoCont").hide();
- $("#inpCont").hide();
+ $("#inpCont").show();
$("#topoContMod").hide();
- $("#detailContMod").show();
- $("#inpContMod").hide();
+ $("#detailContMod").hide();
+ $("#inpContMod").show();
$('#sai').bootstrapTable({}) .on('click-row.bs.table', function (e, row, $element) {
var newURL = "accorTables.html?serviceId="+row.serviceId + "&serviceType="+row.serviceType;
@@ -360,7 +360,11 @@ <div class="detail" style="margin:10px;border-radius:5px;">
<div class="detail-top" style="margin-top:10px;border-radius:5px;">
- <ul class="nav nav-tabs nav-justified vmapp-margin">
+ <h3>Detailed Info</h3>
+
+
+
+ <!-- <ul class="nav nav-tabs nav-justified vmapp-margin">
<li class="active basic">
<a href="#" onClick="showDetContMod();" id="" data-toggle="tab">
<span>Detail Info</span>
@@ -376,7 +380,7 @@ <span>Input Data</span>
</a>
</li>
- </ul>
+ </ul> -->
<div id="detailContMod">
<object id="detailContDlg" data="accorTables.html" width="100%" height="300" type="text/html">
@@ -426,7 +430,12 @@ <div id="tabContainer" class="detail" style="border-radius:5px;display: none">
<div class="detail-top" style="margin-top:2px;border-radius:5px;">
- <ul class="nav nav-tabs nav-justified vmapp-margin">
+ <h3>Detailed Info</h3>
+ <div id="inpCont" style="display:none;">
+ <object id="inputcontent" src="InputData.html" width="100%" height="300" type="text/html">
+ </object>
+ </div>
+ <!-- <ul class="nav nav-tabs nav-justified vmapp-margin">
<li class="active basic">
<a href="#" onClick="showDetCont();" id="detHov" data-toggle="tab">
@@ -446,7 +455,7 @@ </a>
</li>
- </ul>
+ </ul> -->
</div>
<div style="border-radius:5px;">
|