QingdaoU/OnlineJudge
1
0
Fork 0
mirror of https://github.com/QingdaoU/OnlineJudge.git synced 2024-09-21 08:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

修改 js 错误

Browse Source
This commit is contained in:
virusdefender 2015-08-02 14:01:53 +08:00
parent eb686a0f1a
commit be675c17a0
6 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/src/js/app/oj/account/login.js
View File

@ -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",

21
static/src/js/build.js
View File

@ -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"
}
]
})

4
static/src/js/config.js
View File

@ -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",

3
template/oj/account/login.html
View File

@ -20,4 +20,7 @@
</form>
</div>
</div>
{% endblock %}
{% block js_block %}
<script src="/static/js/require.js" data-main="/static/js/app/oj/account/login.js"></script>
{% endblock %}

3
template/oj/problem/problem.html
View File

@ -87,4 +87,7 @@
</div>
</div>
</div>
{% endblock %}
{% block js_block %}
<script src="/static/js/require.js" data-main="/static/js/app/oj/problem/submit_code.js"></script>
{% endblock %}

18
template/oj_base.html
View File

@ -20,6 +20,14 @@
<body>
<!--browser happy begin -->
<!--[if lt IE 9]>
<div class="alert alert-danger text-center" role="alert">
当前网页 <strong>不支持</strong> 你正在使用的浏览器. 为了正常的访问, 请 <a href="http://browsehappy.com/">升级你的浏览器</a>.
</div>
<![endif]-->
<!-- browser happy end -->
<!-- nav begin -->
<nav class="navbar navbar-masthead navbar-default navbar-static-top">
<div class="container">
@ -57,14 +65,6 @@
</nav>
<!-- nav end -->
<!--browser happy begin -->
<!--[if lt IE 9]>
<div class="alert alert-danger text-center" role="alert">
当前网页 <strong>不支持</strong> 你正在使用的浏览器. 为了正常的访问, 请 <a href="http://browsehappy.com/">升级你的浏览器</a>.
</div>
<![endif]-->
<!-- browser happy end -->
<!-- custom body begin -->
{% block body %}{% endblock %}
<!-- custom body end -->
@ -88,7 +88,7 @@
</div>
<script src="/static/js/config.js"></script>
<script src="/static/js/require.js" data-main="/static/js/app/oj.js"></script>
{% block js_block %}{% endblock %}
<!-- footer begin -->
<div class="footer">
<p class="text-muted text-center">Copyright © 2015 青岛大学信息工程学院 创新实验室</p>