+nginx.conf; update scratchpad

templates/partials/footer.html

@@ -53,8 +53,8 @@
           <li class="footer__extra-link-item" data-dropdown-target="#menu-footer-lang">
             <span><span class="icon icon-global"></span> Language <span class="icon icon-expand_less"></span></span>
             <ol class="dropdown-target menu" id="menu-footer-lang">
-            {% for item in model.builtin.VIEW_LANGS %}
-              <li class="menu__item"><a class="menu__link" href="{{ url('switch_language', lang=item.code) }}">{{ item.name }}</a></li>
+            {% for k, v in model.setting.langRange %}
+              <li class="menu__item"><a class="menu__link" href="{{ url('switch_language', lang=k) }}">{{ v }}</a></li>
             {% endfor %}
             </ol>
           </li>
@@ -62,6 +62,7 @@
       </div>
       <div class="footer__extra-right">
         <ol class="clearfix">
+        <!-- TODO -->
         {% for html in model.builtin.FOOTER_EXTRA_HTMLS %}
           <li class="footer__extra-link-item">{{ html|safe }}</li>
         {% endfor %}

templates/problem_detail.html

@@ -4,6 +4,7 @@
   var Context = {{ {
     problemId: pdoc.pid,
     postSubmitUrl: url('problem_submit', pid=pdoc.pid),
+    postPretestUrl: url('problem_pretest', pid=pdoc.pid),
     getSubmissionsUrl: url('problem_submit', pid=pdoc.pid),
     getRecordDetailUrl: url('record_detail', rid='{rid}'),
     codeLang: handler.user.codeLang,
@@ -28,13 +29,13 @@
           </blockquote>
         {% endif %}
         {% if tdoc %}
-        {% if tdoc['doc_type'] == vj4.model.document.TYPE_CONTEST %}
+        {% if tdoc['docType'] == model.document.TYPE_CONTEST %}
         {% if model.contest.isDone(tdoc) %}
           <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>
         {% endif %}{# handler.isDone(tdoc) #}
-        {% endif %}{# tdoc['doc_type'] == vj4.model.document.TYPE_CONTEST #}
+        {% endif %}{# tdoc['docType'] == model.document.TYPE_CONTEST #}
         {% endif %}{# tdoc #}
           {{ pdoc['content']|markdown|safe }}
         </div>

templates/problem_upload.html

@@ -1,16 +1,16 @@
 {% extends 'layout/simple.html' %}
 {% block body %}
 <form method="post" enctype="multipart/form-data">
-    {% if (typeof(pdoc.data) == 'string') %}
-        <p><b>{{ _('Current dataset comes from') }} <a href="{{ pdoc.data.split('from:')[1] }}" target="_blank">{{ pdoc.data.split('from:')[1] }}</a></b></p>
-    {% else %}
-        <p>{{ _('Current dataset: {0}').format((pdoc['data'] or _('(None)')).toString()) }}</p>
-        <p>{{ _('MD5') }}: {{ md5|default(_('(None)'))) }}</p>
-    {% endif %}
-    <p>{{ _('New dataset') }}:
-        <input type="hidden" name="csrfToken" value="{{ handler.csrfToken }}">
-        <input type="file" name="file">
-        <input type="submit" value="{{ _('Upload') }}" class="rounded primary button">
-    </p>
+  {% if (typeof(pdoc.data) == 'string') %}
+    <p><b>{{ _('Current dataset comes from') }} <a href="{{ pdoc.data.split('from:')[1] }}" target="_blank">{{ pdoc.data.split('from:')[1] }}</a></b></p>
+  {% else %}
+    <p>{{ _('Current dataset: {0}').format((pdoc['data'] or _('(None)')).toString()) }}</p>
+    <p>{{ _('MD5') }}: {{ md5|default(_('(None)')) }}</p>
+  {% endif %}
+  <p>{{ _('New dataset') }}:
+    <input type="hidden" name="csrfToken" value="{{ handler.csrfToken }}">
+    <input type="file" name="file">
+    <input type="submit" value="{{ _('Upload') }}" class="rounded primary button">
+  </p>
 </form>
 {% endblock %}