与dev合并,修复urls.py的冲突

template/src/oj/account/change_password.html

@@ -17,7 +17,13 @@
                 </div>
                 <div class="form-group">
                     <label for="confirm_password">确认密码</label>
-                    <input type="password" class="form-control input-lg" id="confirm_password" name="confirm_password" placeholder="确认密码" maxlength="30" data-match="#new_password" data-match-error="两个密码不一致" require>
+                    <input type="password" class="form-control input-lg" id="confirm_password" name="confirm_password" placeholder="确认密码" maxlength="30" data-match="#new_password" data-match-error="两个密码不一致" required>
+                    <div class="help-block with-errors"></div>
+                </div>
+                <div class="form-group">
+                    <label for="confirm_password">验证码</label>
+                    <img src="/captcha/" id="captcha-img">
+                    <input type="text" class="form-control input-lg" id="captcha" name="captcha" placeholder="验证码" maxlength="4" required>
                     <div class="help-block with-errors"></div>
                 </div>
                 <div class="form-group">

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/my_submission.html

@@ -71,7 +71,7 @@
                 <button class="btn btn-primary" id="share-code-btn">分享我的代码</button>
             {% endif %}
             <textarea class="form-control" id="share-code-textarea"
-                      {% if not submission.shared %}style="display: none" {% endif %}>【{{ problem.title }}】- {{ request.user.username }}的提交
+                      {% if not submission.shared %}style="display: none" {% endif %}>{{ problem.title }}
 {{ request.build_absolute_uri }}</textarea>
         </div>
     {% endifequal %}

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>