修改密碼後按確認，

跳出確認修改視窗&JS

index.html

@@ -49,7 +49,7 @@
             <nav class="leftColum">
                 <ul class="item-list">
                     <li>
-                        <a href="#" class="items"><img src="images/icon/side-OTP.svg">管理員帳號</a>
+                        <a href="index.html" class="items active"><img src="images/icon/side-OTP.svg">管理員帳號</a>
                         <!-- <div class="item-bg"></div> -->
                     </li>
                     <li>
@@ -77,10 +77,9 @@
             <label>admin456，您好！</label>
             <div class="d-flex justify-content-center">
                 <button type="button" class="btn-wt mr-2" data-toggle="modal"
-                    data-target="#confirmBackToCalendarMgnt">修改密碼</button>
+                    data-target="#confirmBackToCalendarMgnt" data-dismiss="modal">修改密碼</button>
                 <button type="button" class="btn-wt mr-2" onclick="location.href='#'">登出</button>
             </div>
-
         </div>
 
         <!-- menu 底圖 -->
@@ -337,8 +336,7 @@
                         </div>
                         <div class="d-flex justify-content-center mt-5">
                             <button type="button" class="btn btn-wt mr-3" data-dismiss="modal">取消</button>
-                            <button type="button" class="btn btn-wt blue"
-                                onclick="window.location.href='index.html'">確認</button>
+                            <button type="button" class="btn btn-wt blue" data-toggle="modal" data-dismiss="modal" data-target="#SuccessModal">確認</button>
                         </div>
                         <!-- <div class="message-group">
                     <label>舊密碼</label>
@@ -364,11 +362,8 @@
     <!-- /修改密碼 -->
 
 
-
-
-
     <!-- 修改成功 -->
-    <div class="modal fade" id="SuccessModal" tabindex="-1" aria-labelledby="confirmBackToStudentMgnt"
+    <div class="modal fade" id="SuccessModal" tabindex="-1" aria-labelledby="SuccessModal"
         aria-hidden="true">
         <div class="modal-dialog success modal-dialog-centered" role="document">
             <div class="modal-content">
@@ -391,6 +386,30 @@
     </div>
     <!-- 修改成功 -->
 
+    <!-- 修改失敗 -->
+    <div class="modal fade" id="FailModal" tabindex="-1" aria-labelledby="FailModalModal"
+        aria-hidden="true">
+        <div class="modal-dialog success modal-dialog-centered" role="document">
+            <div class="modal-content">
+                <div class="modal-header whitebg">
+                    <!-- <label class="topic">修改密碼</label> -->
+                    <button type="button" class="close whitebg" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true" class="">×</span>
+                    </button>
+                </div>
+                <div class="modal-body checkcont">
+                    <div class="row form-group justify-content-center">
+                        <span class="col-12 text-center">修改失敗</span>
+                        <img src="images/icon/image-fail.svg" class="mt-3">
+                    </div>
+                </div>
+                <div class="modal-footer">
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- 修改成功 -->
+
 
     <!-- 手機板選單 -->
     <div class="modal ItemsIcon fade" id="ItemsIconModal" tabindex="-1" aria-labelledby="ItemsIconModal"
@@ -402,11 +421,11 @@
                         <span aria-hidden="true" class="">×</span>
                     </button>
                 </div>
-                <div class="modal-body checkcont">
+                <div class="modal-body checkcont height100">
                     <div class="phoneItem">
                         <ul class="item-list">
                             <li>
-                                <a href="#" class="items"><img src="images/icon/side-OTP.svg">管理員帳號</a>
+                                <a href="index.html" class="items active"><img src="images/icon/side-OTP.svg">管理員帳號</a>
                                 <!-- <div class="item-bg"></div> -->
                             </li>
                             <li>
@@ -430,8 +449,12 @@
     <!-- 手機板選單 -->
 
 
+
+
+
+
     <!-- 新增管理員帳號 -->
-    <div class="modal fade" id="addAdminCount" tabindex="-1" aria-labelledby="confirmBackToStudentMgnt"
+    <div class="modal fade" id="addAdminCount" tabindex="-1" aria-labelledby="addAdminCount"
         aria-hidden="true">
         <div class="modal-dialog modal-sm0 modal-dialog-centered0  modal-adminSchool modal-message">
             <div class="modal-content">
@@ -593,7 +616,7 @@
                             <div class="form-group mt-5">
                                 <div class="d-flex justify-content-center">
                                     <button type="button" class="btn btn-wt mr-3" data-dismiss="modal">取消</button>
-                                    <button type="button" class="btn btn-wt blue"
+                                    <button type="button" class="btn btn-wt blue" 
                                         onclick="window.location.href='index.html'">確認</button>
                                 </div>
                             </div>
@@ -844,8 +867,7 @@
         integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI"
         crossorigin="anonymous"></script>
 
-    <!-- <script type="text/javascript" src="js/sortingTable.js"></script>
-<script type="text/javascript" src="js/adminSchool-main.js"></script> -->
+    
     <script src="js/sortable.min.js"></script>
 
 
@@ -931,6 +953,25 @@
     </script>
 
 
+<script>
+    // 修正打開新的modal並關閉上一個modal時，modal內容高度超過螢幕時scrollbar不會出現的問題...
+    $(function(){	
+        // 使用bootstrap modal的shown.bs.modal這個event就可以顯示scrollbar
+        $('.modal').on('shown.bs.modal', function () {
+            $('body').addClass('modal-open');
+        })
+    
+        $(".modal [data-toggle='modal']").click(function(){
+            $(this).closest(".modal").modal('hide');
+            // 修正關閉新modal時，modal scrollbar位置會留下寬度17px空白的問題
+            $('body').css("overflow","hidden").css("padding-right","0");    	
+        });
+    
+    });			
+
+</script>
+
+
 </body>
 
 </html>
\ No newline at end of file