From 9d6aa30c89105d57ea916dd2e8c9d7df487b0e94 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Wed, 23 Dec 2015 15:10:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=8B=E7=BC=A9=20bootstrap=20js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/build.js                  | 10 ++++++++++
 static/src/js/config.js                 |  2 ++
 template/src/admin/monitor/monitor.html | 15 ---------------
 template/src/oj_base.html               |  4 +---
 4 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 template/src/admin/monitor/monitor.html

diff --git a/static/src/js/build.js b/static/src/js/build.js
index df5e2343..21f10c84 100644
--- a/static/src/js/build.js
+++ b/static/src/js/build.js
@@ -51,6 +51,7 @@
 
         //"_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
 
+        //以下都是页面 script 标签引用的js
         //以下都是页面 script 标签引用的js
         announcement_0_pack: "app/admin/announcement/announcement",
         userList_1_pack: "app/admin/user/userList",
@@ -68,6 +69,7 @@
         addContest_13_pack: "app/admin/contest/addContest",
         contestPassword_14_pack: "app/oj/contest/contestPassword",
         changePassword_15_pack: "app/oj/account/changePassword",
+        judges_16_pack: "app/admin/judges/judges",
         editProblem_17_pack: "app/admin/contest/editProblem",
         joinGroupRequestList_18_pack: "app/admin/group/joinGroupRequestList",
         group_19_pack: "app/oj/group/group",
@@ -89,6 +91,11 @@
     appDir: "../",
     dir: "../../release/",
     modules: [
+        // 提交脚本提取的模块的时候不要删掉这个
+        {
+            name: "bootstrap",
+        },
+        /////////////////////////////////
         {
             name: "announcement_0_pack"
         },
@@ -137,6 +144,9 @@
         {
             name: "changePassword_15_pack"
         },
+        {
+            name: "judges_16_pack"
+        },
         {
             name: "editProblem_17_pack"
         },
diff --git a/static/src/js/config.js b/static/src/js/config.js
index 531d349e..ade545d2 100644
--- a/static/src/js/config.js
+++ b/static/src/js/config.js
@@ -53,6 +53,7 @@ var require = {
 
         // "_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
 
+        //以下都是页面 script 标签引用的js
         //以下都是页面 script 标签引用的js
         announcement_0_pack: "app/admin/announcement/announcement",
         userList_1_pack: "app/admin/user/userList",
@@ -70,6 +71,7 @@ var require = {
         addContest_13_pack: "app/admin/contest/addContest",
         contestPassword_14_pack: "app/oj/contest/contestPassword",
         changePassword_15_pack: "app/oj/account/changePassword",
+        judges_16_pack: "app/admin/judges/judges",
         editProblem_17_pack: "app/admin/contest/editProblem",
         joinGroupRequestList_18_pack: "app/admin/group/joinGroupRequestList",
         group_19_pack: "app/oj/group/group",
diff --git a/template/src/admin/monitor/monitor.html b/template/src/admin/monitor/monitor.html
deleted file mode 100644
index 0ccf6df8..00000000
--- a/template/src/admin/monitor/monitor.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="col-md-9">
-    <h1>服务器监控</h1>
-
-    <div>
-        <div>
-            <h3>等待判题队列长度</h3>
-
-            <div id="waiting-queue">
-                <canvas class="line-chart" id="waiting-queue-chart"></canvas>
-            </div>
-        </div>
-    </div>
-<button class="btn btn-danger" id="clear-chart-data">清空图表数据</button>
-    <script src="/static/js/app/admin/monitor/monitor.js"></script>
-</div>
\ No newline at end of file
diff --git a/template/src/oj_base.html b/template/src/oj_base.html
index 725461e9..934f491c 100644
--- a/template/src/oj_base.html
+++ b/template/src/oj_base.html
@@ -91,9 +91,7 @@
 
 <script src="/static/js/config.js"></script>
 <script src="/static/js/require.js"></script>
-<script>
-    require(["bootstrap"]);
-</script>
+<script src="/static/js/lib/bootstrap/bootstrap.js"></script>
 {% block js_block %}{% endblock %}
 <!-- footer begin -->
 <div class="footer">