Upversion to Bootstrap4.3.1 & Upgrade Tomcat version

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>

1 files changed, 20 insertions, 4 deletions

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>