Accept Merge Request #223 细节更新 : (virusdefender-dev -> dev)

Merge Request: 细节更新 Created By: @virusdefender Accepted By: @virusdefender URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/223
2024-09-21 16:33:22 +00:00 · 2015-09-11 17:49:59 +08:00 · 2015-09-11 17:49:59 +08:00 · 47bd2faf11
commit 47bd2faf11
parent 36c9b2cb94 66b51ab741
10 changed files with 2796 additions and 175 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -8,4 +8,5 @@ celery
 gunicorn
 coverage
 django-extensions
-supervisor
+supervisor
+pillow
--- a/static/src/img/ZeroClipboard.swf
+++ b/static/src/img/ZeroClipboard.swf
--- a/static/src/img/favicon.ico
+++ b/static/src/img/favicon.ico
--- a/static/src/js/app/oj/account/change_password.js
+++ b/static/src/js/app/oj/account/change_password.js
@ -1,7 +1,7 @@
 require(["jquery", "bsAlert", "csrfToken", "validator"], function ($, bsAlert, csrfTokenHeader) {

    function refresh_captcha(){
-        this.src = "/captcha/?" + Math.random();
+        $("#captcha-img")[0].src = "/captcha/?" + Math.random();
        $("#captcha")[0].value = "";
    }
    $("#captcha-img").click(function(){
--- a/static/src/js/app/oj/problem/problem.js
+++ b/static/src/js/app/oj/problem/problem.js
@ -1,183 +1,189 @@
-require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirror, csrfTokenHeader, bsAlert) {
-    var codeEditorSelector = $("#code-editor")[0];
-    // 部分界面逻辑会隐藏代码输入框，先判断有没有。
-    if (codeEditorSelector == undefined) {
-        return;
-    }
-    var codeEditor = codeMirror(codeEditorSelector, "text/x-csrc");
-    var language = $("input[name='language'][checked]").val();
-    var submissionId;
-
-    $("input[name='language']").change(function () {
-        language = this.value;
-        var languageTypes = {"1": "text/x-csrc", "2": "text/x-c++src", "3": "text/x-java"};
-        codeEditor.setOption("mode", languageTypes[language]);
-    });
-
-    $("#show-more-btn").click(function () {
-        $(".hide").attr("class", "problem-section");
-        $("#show-more-btn").hide();
-    });
-
-    function showLoading() {
-        $("#submit-code-button").attr("disabled", "disabled");
-        $("#loading-gif").show();
-    }
-
-    function hideLoading() {
-        $("#submit-code-button").removeAttr("disabled");
-        $("#loading-gif").hide();
-    }
-
-    function getResultHtml(data) {
-        // 0 结果正确 1 运行错误 2 超时 3 超内存 4 编译错误
-        // 5 格式错误 6 结果错误 7 系统错误 8 等待判题
-        var results = {
-            0: {"alert_class": "success", message: "Accepted"},
-            1: {"alert_class": "danger", message: "Runtime Error"},
-            2: {"alert_class": "warning", message: "Time Limit Exceeded"},
-            3: {"alert_class": "warning", message: "Memory Limit Exceeded"},
-            4: {"alert_class": "danger", message: "Compile Error"},
-            5: {"alert_class": "warning", message: "Format Error"},
-            6: {"alert_class": "danger", message: "Wrong Answer"},
-            7: {"alert_class": "danger", message: "System Error"},
-            8: {"alert_class": "info", message: "Waiting"}
-        };
-
-        var html = '<div class="alert alert-' +
-            results[data.result].alert_class + ' result"' +
-            ' role="alert">' +
-            '<div class="alert-link">' +
-            results[data.result].message +
-            '!&nbsp;&nbsp; ';
-        if (!data.result) {
-            html += "CPU time: " + data.accepted_answer_time + "ms &nbsp;&nbsp;";
-        }
-        html += ('<a href="/submission/' + submissionId + '/" target="_blank">查看详情</a></div> </div>');
-
-        return html;
-    }
-
-    var counter = 0;
-
-    function getResult() {
-        if (counter++ > 10) {
-            hideLoading();
-            bsAlert("抱歉，服务器可能出现了故障，请稍后到我的提交列表中查看");
-            counter = 0;
+require(["jquery", "codeMirror", "csrfToken", "bsAlert", "ZeroClipboard"],
+    function ($, codeMirror, csrfTokenHeader, bsAlert, ZeroClipboard) {
+        var codeEditorSelector = $("#code-editor")[0];
+        // 部分界面逻辑会隐藏代码输入框，先判断有没有。
+        if (codeEditorSelector == undefined) {
            return;
        }
+
+        // 提供点击复制到剪切板的功能
+        ZeroClipboard.config({swfPath: "/static/img/ZeroClipboard.swf"});
+        new ZeroClipboard($(".copy-sample"));
+
+        var codeEditor = codeMirror(codeEditorSelector, "text/x-csrc");
+        var language = $("input[name='language'][checked]").val();
+        var submissionId;
+
+        $("input[name='language']").change(function () {
+            language = this.value;
+            var languageTypes = {"1": "text/x-csrc", "2": "text/x-c++src", "3": "text/x-java"};
+            codeEditor.setOption("mode", languageTypes[language]);
+        });
+
+        $("#show-more-btn").click(function () {
+            $(".hide").attr("class", "problem-section");
+            $("#show-more-btn").hide();
+        });
+
+        function showLoading() {
+            $("#submit-code-button").attr("disabled", "disabled");
+            $("#loading-gif").show();
+        }
+
+        function hideLoading() {
+            $("#submit-code-button").removeAttr("disabled");
+            $("#loading-gif").hide();
+        }
+
+        function getResultHtml(data) {
+            // 0 结果正确 1 运行错误 2 超时 3 超内存 4 编译错误
+            // 5 格式错误 6 结果错误 7 系统错误 8 等待判题
+            var results = {
+                0: {"alert_class": "success", message: "Accepted"},
+                1: {"alert_class": "danger", message: "Runtime Error"},
+                2: {"alert_class": "warning", message: "Time Limit Exceeded"},
+                3: {"alert_class": "warning", message: "Memory Limit Exceeded"},
+                4: {"alert_class": "danger", message: "Compile Error"},
+                5: {"alert_class": "warning", message: "Format Error"},
+                6: {"alert_class": "danger", message: "Wrong Answer"},
+                7: {"alert_class": "danger", message: "System Error"},
+                8: {"alert_class": "info", message: "Waiting"}
+            };
+
+            var html = '<div class="alert alert-' +
+                results[data.result].alert_class + ' result"' +
+                ' role="alert">' +
+                '<div class="alert-link">' +
+                results[data.result].message +
+                '!&nbsp;&nbsp; ';
+            if (!data.result) {
+                html += "CPU time: " + data.accepted_answer_time + "ms &nbsp;&nbsp;";
+            }
+            html += ('<a href="/submission/' + submissionId + '/" target="_blank">查看详情</a></div> </div>');
+
+            return html;
+        }
+
+        var counter = 0;
+
+        function getResult() {
+            if (counter++ > 10) {
+                hideLoading();
+                bsAlert("抱歉，服务器可能出现了故障，请稍后到我的提交列表中查看");
+                counter = 0;
+                return;
+            }
+            $.ajax({
+                url: "/api/submission/?submission_id=" + submissionId,
+                method: "get",
+                dataType: "json",
+                success: function (data) {
+                    if (!data.code) {
+                        // 8是还没有完成判题
+                        if (data.data.result == 8) {
+                            // 1秒之后重新去获取
+                            setTimeout(getResult, 1000);
+                        }
+                        else {
+                            counter = 0;
+                            hideLoading();
+                            $("#result").html(getResultHtml(data.data));
+                        }
+                    }
+                    else {
+                        bsAlert(data.data);
+                        hideLoading();
+                    }
+                }
+            })
+        }
+
+        function guessLanguage(code) {
+            //cpp
+            if (code.indexOf("using namespace std") > -1) {
+                return "2";
+            }
+            //c
+            if (code.indexOf("printf") > -1) {
+                return "1";
+            }
+            //java
+            if (code.indexOf("public class Main")) {
+                return "3";
+            }
+        }
+
+        $("#submit-code-button").click(function () {
+
+            var code = codeEditor.getValue();
+
+            if (!code.trim()) {
+                bsAlert("请填写代码！");
+                hideLoading();
+                return false;
+            }
+
+            if (guessLanguage(code) != language) {
+                if (!confirm("您选择的代码语言可能存在错误，是否继续提交？")) {
+                    return;
+                }
+            }
+
+            if (location.href.indexOf("contest") > -1) {
+                var problemId = location.pathname.split("/")[4];
+                var contestId = location.pathname.split("/")[2];
+                var url = "/api/contest/submission/";
+                var data = {
+                    problem_id: problemId,
+                    language: language,
+                    code: code,
+                    contest_id: contestId
+                };
+            }
+            else {
+                var problemId = window.location.pathname.split("/")[2];
+                var url = "/api/submission/";
+                var data = {
+                    problem_id: problemId,
+                    language: language,
+                    code: code
+                };
+            }
+
+            showLoading();
+
+            $("#result").html("");
+
+            $.ajax({
+                beforeSend: csrfTokenHeader,
+                url: url,
+                method: "post",
+                data: JSON.stringify(data),
+                contentType: "application/json",
+                success: function (data) {
+                    if (!data.code) {
+                        submissionId = data.data.submission_id;
+                        // 获取到id 之后2秒去查询一下判题结果
+                        setTimeout(getResult, 2000);
+                    }
+                    else {
+                        bsAlert(data.data);
+                        hideLoading();
+                    }
+                }
+            });
+
+        });
+
        $.ajax({
-            url: "/api/submission/?submission_id=" + submissionId,
+            url: "/api/user/",
            method: "get",
            dataType: "json",
            success: function (data) {
-                if (!data.code) {
-                    // 8是还没有完成判题
-                    if (data.data.result == 8) {
-                        // 1秒之后重新去获取
-                        setTimeout(getResult, 1000);
-                    }
-                    else {
-                        counter = 0;
-                        hideLoading();
-                        $("#result").html(getResultHtml(data.data));
-                    }
-                }
-                else {
-                    bsAlert(data.data);
-                    hideLoading();
+                if (data.code) {
+                    $("#submit-code-button").attr("disabled", "disabled");
+                    $("#result").html('<div class="alert alert-danger" role="alert"><div class="alert-link">请先<a href="/login/" target="_blank">登录</a>!</div> </div>');
                }
            }
        })
-    }
-
-    function guessLanguage(code) {
-        //cpp
-        if (code.indexOf("using namespace std") > -1) {
-            return "2";
-        }
-        //c
-        if (code.indexOf("printf") > -1) {
-            return "1";
-        }
-        //java
-        if (code.indexOf("public class Main")) {
-            return "3";
-        }
-    }
-
-    $("#submit-code-button").click(function () {
-
-        var code = codeEditor.getValue();
-
-        if (!code.trim()) {
-            bsAlert("请填写代码！");
-            hideLoading();
-            return false;
-        }
-
-        if(guessLanguage(code) != language){
-            if(!confirm("您选择的代码语言可能存在错误，是否继续提交？")){
-                return;
-            }
-        }
-
-        if (location.href.indexOf("contest") > -1) {
-            var problemId = location.pathname.split("/")[4];
-            var contestId = location.pathname.split("/")[2];
-            var url = "/api/contest/submission/";
-            var data = {
-                problem_id: problemId,
-                language: language,
-                code: code,
-                contest_id: contestId
-            };
-        }
-        else {
-            var problemId = window.location.pathname.split("/")[2];
-            var url = "/api/submission/";
-            var data = {
-                problem_id: problemId,
-                language: language,
-                code: code
-            };
-        }
-
-        showLoading();
-
-        $("#result").html("");
-
-        $.ajax({
-            beforeSend: csrfTokenHeader,
-            url: url,
-            method: "post",
-            data: JSON.stringify(data),
-            contentType: "application/json",
-            success: function (data) {
-                if (!data.code) {
-                    submissionId = data.data.submission_id;
-                    // 获取到id 之后2秒去查询一下判题结果
-                    setTimeout(getResult, 2000);
-                }
-                else {
-                    bsAlert(data.data);
-                    hideLoading();
-                }
-            }
-        });
-
    });
-
-    $.ajax({
-        url: "/api/user/",
-        method: "get",
-        dataType: "json",
-        success: function (data) {
-            if (data.code) {
-                $("#submit-code-button").attr("disabled", "disabled");
-                $("#result").html('<div class="alert alert-danger" role="alert"><div class="alert-link">请先<a href="/login/" target="_blank">登录</a>!</div> </div>');
-            }
-        }
-    })
-});
--- a/static/src/js/config.js
+++ b/static/src/js/config.js
@ -20,6 +20,7 @@ var require = {
        bootstrap: "lib/bootstrap/bootstrap",
        datetimePicker: "lib/datetime_picker/bootstrap-datetimepicker.zh-CN",
        validator: "lib/validator/validator",
+        ZeroClipboard: "lib/ZeroClipboard/ZeroClipboard",


        // ------ 下面写的都不要直接用，而是使用上面的封装版本 ------
--- a/static/src/js/lib/ZeroClipboard/ZeroClipboard.js
+++ b/static/src/js/lib/ZeroClipboard/ZeroClipboard.js
--- a/template/src/oj/index.html
+++ b/template/src/oj/index.html
@ -6,6 +6,7 @@
    <title>青岛大学在线评测平台 - 首页</title>

    <link rel="stylesheet" type="text/css" href="/static/css/fullpage/jquery.fullPage.css">
+    <link rel="shortcut icon" href="/static/img/favicon.ico">
    <style>
        html, textarea, input, option, select, button {
            font: 1em "Helvetica Neue", Helvetica, "Lantinghei SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑",
--- a/template/src/oj/problem/problem.html
+++ b/template/src/oj/problem/problem.html
@ -34,6 +34,7 @@
            {% for item in samples %}
                <div class="problem-section">
                    <label class="problem-label">样例输入{{ forloop.counter }}</label>
+                    <a href="javascript:void(0)" class="copy-sample" data-clipboard-text="{{ item.input }}">复制</a>
        <pre>
 {{ item.input }}</pre>

--- a/template/src/oj_base.html
+++ b/template/src/oj_base.html
@ -5,6 +5,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <meta name="renderer" content="webkit">
+    <link rel="shortcut icon" href="/static/img/favicon.ico">

    <title>在线评测系统</title>