From be675c17a0f3d5c88cdf25b0f7b964f8b5a52352 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 2 Aug 2015 14:01:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20js=20=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
static/src/js/app/oj/account/login.js | 2 +-
static/src/js/build.js | 21 ++++++++++++++++-----
static/src/js/config.js | 4 ++--
template/oj/account/login.html | 3 +++
template/oj/problem/problem.html | 3 +++
template/oj_base.html | 18 +++++++++---------
6 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/static/src/js/app/oj/account/login.js b/static/src/js/app/oj/account/login.js
index 86a9955e..b7c23e71 100644
--- a/static/src/js/app/oj/account/login.js
+++ b/static/src/js/app/oj/account/login.js
@@ -1,4 +1,4 @@
-define("login", ["jquery", "bs_alert", "validation"], function($, bs_alert){
+require(["jquery", "bs_alert", "validation"], function($, bs_alert){
$("#login-form")
.formValidation({
framework: "bootstrap",
diff --git a/static/src/js/build.js b/static/src/js/build.js
index c60dbd39..ccff2a08 100644
--- a/static/src/js/build.js
+++ b/static/src/js/build.js
@@ -12,10 +12,12 @@
uploader: "utils/uploader",
validation: "utils/validation",
code_mirror: "utils/code_mirror",
- login: "app/account/login",
+ login: "app/oj/account/login",
oj: "app/oj",
"bs_alert": "utils/bs_alert",
- submit_code: "app/problem/submit_code",
+ submit_code: "app/oj/problem/submit_code",
+ contest: "app/admin/contest/contest",
+ admin: "app/admin",
//formValidation 不要在代码中单独使用，而是使用和修改utils/validation
base: "lib/formValidation/base",
@@ -39,18 +41,27 @@
code_mirror_clang: "lib/codeMirror/language/clike",
//bootstrap
- bootstrap: "lib/bootstrap/bootstrap"
+ bootstrap: "lib/bootstrap/bootstrap",
+
+ //
+ "_datetimepicker": "lib/datetime_picker/bootstrap-datetimepicker",
+ "datetimepicker": "lib/datetime_picker/bootstrap-datetimepicker.zh-CN"
},
shim: {
- "bootstrap": {"deps": ['jquery']}
+ "bootstrap": {"deps": ['jquery']},
+ "_datetimepicker": {"deps": ["jquery"]},
+ "datetimepicker": {"deps": ["_datetimepicker"]}
},
findNestedDependencies: true,
appDir: "../",
dir: "../../release/",
modules: [
{
- name: "oj"
+ name: "login"
+ },
+ {
+ name: "admin"
}
]
})
\ No newline at end of file
diff --git a/static/src/js/config.js b/static/src/js/config.js
index b79d026c..c7532293 100644
--- a/static/src/js/config.js
+++ b/static/src/js/config.js
@@ -11,11 +11,11 @@ var require = {
uploader: "utils/uploader",
validation: "utils/validation",
code_mirror: "utils/code_mirror",
- login: "app/oj/account/login",
oj: "app/oj/oj",
- "bs_alert": "utils/bs_alert",
+ bs_alert: "utils/bs_alert",
submit_code: "app/oj/problem/submit_code",
contest: "app/admin/contest/contest",
+ admin: "app/admin",
//formValidation 不要在代码中单独使用，而是使用和修改utils/validation
base: "lib/formValidation/base",
diff --git a/template/oj/account/login.html b/template/oj/account/login.html
index 92da23a0..74b8a221 100644
--- a/template/oj/account/login.html
+++ b/template/oj/account/login.html
@@ -20,4 +20,7 @@
+{% endblock %}
+{% block js_block %}
+
{% endblock %}
\ No newline at end of file
diff --git a/template/oj/problem/problem.html b/template/oj/problem/problem.html
index 24f9488f..8cb9b06e 100644
--- a/template/oj/problem/problem.html
+++ b/template/oj/problem/problem.html
@@ -87,4 +87,7 @@
+{% endblock %}
+{% block js_block %}
+
{% endblock %}
\ No newline at end of file
diff --git a/template/oj_base.html b/template/oj_base.html
index d90c1ef8..0fb79427 100644
--- a/template/oj_base.html
+++ b/template/oj_base.html
@@ -20,6 +20,14 @@
+
+
+
+