From 889f461a65931ec52aee9d0a24f8ccf93c94cdfd Mon Sep 17 00:00:00 2001
From: HePeng <he.peng6@zte.com.cn>
Date: Wed, 20 Nov 2019 09:20:39 +0800
Subject: Upversion to Bootstrap4.3.1 & Upgrade Tomcat version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、Add bootstrap 4.3.1 Directory
2、In order to adapt to bootstrap changes, modify the HTML files
3、Modoify Pom.xml, change Tomcat version

Issue-ID: AAI-2653
Change-Id: Ibf9d18f341514092140cb9b1208ae66e2d3d525f
Signed-off-by: HePeng <he.peng6@zte.com.cn>
---
 portal/src/main/webapp/extsys/ems/emsView.html     | 86 ++++++++++++++++------
 portal/src/main/webapp/extsys/nfvo/nfvoView.html   | 24 +++++-
 .../main/webapp/extsys/sdncontroller/sdncView.html | 28 ++++++-
 portal/src/main/webapp/extsys/vim/vimView.html     | 40 ++++++++--
 portal/src/main/webapp/extsys/vnfm/vnfmView.html   | 27 ++++++-
 5 files changed, 166 insertions(+), 39 deletions(-)

(limited to 'portal/src/main/webapp/extsys')

diff --git a/portal/src/main/webapp/extsys/ems/emsView.html b/portal/src/main/webapp/extsys/ems/emsView.html
index 02f8b25..9044c2e 100644
--- a/portal/src/main/webapp/extsys/ems/emsView.html
+++ b/portal/src/main/webapp/extsys/ems/emsView.html
@@ -21,7 +21,7 @@
     <meta charset="UTF-8">
     <title></title>
     <link href="../../thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
-    <link href="../../thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
+    <link href="../../thirdparty/bootstrap4.3.1/css/bootstrap.min.css" rel="stylesheet"/>
     <link href="../../thirdparty/uniform/css/uniform.default.min.css" rel="stylesheet"/>
     <link href="../../thirdparty/css/ngict-component.css" rel="stylesheet"/>
     <link href="css/animate.min.css" rel="stylesheet"/>
@@ -32,7 +32,7 @@
 <div ms-controller="emsController" class="container-fluid ms-controller">
     <div id="addEmsDlg" class="modal fade" tabindex="-1" role="dialog"
          aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
-        <div class="modal-dialog">
+         <div class="modal-dialog">
             <div class="modal-content Changepasswd">
                 <div class="content">
                     <div class="modal-header">
@@ -74,6 +74,7 @@
                         <div class="step-content">
                             <form class="form-horizontal" id="form_commonInfo" role="form">
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Name</span>
                                         <span class="required" aria-required="true">*</span>
@@ -82,8 +83,10 @@
                                         <input type="text" ms-duplex="currentElement.name" name="name" class="form-control"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Vendor</span>
                                     </label>
@@ -91,8 +94,10 @@
                                         <input type="text" ms-duplex="currentElement.vendor" name="vendor" class="form-control"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Version</span>
                                     </label>
@@ -100,10 +105,12 @@
                                         <input type="text" ms-duplex="currentElement.version" name="version" class="form-control"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                             </form>
-                            <form class="form-horizontal" id="form_resourceAddr" role="form"> 
+                            <form class="form-horizontal" id="form_resourceAddr" role="form">
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Ftp Type</span>
                                         <span class="required" aria-required="true">*</span>
@@ -115,8 +122,10 @@
                                         </select>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>IP</span>
                                         <span class="required" aria-required="true">*</span>
@@ -125,8 +134,10 @@
                                         <input type="text" ms-duplex="currentElement.resourceAddr.ip" name="ip" class="form-control"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Port</span>
                                         <span class="required" aria-required="true">*</span>
@@ -135,8 +146,10 @@
                                         <input type="text" ms-duplex="currentElement.resourceAddr.port" name="port" class="form-control"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>User</span>
                                         <span class="required" aria-required="true">*</span>
@@ -145,40 +158,48 @@
                                         <input type="text" ms-duplex="currentElement.resourceAddr.user" name="user" class="form-control" ms-attr-placeholder="urlTip"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Password</span>
                                     </label>
                                     <div class="col-sm-7">
-                                    <input type="password" class="form-control" rows="3" ms-duplex="currentElement.resourceAddr.password"  name="password"/>
+                                        <input type="password" class="form-control" rows="3" ms-duplex="currentElement.resourceAddr.password"  name="password"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Remote Path</span>
                                     </label>
                                     <div class="col-sm-7">
-                                    <input class="form-control" rows="3" ms-duplex="currentElement.resourceAddr.remotepath" name="remotepath"/>
+                                        <input class="form-control" rows="3" ms-duplex="currentElement.resourceAddr.remotepath" name="remotepath"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Passive</span>
                                     </label>
                                     <div class="col-sm-7">
-                                    <select class="form-control" rows="3" ms-duplex="currentElement.resourceAddr.passive" name="passive">
-                                        <option value="true">true</option>
-                                        <option value="false">false</option>
-                                    </select>
-                                     <span class="help-block"></span>
+                                        <select class="form-control" rows="3" ms-duplex="currentElement.resourceAddr.passive" name="passive">
+                                            <option value="true">true</option>
+                                            <option value="false">false</option>
+                                        </select>
+                                        <span class="help-block"></span>
+                                    </div>
                                     </div>
                                 </div>
                             </form>
-                            <form class="form-horizontal" id="form_performanceAddr" role="form" hidden>
+                            <form class="form-horizontal" id="form_performanceAddr" role="form" >
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Ftp Type</span>
                                         <span class="required" aria-required="true">*</span>
@@ -190,8 +211,10 @@
                                         </select>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>IP</span>
                                         <span class="required" aria-required="true">*</span>
@@ -200,8 +223,10 @@
                                         <input type="text" ms-duplex="currentElement.performanceAddr.ip" name="ip" class="form-control"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Port</span>
                                         <span class="required" aria-required="true">*</span>
@@ -210,8 +235,10 @@
                                         <input type="text" ms-duplex="currentElement.performanceAddr.port" name="port" class="form-control"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>User</span>
                                         <span class="required" aria-required="true">*</span>
@@ -220,40 +247,48 @@
                                         <input type="text" ms-duplex="currentElement.performanceAddr.user" name="user" class="form-control" ms-attr-placeholder="urlTip"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Password</span>
                                     </label>
                                     <div class="col-sm-7">
-                                    <input type="password" class="form-control" rows="3" ms-duplex="currentElement.performanceAddr.password"  name="password"/>
+                                        <input type="password" class="form-control" rows="3" ms-duplex="currentElement.performanceAddr.password"  name="password"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Remote Path</span>
                                     </label>
                                     <div class="col-sm-7">
-                                    <input class="form-control" rows="3" ms-duplex="currentElement.performanceAddr.remotepath" name="remotepath"/>
+                                        <input class="form-control" rows="3" ms-duplex="currentElement.performanceAddr.remotepath" name="remotepath"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Passive</span>
                                     </label>
                                     <div class="col-sm-7">
-                                    <select class="form-control" rows="3" ms-duplex="currentElement.performanceAddr.passive" name="passive">
-                                        <option value="true">true</option>
-                                        <option value="false">false</option>
-                                    </select>
-                                     <span class="help-block"></span>
+                                        <select class="form-control" rows="3" ms-duplex="currentElement.performanceAddr.passive" name="passive">
+                                            <option value="true">true</option>
+                                            <option value="false">false</option>
+                                        </select>
+                                        <span class="help-block"></span>
+                                    </div>
                                     </div>
                                 </div>
                             </form>
-                            <form class="form-horizontal" id="form_alarmAddr" role="form" hidden>
+                            <form class="form-horizontal" id="form_alarmAddr" role="form" >
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>IP</span>
                                         <span class="required" aria-required="true">*</span>
@@ -262,8 +297,10 @@
                                         <input type="text" ms-duplex="currentElement.alarmAddr.ip" name="ip" class="form-control"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Port</span>
                                         <span class="required" aria-required="true">*</span>
@@ -272,8 +309,10 @@
                                         <input type="text" ms-duplex="currentElement.alarmAddr.port" name="port" class="form-control"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>User</span>
                                         <span class="required" aria-required="true">*</span>
@@ -282,15 +321,18 @@
                                         <input type="text" ms-duplex="currentElement.alarmAddr.user" name="user" class="form-control" ms-attr-placeholder="urlTip"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Password</span>
                                     </label>
                                     <div class="col-sm-7">
-                                    <input type="password" class="form-control" rows="3" ms-duplex="currentElement.alarmAddr.password"  name="password"/>
+                                        <input type="password" class="form-control" rows="3" ms-duplex="currentElement.alarmAddr.password"  name="password"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                             </form>
                         </div>
@@ -303,7 +345,7 @@
                     </div>
                 </div>
             </div>
-        </div>
+        </div>        
     </div>
     <div class="row-fluid" data-name="cond_zone">
         <div class="col-md-12">
@@ -348,7 +390,7 @@
 </div>
 <script type="text/javascript" src="../../thirdparty/jquery/jquery-3.4.1.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
-<script type="text/javascript" src="../../thirdparty/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../thirdparty/bootstrap4.3.1/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/bootbox/bootbox.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/jquery-validation/js/jquery.validate.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/jquery-validation/js/additional-methods.min.js"></script>
diff --git a/portal/src/main/webapp/extsys/nfvo/nfvoView.html b/portal/src/main/webapp/extsys/nfvo/nfvoView.html
index 0868cca..c651973 100644
--- a/portal/src/main/webapp/extsys/nfvo/nfvoView.html
+++ b/portal/src/main/webapp/extsys/nfvo/nfvoView.html
@@ -21,7 +21,7 @@
     <meta charset="UTF-8">
     <title></title>
     <link href="../../thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
-    <link href="../../thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
+    <link href="../../thirdparty/bootstrap4.3.1/css/bootstrap.min.css" rel="stylesheet"/>
     <link href="../../thirdparty/uniform/css/uniform.default.min.css" rel="stylesheet"/>
     <link href="../../thirdparty/css/ngict-component.css" rel="stylesheet"/>
     <link href="css/animate.min.css" rel="stylesheet"/>
@@ -32,7 +32,7 @@
 <div ms-controller="nfvoController" class="container-fluid ms-controller">
     <div id="addNfvoDlg" class="modal fade" tabindex="-1" role="dialog"
          aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
-        <div class="modal-dialog">
+         <div class="modal-dialog">
             <div class="modal-content Changepasswd">
                 <div class="content">
                     <div class="modal-header">
@@ -42,6 +42,7 @@
                         <div class="step-content">
                             <form class="form-horizontal" role="form" id="form_nfvo">
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Name</span>
                                         <span class="required" aria-required="true">*</span>
@@ -50,8 +51,10 @@
                                         <input type="text" ms-duplex="currentElement.name" name="name" class="form-control"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Url</span>
                                         <span class="required" aria-required="true">*</span>
@@ -60,8 +63,10 @@
                                         <input type="text" ms-duplex="currentElement.url" name="url" class="form-control"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Username</span>
                                         <span class="required" aria-required="true">*</span>
@@ -70,8 +75,10 @@
                                         <input type="text" ms-duplex="currentElement.userName" name="userName" class="form-control"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Password</span>
                                     </label>
@@ -79,8 +86,10 @@
                                     <input type="password" class="form-control" ms-duplex="currentElement.password"  name="password"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Version</span>
                                     </label>
@@ -88,8 +97,10 @@
                                         <input class="form-control" ms-duplex="currentElement.version" name="version"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Vendor</span>
                                     </label>
@@ -97,8 +108,10 @@
                                          <input class="form-control" ms-duplex="currentElement.vendor" name="vendor"/>
                                          <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>API Root</span>
                                     </label>
@@ -106,14 +119,17 @@
                                          <input class="form-control" ms-duplex="currentElement.apiroot" name="apiroot"/>
                                          <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group" ms-if="'DC' == currentElement.type" id="nfvoLocation">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Location</span>
                                     </label>
                                     <div class="col-sm-7">
                                         <input class="form-control" ms-duplex="currentElement.location" name="location"/>
                                     </div>
+                                    </div>
                                 </div>
                             </form>
                         </div>
@@ -124,7 +140,7 @@
                     </div>
                 </div>
             </div>
-        </div>
+        </div>        
     </div>
     <div class="row-fluid" data-name="cond_zone">
         <div class="col-md-12">
@@ -168,7 +184,7 @@
 </div>
 <script type="text/javascript" src="../../thirdparty/jquery/jquery-3.4.1.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
-<script type="text/javascript" src="../../thirdparty/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../thirdparty/bootstrap4.3.1/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/bootbox/bootbox.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/jquery-validation/js/jquery.validate.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/jquery-validation/js/additional-methods.min.js"></script>
diff --git a/portal/src/main/webapp/extsys/sdncontroller/sdncView.html b/portal/src/main/webapp/extsys/sdncontroller/sdncView.html
index b832e93..7656c8e 100644
--- a/portal/src/main/webapp/extsys/sdncontroller/sdncView.html
+++ b/portal/src/main/webapp/extsys/sdncontroller/sdncView.html
@@ -21,7 +21,7 @@
     <meta charset="UTF-8">
     <title></title>
     <link href="../../thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
-    <link href="../../thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
+    <link href="../../thirdparty/bootstrap4.3.1/css/bootstrap.min.css" rel="stylesheet"/>
     <link href="../../thirdparty/uniform/css/uniform.default.min.css" rel="stylesheet"/>
     <link href="../../thirdparty/css/ngict-component.css" rel="stylesheet"/>
     <link href="css/animate.min.css" rel="stylesheet"/>
@@ -32,7 +32,7 @@
 <div ms-controller="sdncController" class="container-fluid ms-controller">
     <div id="addEmsDlg" class="modal fade" tabindex="-1" role="dialog"
          aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
-        <div class="modal-dialog">
+         <div class="modal-dialog">
             <div class="modal-content Changepasswd">
                 <div class="content">
                     <div class="modal-header">
@@ -42,6 +42,7 @@
                         <div class="step-content">
                             <form class="form-horizontal" role="form" id="form_sdnc">
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Name</span>
                                         <span class="required" aria-required="true">*</span>
@@ -50,8 +51,10 @@
                                         <input type="text" ms-duplex="currentElement.name" name="name" class="form-control"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Url</span>
                                         <span class="required" aria-required="true">*</span>
@@ -60,8 +63,10 @@
                                         <input type="text" ms-duplex="currentElement.url" name="url" class="form-control"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Username</span>
                                         <span class="required" aria-required="true">*</span>
@@ -70,8 +75,10 @@
                                         <input type="text" ms-duplex="currentElement.userName" name="userName" class="form-control"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Password</span>
                                     </label>
@@ -79,8 +86,10 @@
                                     <input type="password" class="form-control" ms-duplex="currentElement.password"  name="password"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Version</span>
                                     </label>
@@ -88,8 +97,10 @@
                                         <input class="form-control" ms-duplex="currentElement.version" name="version"/>
                                         <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Vendor</span>
                                     </label>
@@ -97,8 +108,10 @@
                                          <input class="form-control" ms-duplex="currentElement.vendor" name="vendor"/>
                                          <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Protocol</span>
                                     </label>
@@ -106,8 +119,10 @@
                                          <input class="form-control" ms-duplex="currentElement.protocol" name="protocol"/>
                                          <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Product Name</span>
                                     </label>
@@ -115,8 +130,10 @@
                                          <input class="form-control" ms-duplex="currentElement.productName" name="productName"/>
                                          <span class="help-block"></span>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Type</span>
                                     </label>
@@ -126,14 +143,17 @@
                                             <option value="DC">DC</option>
                                         </select>
                                     </div>
+                                    </div>
                                 </div>
                                 <div class="form-group" ms-if="'DC' == currentElement.type" id="sdncLocation">
+                                    <div class="row">
                                     <label class="control-label col-sm-3">
                                         <span>Location</span>
                                     </label>
                                     <div class="col-sm-7">
                                         <input class="form-control" ms-duplex="currentElement.location" name="location"/>
                                     </div>
+                                    </div>
                                 </div>
                             </form>
                         </div>
@@ -144,7 +164,7 @@
                     </div>
                 </div>
             </div>
-        </div>
+        </div>        
     </div>
     <div class="row-fluid" data-name="cond_zone">
         <div class="col-md-12">
@@ -188,7 +208,7 @@
 </div>
 <script type="text/javascript" src="../../thirdparty/jquery/jquery-3.4.1.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
-<script type="text/javascript" src="../../thirdparty/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../thirdparty/bootstrap4.3.1/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/bootbox/bootbox.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/jquery-validation/js/jquery.validate.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/jquery-validation/js/additional-methods.min.js"></script>
diff --git a/portal/src/main/webapp/extsys/vim/vimView.html b/portal/src/main/webapp/extsys/vim/vimView.html
index 32ba8f3..df5106d 100644
--- a/portal/src/main/webapp/extsys/vim/vimView.html
+++ b/portal/src/main/webapp/extsys/vim/vimView.html
@@ -21,7 +21,7 @@
     <meta charset="UTF-8">
     <title></title>
     <link href="../../thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
-    <link href="../../thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
+    <link href="../../thirdparty/bootstrap4.3.1/css/bootstrap.min.css" rel="stylesheet"/>
     <link href="../../thirdparty/uniform/css/uniform.default.css" rel="stylesheet"/>
     <link href="../../thirdparty/css/ngict-component.css" rel="stylesheet" type="text/css">
     <link href="css/vim.css" rel="stylesheet" type="text/css"/>
@@ -38,19 +38,20 @@
 
     <div id="addVimDlg" class="modal  fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
          aria-hidden="true" data-backdrop="static">
-        <div class="modal-dialog">
+         <div class="modal-dialog">
             <div class="modal-content Changepasswd">
                 <div class="content">
                     <div class="modal-header">
                         <h4 id="myModalLabel">{{ modalTitle }}</h4>
                     </div>
                     <!-- modal body begin-->
-                    <div class="modal-body">
+                    <div class="modal-body"  style="height:600px; overflow:auto;">
                         <!--<div class="alert alert-info" ms-visible="executeWait.visible">{{executeWait.text}}</div>
                         <div class="alert alert-danger " ms-visible="executeError.visible">{{executeError.text}}</div>-->
 
                         <form class="form-horizontal" id="vim_form" role="form">
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>Cloud Owner</span>
                                     <span class="required" aria-required="true">*</span>
@@ -59,8 +60,10 @@
                                     <input type="text" ms-duplex="currentElement['cloudOwner']" name="Cloud Owner" class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>Cloud Region Id</span>
                                     <span class="required" aria-required="true">*</span>
@@ -69,8 +72,10 @@
                                     <input type="text" ms-duplex="currentElement['cloudRegionId']" name="cloudRegionId" class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>Cloud Type</span>
                                     <span class="required" aria-required="true">*</span>
@@ -81,8 +86,10 @@
                                     </select>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>Cloud Region Version</span>
                                     <span class="required" aria-required="true">*</span>
@@ -93,8 +100,10 @@
                                     </select>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>Owner Defined Type</span>
                                     <span class="required" aria-required="true">*</span>
@@ -103,8 +112,10 @@
                                     <input type="text" ms-duplex="currentElement['ownerDefinedType']" name="ownerDefinedType" class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>Cloud Zone</span>
                                     <span class="required" aria-required="true">*</span>
@@ -113,8 +124,10 @@
                                     <input type="text" ms-duplex="currentElement['cloudZone']" name="cloudZone" class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>Physical Location Id</span>
                                     <span class="required" aria-required="true">*</span>
@@ -126,9 +139,11 @@
                                     </select>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>username</span>
                                     <span class="required" aria-required="true">*</span>
@@ -137,8 +152,10 @@
                                     <input type="text" ms-duplex="currentElement['vimAuthInfos'][0].userName" name="username" class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>password</span>
                                 </label>
@@ -146,8 +163,10 @@
                                     <input type="password" ms-duplex="currentElement['vimAuthInfos'][0].password" name="password" class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>                           
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>Auth Url</span>
                                 </label>
@@ -155,8 +174,10 @@
                                     <input type="text" ms-duplex="currentElement['vimAuthInfos'][0]['authUrl']" name="authUrl" class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>ssl Cacert</span>
                                 </label>
@@ -164,8 +185,10 @@
                                     <input type="text" ms-duplex="currentElement['vimAuthInfos'][0]['sslCacert']" name="sslCacert" class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>ssl Insecure</span>
                                 </label>
@@ -175,8 +198,10 @@
                                         <option value="true">true</option>
                                     </select>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>Cloud Domain</span>
                                 </label>
@@ -184,8 +209,10 @@
                                     <input type="text" ms-duplex="currentElement['vimAuthInfos'][0]['cloudDomain']" name="cloudDomain" class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>Default Tenant</span>
                                 </label>
@@ -193,8 +220,10 @@
                                     <input type="text" ms-duplex="currentElement['vimAuthInfos'][0]['defaultTenant']" name="defaultTenant" class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>Cloud Extra Info</span>
                                 </label>
@@ -203,6 +232,7 @@
                                               name="cloudExtraInfo"></textarea>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                         </form>
                     </div>
@@ -218,7 +248,7 @@
                 </div>
 
             </div>
-        </div>
+        </div>        
     </div>
 
     <div class="row-fluid col-sm-12" data-name="cond_zone">
@@ -280,7 +310,7 @@
 <script type="text/javascript" src="../../thirdparty/jquery/jquery-3.4.1.min.js"></script>
 <!-- <script type="text/javascript" src="../../thirdparty/js/tools.js"></script> -->
 <script type="text/javascript" src="../../thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
-<script type="text/javascript" src="../../thirdparty/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../thirdparty/bootstrap4.3.1/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/jquery-validation/js/jquery.validate.js"></script>
 <script type="text/javascript" src="../../thirdparty/jquery-validation/js/additional-methods.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/bootbox/bootbox.min.js"></script>
diff --git a/portal/src/main/webapp/extsys/vnfm/vnfmView.html b/portal/src/main/webapp/extsys/vnfm/vnfmView.html
index 6234f01..7642aa0 100644
--- a/portal/src/main/webapp/extsys/vnfm/vnfmView.html
+++ b/portal/src/main/webapp/extsys/vnfm/vnfmView.html
@@ -21,7 +21,7 @@
     <meta charset="UTF-8">
     <title></title>
     <link href="../../thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
-    <link href="../../thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
+    <link href="../../thirdparty/bootstrap4.3.1/css/bootstrap.min.css" rel="stylesheet"/>
     <link href="../../thirdparty/uniform/css/uniform.default.min.css" rel="stylesheet"/>
     <link href="../../thirdparty/css/ngict-component.css" rel="stylesheet"/>
     <link href="css/animate.min.css" rel="stylesheet"/>
@@ -36,7 +36,7 @@
 <body>
 <div ms-controller="vnfmController" class="container-fluid ms-controller">
     <div id="addVnfmDlg" class="modal  fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-        <div class="modal-dialog">
+         <div class="modal-dialog">
             <div class="modal-content Changepasswd">
                 <div class="content">
                     <div class="modal-header">
@@ -45,6 +45,7 @@
                     <div class="modal-body">
                         <form class="form-horizontal" id="vnfm_form" role="form">
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span id_i18n="nfv-vnfm-iui-text-name" name_i18n="com_zte_nfv_nsoc_i18n"></span>
                                     <span class="required" aria-required="true">*</span>
@@ -53,8 +54,10 @@
                                     <input type="text" ms-duplex="currentElement.name" name="name" class="form-control" ms-attr-readonly="addVnfm.nameReadonly"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span id_i18n="nfv-vnfm-iui-text-type" name_i18n="com_zte_nfv_nsoc_i18n"></span>
                                     <span class="required" aria-required="true">*</span>
@@ -63,8 +66,10 @@
                                     <input type="text" ms-duplex="currentElement.type" name="type" class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span id_i18n="nfv-vnfm-iui-text-vendor" name_i18n="com_zte_nfv_nsoc_i18n"></span>
                                     <span class="required" aria-required="true">*</span>
@@ -73,8 +78,10 @@
                                     <input type="text" ms-duplex="currentElement.vendor" name="vendor" class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span id_i18n="nfv-vnfm-iui-text-version" name_i18n="com_zte_nfv_nsoc_i18n"></span>
                                     <span class="required" aria-required="true">*</span>
@@ -83,8 +90,10 @@
                                     <input type="text" ms-duplex="currentElement.version" name="version" class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span>URL</span>
                                     <span class="required" aria-required="true">*</span>
@@ -93,16 +102,20 @@
                                     <input type="text" ms-duplex="currentElement.url" name="url" class="form-control" placeholder="Example: http://10.0.0.1"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="col-sm-3 control-label">VIM
                                     <span></span>
                                 </label>
                                 <div class="col-sm-7">
                                     <input class="form-control" ms-duplex="currentElement.vimId" id="vimId" name="vimId"/>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span id_i18n="nfv-vnfm-iui-text-certificateUrl" name_i18n="com_zte_nfv_nsoc_i18n"></span>
                                 </label>
@@ -111,8 +124,10 @@
                                            class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span id_i18n="nfv-vnfm-iui-text-userName" name_i18n="com_zte_nfv_nsoc_i18n"></span>
                                 </label>
@@ -121,8 +136,10 @@
                                            class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                             <div class="form-group">
+                                <div class="row">
                                 <label class="control-label col-sm-3">
                                     <span id_i18n="nfv-vnfm-iui-text-password" name_i18n="com_zte_nfv_nsoc_i18n"></span>
                                 </label>
@@ -131,6 +148,7 @@
                                            class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
+                                </div>
                             </div>
                         </form>
 
@@ -141,7 +159,7 @@
                     </div>
                 </div>
             </div>
-        </div>
+        </div>        
     </div>
     <div class="row-fluid" data-name="cond_zone">
         <div class="col-md-12">
@@ -183,6 +201,7 @@
             </div>
         </div>
     </div>
+
     <div class="col-sm-12">
         <div class="pull-left text-muted">
             <small>
@@ -195,7 +214,7 @@
 </div>
 <script type="text/javascript" src="../../thirdparty/jquery/jquery-3.4.1.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
-<script type="text/javascript" src="../../thirdparty/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../thirdparty/bootstrap4.3.1/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/bootbox/bootbox.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/jquery-validation/js/jquery.validate.min.js"></script>
 <script type="text/javascript" src="../../thirdparty/jquery-validation/js/additional-methods.min.js"></script>
-- 
cgit 1.2.3-korg