core&ui: contest correction mode

packages/ui-default/templates/partials/problem_description.html

@@ -14,10 +14,16 @@
       <p>{{ _('No submission language available for this problem.') }}</p>
     </blockquote>
   {% endif %}
-  {% if tdoc and tdoc.docType == model.document.TYPE_CONTEST and model.contest.isDone(tdoc) %}
+  {% if tdoc and tdoc.docType == model.document.TYPE_CONTEST %}
+    {% if mode == 'view' %}
     <blockquote class="note">
       <p>{{ _('You cannot submit for this problem because the contest is ended. You can click "Open in Problem Set" to view this problem in normal mode.') }}</p>
     </blockquote>
+    {% elif mode == 'correction' %}
+    <blockquote class="note">
+      <p>{{ _('The contest is ended. New submissions will be treated as correction submissions and will not be counted in the contest.') }}</p>
+    </blockquote>
+    {% endif %}
   {% endif %}
   {% if not renderredContent %}
     {% set preferredLang = handler.request.query.lang or handler.user.viewLang or handler.session.viewLang %}

packages/ui-default/templates/partials/problem_sidebar_contest.html

@@ -7,7 +7,7 @@
 {% endif %}
   <div>
     <ol class="menu">
-    {% if model.contest.isOngoing(tdoc, tsdoc) %}
+    {% if mode == 'contest' or mode == 'correction' %}
     {% if page_name == 'contest_detail_problem' %}
       <li class="menu__item scratchpad--hide nojs--hide"><a class="menu__link highlight" name="problem-sidebar__open-scratchpad" href="javascript:;" data-global-hotkey="alt+e">
         <span class="icon icon-enlarge"></span> {{ _('Open Scratchpad') }} (Alt+E)
@@ -20,10 +20,11 @@
         <span class="icon icon-flag"></span> {{ _('View Problem') }}
       </a></li>
     {% endif %}
-      <li class="menu__item scratchpad--hide"><a class="menu__link{% if page_name == 'contest_detail_problem_submit' %} active{% endif %}" href="{{ url('problem_submit', pid=pdoc.pid|default(pdoc.docId), query={tid:tdoc.docId}) }}">
+      <li class="menu__item scratchpad--hide"><a class="menu__link{% if page_name == 'contest_detail_problem_submit' %} active{% endif %}" href="{{ url('problem_submit', pid=pdoc.pid|default(pdoc.docId), query={tid:tdoc.docId} if mode=='contest' else {}) }}">
         <span class="icon icon-send"></span> {{ _('Submit') }}
       </a></li>
-    {% elif model.contest.isDone(tdoc) %}
+    {% endif %}
+    {% if mode != 'none' and model.contest.isDone(tdoc) %}
       <li class="menu__item"><a class="menu__link" href="{{ url('problem_detail', pid=pdoc.pid|default(pdoc.docId)) }}">
         <span class="icon icon-send"></span> {{ _('Open in Problem Set') }}
       </a></li>

packages/ui-default/templates/partials/problem_sidebar_normal.html

@@ -28,7 +28,7 @@
       <li class="menu__seperator"></li>
     {% endif %}
     {% if page_name == 'problem_detail' %}
-    {% if handler.user.hasPerm(perm.PERM_SUBMIT_PROBLEM) %}
+    {% if handler.user.hasPerm(perm.PERM_SUBMIT_PROBLEM) and handler.ctx.setting.get('ui-default.enableScratchpad') %}
       <li class="menu__item scratchpad--hide nojs--hide"><a class="menu__link highlight" name="problem-sidebar__open-scratchpad" href="javascript:;" data-global-hotkey="alt+e">
         <span class="icon icon-enlarge"></span> {{ _('Open Scratchpad') }} (Alt+E)
       </a></li>