修复冲突

template/src/oj/contest/contest_problem.html

@@ -72,13 +72,13 @@
 
                     <div>
                         <label class="radio-inline">
-                            <input type="radio" name="language" value="1" checked> C (gcc 4.8)
+                            <input type="radio" name="language" value="1" checked> C (GCC 4.8)
                         </label>
                         <label class="radio-inline">
-                            <input type="radio" name="language" value="2"> C++ (g++ 4.3)
+                            <input type="radio" name="language" value="2"> C++ (G++ 4.3)
                         </label>
                         <label class="radio-inline">
-                            <input type="radio" name="language" value="3"> Java (jre 1.7)
+                            <input type="radio" name="language" value="3"> Java (Oracle JDK 1.7)
                         </label>
                     </div>
                 </div>

template/src/oj/contest/contest_rank.html

@@ -50,6 +50,7 @@
                     {% endfor %}
                     </tbody>
                 </table>
+                    <input type="checkbox" id="auto-refresh" {% if auto_refresh %}checked{% endif %} onchange="if(this.checked){location.href='?auto_refresh=true'}else{location.href=location.href.split('?')[0]}"> 自动刷新
                 {% else %}
                     <p>还没有结果</p>
                 {% endif %}
@@ -60,4 +61,11 @@
 
 
 {% block js_block %}
+{% if auto_refresh %}
+    <script>
+    setTimeout(function(){
+        location.reload();
+    }, 5000);
+    </script>
+    {% endif %}
 {% endblock %}

template/src/oj/contest/submissions_list.html

@@ -65,7 +65,10 @@
                 </thead>
                 {% if submissions %}
                 <tbody>
+<<<<<<< HEAD
 
+=======
+>>>>>>> dev
                 {% for item in submissions %}
                     <tr>
                         {% ifequal item.user_id request.user.id %}