Skip to content

H
HRM-admin
Commit fa583a28 authored by FionaChen's avatar FionaChen
Browse files
Options

調整 modal 小視窗在手機尺寸置中設定， 

也更新所有頁面內容
完成 HRMS 內容
parent a9d21cae
Expand all Show whitespace changes
Inline Side-by-side
Showing with 253 additions and 176 deletions
HRMS-manage.html
View file @ fa583a28
This diff is collapsed.
css/style.css
View file @ fa583a28
...@@ -1287,7 +1287,6 @@ h1 { ...@@ -1287,7 +1287,6 @@ h1 {
} }
.table-rwd td { .table-rwd td {
text-align: left !important; text-align: left !important;
/*font-size: 15px;*/
overflow: hidden; overflow: hidden;
width: 100% !important; width: 100% !important;
display: block; display: block;
......
edu-manage.html
View file @ fa583a28
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
</button> </button>
</div> </div>
<div class="modal-body password"> <div class="modal-body password">
<form>
<div class="row form-group"> <div class="row form-group">
<span class="col-4">舊密碼</span> <span class="col-4">舊密碼</span>
<input type="text" class="form-control form-control-sm col-8" name="systemAdminAccount" <input type="text" class="form-control form-control-sm col-8" name="systemAdminAccount"
...@@ -340,7 +340,7 @@ ...@@ -340,7 +340,7 @@
data-target="#SuccessModal">確認</button> data-target="#SuccessModal">確認</button>
</div> </div>
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
</div> </div>
...@@ -374,7 +374,7 @@ ...@@ -374,7 +374,7 @@
<!-- 修改成功 --> <!-- 修改成功 -->
<!-- 修改失敗 --> <!-- 修改失敗 -->
<div class="modal fade" id="FailModal" tabindex="-1" aria-labelledby="FailModalModal" aria-hidden="true"> <div class="modal fade" id="FailModal" tabindex="-1" aria-labelledby="FailModal" aria-hidden="true">
<div class="modal-dialog success modal-dialog-centered" role="document"> <div class="modal-dialog success modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header whitebg"> <div class="modal-header whitebg">
...@@ -411,16 +411,17 @@ ...@@ -411,16 +411,17 @@
<div class="phoneItem"> <div class="phoneItem">
<ul class="item-list"> <ul class="item-list">
<li> <li>
<a href="index.html" class="items"><img src="images/icon/side-OTP.svg">統計與資訊</a> <a href="index.html" class="items"><img src="images/icon/side-OTP.svg">管理員帳號</a>
<!-- <div class="item-bg"></div> --> <!-- <div class="item-bg"></div> -->
</li> </li>
<li> <li>
<a href="edu-manage.html" class="items active"><img <a href="edu-manage.html" class="items active"><img src="images/icon/side-HRM.svg">教育平台管理</a>
src="images/icon/side-HRM.svg">教育平台管理</a> </li>
<li>
<a href="HRMS-manage.html" class="items"><img src="images/icon/side-member.svg">HRMS管理</a>
</li> </li>
<li> <li>
<a href="HRMS-manage.html" class="items"><img <a href="account.html" class="items"><img src="images/icon/icon-setting.svg">帳號設定</a>
src="images/icon/side-member.svg">HRMS管理</a>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -460,6 +461,7 @@ ...@@ -460,6 +461,7 @@
<script src="http://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script> <script src="http://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
<!-- <script src="http://code.highcharts.com/highcharts.js"></script> --> <!-- <script src="http://code.highcharts.com/highcharts.js"></script> -->
<script src="js/highcharts.js"></script> <script src="js/highcharts.js"></script>
<script src="js/main.js"></script>
<script src="js/sortable.min.js"></script> <script src="js/sortable.min.js"></script>
...@@ -610,23 +612,7 @@ ...@@ -610,23 +612,7 @@
</script> </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> </body>
......
index.html
View file @ fa583a28
...@@ -643,7 +643,7 @@ ...@@ -643,7 +643,7 @@
</button> </button>
</div> </div>
<div class="modal-body password"> <div class="modal-body password">
<form>
<div class="row form-group"> <div class="row form-group">
<span class="col-4">舊密碼</span> <span class="col-4">舊密碼</span>
<input type="text" class="form-control form-control-sm col-8" name="systemAdminAccount" <input type="text" class="form-control form-control-sm col-8" name="systemAdminAccount"
...@@ -680,7 +680,7 @@ ...@@ -680,7 +680,7 @@
</div> </div>
</div> </div>
</div> --> </div> -->
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
</div> </div>
...@@ -739,7 +739,7 @@ ...@@ -739,7 +739,7 @@
<!-- 修改成功 --> <!-- 修改成功 -->
<!-- 修改失敗 --> <!-- 修改失敗 -->
<div class="modal fade" id="FailModal" tabindex="-1" aria-labelledby="FailModalModal" <div class="modal fade" id="FailModal" tabindex="-1" aria-labelledby="FailModal"
aria-hidden="true"> aria-hidden="true">
<div class="modal-dialog success modal-dialog-centered" role="document"> <div class="modal-dialog success modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content">
...@@ -820,7 +820,7 @@ ...@@ -820,7 +820,7 @@
</button> </button>
</div> </div>
<div class="modal-body Addcont"> <div class="modal-body Addcont">
<form>
<div> <div>
<div class="form-group row"> <div class="form-group row">
<label class="col-lg-3 col-sm-4 col-12 pl-0">姓名</label> <label class="col-lg-3 col-sm-4 col-12 pl-0">姓名</label>
...@@ -980,7 +980,7 @@ ...@@ -980,7 +980,7 @@
</div> </div>
</div> </div>
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
</div> </div>
...@@ -1001,7 +1001,7 @@ ...@@ -1001,7 +1001,7 @@
</button> </button>
</div> </div>
<div class="modal-body Addcont"> <div class="modal-body Addcont">
<form>
<div> <div>
<div class="form-group row"> <div class="form-group row">
<label class="col-lg-3 col-sm-4 col-12 pl-0">ID</label> <label class="col-lg-3 col-sm-4 col-12 pl-0">ID</label>
...@@ -1170,7 +1170,7 @@ ...@@ -1170,7 +1170,7 @@
</div> </div>
</div> </div>
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
</div> </div>
...@@ -1193,7 +1193,7 @@ ...@@ -1193,7 +1193,7 @@
</button> </button>
</div> </div>
<div class="modal-body Addcont"> <div class="modal-body Addcont">
<form>
<div> <div>
<div class="form-group row"> <div class="form-group row">
<label class="col-lg-3 col-sm-4 col-12 pl-0">角色名稱</label> <label class="col-lg-3 col-sm-4 col-12 pl-0">角色名稱</label>
...@@ -1256,7 +1256,7 @@ ...@@ -1256,7 +1256,7 @@
</div> </div>
</div> </div>
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
</div> </div>
...@@ -1277,7 +1277,7 @@ ...@@ -1277,7 +1277,7 @@
</button> </button>
</div> </div>
<div class="modal-body Addcont"> <div class="modal-body Addcont">
<form>
<div> <div>
<div class="form-group row"> <div class="form-group row">
<label class="col-lg-3 col-sm-4 col-12 pl-0">角色名稱</label> <label class="col-lg-3 col-sm-4 col-12 pl-0">角色名稱</label>
...@@ -1340,7 +1340,7 @@ ...@@ -1340,7 +1340,7 @@
</div> </div>
</div> </div>
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
</div> </div>
...@@ -1350,39 +1350,6 @@ ...@@ -1350,39 +1350,6 @@
<!--編輯角色 --> <!--編輯角色 -->
<!-- <div class="modal fade" id="confirmBackToCalendarMgnt" tabindex="-1" aria-labelledby="confirmBackToStudentMgnt" aria-hidden="true">
<div class="modal-dialog modal-sm0 modal-dialog-centered0 modal-adminSchool modal-message">
<div class="modal-content">
<div class="modal-header">
</div>
<div class="modal-body">
<form>
<div class="row row-noMargin">
<div class="col-12 col-noPadding text-center">
<p>是否返回？</p>
<div class="submitBlock">
<div class="d-flex justify-content-around">
<button type="button" class="btn btn-hard btn-normalWidth btn-lightGrey-hollow" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-hard btn-normalWidth btn-lightGrey-hollow" onclick="window.location.href='adminSchool-calendarMgnt_withData.html'">確認</button>
</div>
</div>
</div>
</div>
</form>
</div>
<div class="modal-footer">
</div>
</div>
</div>
</div> -->
<!-- js files --> <!-- js files -->
...@@ -1400,7 +1367,7 @@ ...@@ -1400,7 +1367,7 @@
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js"
integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI"
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script src="js/main.js"></script>
<script src="js/sortable.min.js"></script> <script src="js/sortable.min.js"></script>
...@@ -1487,24 +1454,6 @@ ...@@ -1487,24 +1454,6 @@
</script> </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> </body>
......
js/main.js 0 → 100644
View file @ fa583a28
// 修正打開新的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");
});
//modal 縮小視窗時，畫面置中
$('#AddSuccessModal').on('show.bs.modal', function () {
$('#AddSuccessModal').addClass('d-flex justify-content-center');
});
$('#SuccessModal').on('show.bs.modal', function () {
$('#SuccessModal').addClass('d-flex justify-content-center');
});
$('#StopSuccessModal').on('show.bs.modal', function () {
$('#StopSuccessModal').addClass('d-flex justify-content-center');
});
$('#FailModal').on('show.bs.modal', function () {
$('#FailModal').addClass('d-flex justify-content-center');
});
$('#EditSuccessModal').on('show.bs.modal', function () {
$('#EditSuccessModal').addClass('d-flex justify-content-center');
});
$('#confirmBackToCalendarMgnt').on('show.bs.modal', function () {
$('#confirmBackToCalendarMgnt').addClass('d-flex justify-content-center');
});
$('#AddSuccessModal').on('hidden.bs.modal', function () {
$('#AddSuccessModal').removeClass('d-flex justify-content-center');
})
$('#SuccessModal').on('hidden.bs.modal', function () {
$('#SuccessModal').removeClass('d-flex justify-content-center');
})
$('#StopSuccessModal').on('hidden.bs.modal', function () {
$('#StopSuccessModal').removeClass('d-flex justify-content-center');
})
$('#FailModal').on('hidden.bs.modal', function () {
$('#FailModal').removeClass('d-flex justify-content-center');
})
$('#EditSuccessModal').on('hidden.bs.modal', function () {
$('#EditSuccessModal').removeClass('d-flex justify-content-center');
})
$('#confirmBackToCalendarMgnt').on('hidden.bs.modal', function () {
$('#confirmBackToCalendarMgnt').removeClass('d-flex justify-content-center');
})
});
\ No newline at end of file
login.html
View file @ fa583a28
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
<img src="images/pic-login.png" class="img-fluid"> <img src="images/pic-login.png" class="img-fluid">
</div> </div>
<div class="col-lg-5 col-md-6 col-sm-6 col-12"> <div class="col-lg-5 col-md-6 col-sm-6 col-12">
<form>
<div class="login-title"> <div class="login-title">
<img src="images/logo.svg" class="img-fluid"> <img src="images/logo.svg" class="img-fluid NB-show">
<div class="topic">訂閱管理後台</div> <div class="topic">訂閱管理後台</div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<button type="button" class="btn btn-wt mr-3" data-dismiss="modal">清除</button> <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='welcome.html'">登入</button> <button type="button" class="btn btn-wt blue" onclick="window.location.href='welcome.html'">登入</button>
</div> </div>
</form>
</div> </div>
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
</button> </button>
</div> </div>
<div class="modal-body password"> <div class="modal-body password">
<form>
<div class="form-group row"> <div class="form-group row">
<label class="col-4">舊密碼</span> <label class="col-4">舊密碼</span>
<input type="text" class="form-control form-control-sm col-8" name="systemAdminAccount" value=""> <input type="text" class="form-control form-control-sm col-8" name="systemAdminAccount" value="">
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</div> </div>
</div> </div>
</div> --> </div> -->
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
</div> </div>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script> <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
<script src="js/main.js"></script>
......
welcome.html
View file @ fa583a28
...@@ -53,10 +53,10 @@ ...@@ -53,10 +53,10 @@
<!-- <div class="item-bg"></div> --> <!-- <div class="item-bg"></div> -->
</li> </li>
<li> <li>
<a href="#" class="items"><img src="images/icon/side-HRM.svg">教育平台管理</a> <a href="edu-manage.html" class="items active"><img src="images/icon/side-HRM.svg">教育平台管理</a>
</li> </li>
<li> <li>
<a href="#" class="items"><img src="images/icon/side-member.svg">HRMS管理</a> <a href="HRMS-manage.html" class="items"><img src="images/icon/side-member.svg">HRMS管理</a>
</li> </li>
<div class="version">目前版本：V 0.0.1</div> <div class="version">目前版本：V 0.0.1</div>
</ul> </ul>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
</button> </button>
</div> </div>
<div class="modal-body password"> <div class="modal-body password">
<form>
<div class="row form-group"> <div class="row form-group">
<span class="col-4">舊密碼</span> <span class="col-4">舊密碼</span>
<input type="text" class="form-control form-control-sm col-8" name="systemAdminAccount" <input type="text" class="form-control form-control-sm col-8" name="systemAdminAccount"
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
</div> </div>
</div> </div>
</div> --> </div> -->
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
</div> </div>
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
<!-- 修改成功 --> <!-- 修改成功 -->
<!-- 修改失敗 --> <!-- 修改失敗 -->
<div class="modal fade" id="FailModal" tabindex="-1" aria-labelledby="FailModalModal" <div class="modal fade" id="FailModal" tabindex="-1" aria-labelledby="FailModal"
aria-hidden="true"> aria-hidden="true">
<div class="modal-dialog success modal-dialog-centered" role="document"> <div class="modal-dialog success modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content">
...@@ -234,10 +234,13 @@ ...@@ -234,10 +234,13 @@
<!-- <div class="item-bg"></div> --> <!-- <div class="item-bg"></div> -->
</li> </li>
<li> <li>
<a href="#" class="items"><img src="images/icon/side-HRM.svg">教育平台管理</a> <a href="edu-manage.html" class="items"><img src="images/icon/side-HRM.svg">教育平台管理</a>
</li> </li>
<li> <li>
<a href="#" class="items"><img src="images/icon/side-member.svg">HRMS管理</a> <a href="HRMS-manage.html" class="items"><img src="images/icon/side-member.svg">HRMS管理</a>
</li>
<li>
<a href="account.html" class="items"><img src="images/icon/icon-setting.svg">帳號設定</a>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -255,10 +258,6 @@ ...@@ -255,10 +258,6 @@
<!-- js files --> <!-- js files -->
<script type="text/javascript" src="js/jquery.js"></script> <script type="text/javascript" src="js/jquery.js"></script>
<!-- <script type="text/javascript" src="js/popper.min.js"></script> --> <!-- <script type="text/javascript" src="js/popper.min.js"></script> -->
...@@ -275,7 +274,7 @@ ...@@ -275,7 +274,7 @@
integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI"
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script src="js/main.js"></script>
<script src="js/sortable.min.js"></script> <script src="js/sortable.min.js"></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment