Merge branch 'dev' of git.coding.net:virusdefender/qduoj into dev

requirements.txt

@@ -9,3 +9,4 @@ gunicorn
 coverage
 django-extensions
 supervisor
+pillow

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(){

static/src/js/app/oj/problem/problem.js

@@ -1,9 +1,15 @@
-require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirror, csrfTokenHeader, bsAlert) {
+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;
@@ -117,8 +123,8 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro
                 return false;
             }
 
-        if(guessLanguage(code) != language){
+            if (guessLanguage(code) != language) {
-            if(!confirm("您选择的代码语言可能存在错误，是否继续提交？")){
+                if (!confirm("您选择的代码语言可能存在错误，是否继续提交？")) {
                     return;
                 }
             }
@@ -180,4 +186,4 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro
                 }
             }
         })
-});
+    });

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",
 
 
         // ------ 下面写的都不要直接用，而是使用上面的封装版本 ------

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", "微软雅黑",

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>
 

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>