Merge branch 'master' into milkdown

packages/ui-default/templates/components/problem.html

@@ -21,7 +21,7 @@
 {%- if pdoc.tag|length > 0 %}
   {%- if not inline %}<ul class="problem__tags">{% endif -%}
   {%- for tag in pdoc['tag'] %}
-    <li class="problem__tag"><a class="problem__tag-link" href="{{ url('problem_category', category=tag) }}">{{ tag }}</a></li>
+    <li class="problem__tag"><a class="problem__tag-link" href="{{ url('problem_main', query={q:'category:'+tag}) }}">{{ tag }}</a></li>
   {%- endfor -%}
   {%- if not inline %}</ul>{% endif -%}
 {%- else -%}

packages/ui-default/templates/contest_detail.html

@@ -11,14 +11,14 @@
         <h1 class="section__title">{{ tdoc.title }}</h1>
       </div>
       <div class="section__body">
-        <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _(model.contest.statusText(tdoc)) }}</span>
-        <span class="bp3-tag bp3-large bp3-minimal problem__tag-item icon icon-award">{{ _(model.contest.RULES[tdoc.rule].TEXT) }}</span>
-        <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _('Start at') }}: {{ contest.render_time(tdoc.beginAt) }}</span>
-        <span class="bp3-tag bp3-large bp3-minimal problem__tag-item icon icon-schedule">{{ contest.render_duration(tdoc) }} {{ _('hour(s)') }}</span>
-        <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _('Host') }}: {{ user.render_inline(udict[tdoc.owner], badge=false) }}</span>
-        <span class="bp3-tag bp3-large bp3-minimal problem__tag-item icon icon-user--multiple">{{ tdoc['attend']|default(0) }}</span>
+        <span class="bp4-tag bp4-large bp4-minimal problem__tag-item">{{ _(model.contest.statusText(tdoc)) }}</span>
+        <span class="bp4-tag bp4-large bp4-minimal problem__tag-item icon icon-award">{{ _(model.contest.RULES[tdoc.rule].TEXT) }}</span>
+        <span class="bp4-tag bp4-large bp4-minimal problem__tag-item">{{ _('Start at') }}: {{ contest.render_time(tdoc.beginAt) }}</span>
+        <span class="bp4-tag bp4-large bp4-minimal problem__tag-item icon icon-schedule">{{ contest.render_duration(tdoc) }} {{ _('hour(s)') }}</span>
+        <span class="bp4-tag bp4-large bp4-minimal problem__tag-item">{{ _('Host') }}: {{ user.render_inline(udict[tdoc.owner], badge=false) }}</span>
+        <span class="bp4-tag bp4-large bp4-minimal problem__tag-item icon icon-user--multiple">{{ tdoc['attend']|default(0) }}</span>
         {% if tsdoc.attend %}
-          <span class="bp3-tag bp3-large bp3-minimal problem__tag-item icon icon-check">{{ _('Attended') }}</span>
+          <span class="bp4-tag bp4-large bp4-minimal problem__tag-item icon icon-check">{{ _('Attended') }}</span>
         {% endif %}
       </div>
     </div>

packages/ui-default/templates/domain_join_applications.html

@@ -7,10 +7,10 @@
   </div>
   <div class="section__body typo">
     <p>{{ _('User can join this domain by visiting the following URL') }}:</p>
-    <pre><code class="language-data">{{ url_prefix|safe }}domain/join?domainId={{ handler.args.domainId }}</code></pre>
+    <pre><code class="language-data">{{ url_prefix|safe }}d/{{ handler.args.domainId }}/domain/join</code></pre>
     {% if joinSettings['method'] == model.domain.JOIN_METHOD_CODE %}
       <p>{{ _('Or, with automatically filled invitation code') }}:</p>
-      <pre><code class="language-data">{{ url_prefix|safe }}domain/join?domainId={{ handler.args.domainId }}&code={{ joinSettings.code|urlencode }}</code></pre>
+      <pre><code class="language-data">{{ url_prefix|safe }}d/{{ handler.args.domainId }}/domain/join?code={{ joinSettings.code|urlencode }}</code></pre>
     {% endif %}
     {% if joinSettings.expire %}
       <br/>

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

@@ -2,13 +2,13 @@
   {%- for category, sub_categories in model.system.get('problem.categories')|parseYaml -%}
     <li class="group-list__item">
       <h2 class="section__title">
-        <a href="{{ url('problem_category', category=category) }}" data-category="{{ category }}">{{ category }}</a>
+        <a href="{{ url('problem_main', query={q:'category:'+category}) }}" data-category="{{ category }}">{{ category }}</a>
       </h2>
       {% if sub_categories | length > 0 %}
         <ol class="chip-list">
           {%- for sub_category in sub_categories -%}
             <li class="chip-list__item">
-              <a class="typo-a" href="{{ url('problem_category', category=(category + ',' + sub_category)) }}">{{ sub_category }}</a>
+              <a class="typo-a" href="{{ url('problem_main', query={q:'category:'+sub_category}) }}">{{ sub_category }}</a>
             </li>
           {%- endfor -%}
         </ol>

packages/ui-default/templates/partials/problem-sidebar-information.html

@@ -11,24 +11,6 @@
     <dd>{{ pdoc.config.memoryMax if pdoc.config.memoryMax == pdoc.config.memoryMin else pdoc.config.memoryMin+'~'+pdoc.config.memoryMax }}MiB</dd>
     <dt>{{ _('Difficulty') }}</dt>
     <dd>{{ pdoc['difficulty'] or lib.difficulty(pdoc.nSubmit, pdoc.nAccept) or _('(None)') }}</dd>
-    <dt>{{ _('Category') }}</dt>
-    <dd>
-      {% if pdoc['category'] %}
-        <span class="hasjs--hide" name="problem-sidebar__categories">
-        {%- for category in pdoc['category'] -%}
-          <a href="{{ url('problem_category', category=category) }}">{{ category }}</a>
-          {% if loop.index < pdoc['category']|length %}
-            {{ _('problem-subcategory-delim') }}
-          {% endif %}
-        {%- endfor -%}
-        </span>
-        <span class="nojs--hide">
-          <a href="javascript:;" name="problem-sidebar__show-category">{{ _('page.problem_detail.sidebar.show_category') }}</a>
-        </span>
-      {% else %}
-        {{ _('(None)') }}
-      {% endif %}
-    </dd>
     <dt>{{ _('Tags') }}</dt>
     <dd>
       {{ problem.render_problem_tags(pdoc, true) }}

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

@@ -6,7 +6,7 @@
 {% if not pdocs.length %}
   {{ nothing.render('Sorry, there is no problem in the problem set') }}
 {% else %}
-  {{ paginator.render(page, ppcount, position='top', add_qs=qs) }}
+  {{ paginator.render(page, ppcount, position='top', add_qs=('q=' + qs if qs else '')) }}
   <table class="data-table hide-problem-tag">
     <colgroup>
       <col class="col--checkbox display-mode-hide">
@@ -73,6 +73,6 @@
     {%- endfor -%}
     </tbody>
   </table>
-  {{ paginator.render(page, ppcount, add_qs=qs) }}
+  {{ paginator.render(page, ppcount, add_qs=('q=' + qs if qs else '')) }}
 {% endif %}
 </div>

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

@@ -1,6 +1,6 @@
 <div data-fragment-id="problem_lucky">
   <p>
-    <a href="{{ url('problem_random', query={category:category}) if category else url('problem_random') }}" class="expanded button" target="_blank">
+    <a href="{{ url('problem_random', query={q:qs}) if qs else url('problem_random') }}" class="expanded button" target="_blank">
       <span class="icon icon-feeling-lucky"></span> {{ _('Lucky') }}
     </a>
   </p>

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

@@ -0,0 +1,48 @@
+{% import "components/nothing.html" as nothing with context %}
+{% import "components/problem.html" as problem with context %}
+<div class="section side section--problem-sidebar-additional_file">
+  <div class="section__header">
+    <h1 class="section__title">{{ additional_file.length|default(0) }} {{_('Additional File')}}</h1>
+  </div>
+  <ol class="menu">
+    <li class="menu__item flex-row">
+      <a class="menu__link half" href="javascript:;" name="additional_file__upload">
+        <span class="icon icon-upload"></span> {{ _('Upload') }}
+      </a>
+      <a class="menu__link half" href="javascript:;" name="additional_file__download">
+        <span class="icon icon-download"></span> {{ _('Download All') }}
+      </a>
+    </li>
+  </ol>
+  <div class="section__body no-padding problem-sidebar-additional_file__detail" data-fragment-id="problem-sidebar-additional_file">
+    {% if additional_file.length %}
+      <table class="data-table additionalfile-table">
+        <colgroup>
+          <col class="col--name">
+          <col class="col--size">
+          <col class="col--operation">
+        </colgroup>
+        <thead>
+          <tr>
+            <th class="col--name">{{ _('Filename') }}</th>
+            <th class="col--size">{{ _('Size') }}</th>
+            <th class="col--operation"><span class="icon icon-wrench"></span></th>
+          </tr>
+        </thead>
+        <tbody>
+          {%- for file in additional_file -%}
+          <tr data-filename="{{ file.name }}" data-size="{{ file.size }}">
+            <td class="col--name" title="{{ file.name }}">
+              <a href="{{ url('problem_file_download', {pid: pdoc.docId, filename: file.name}) }}">{{ file.name }}</a>
+            </td>
+            <td class="col--size">{{ size(file.size) }}</td>
+            <td class="col--operation"><a href="javascript:;"name="additional_file__delete"><span class="icon icon-delete"></span></a></td>
+          </tr>
+          {%- endfor -%}
+        </tbody>
+      </table>
+    {% else %}
+      {{ nothing.render('No additional file at current.',compact = true) }}
+    {% endif %}
+  </div>
+</div>

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

@@ -83,6 +83,9 @@
       <li class="menu__item"><a class="menu__link{% if page_name == 'problem_edit' %} active{% endif %}" href="{{ url('problem_edit', pid=pdoc.pid|default(pdoc.docId)) }}">
         <span class="icon icon-edit"></span> {{ _('Edit') }}
       </a></li>
+      <li class="menu__item"><a class="menu__link{% if page_name == 'problem_config' %} active{% endif %}" href="{{ url('problem_config', pid=pdoc.pid|default(pdoc.docId)) }}">
+        <span class="icon icon-settings"></span> {{ _('Judge Config') }}
+      </a></li>
     {% endif %}
     {% if page_name == 'problem_detail' %}
       <li class="menu__seperator nojs--hide"></li>
@@ -100,14 +103,14 @@
     </ol>
   </div>
 </div>
-{% if page_name != 'problem_detail' and page_name != 'homework_detail_problem' and page_name != 'contest_detail_problem' %}
+{% if page_name not in ['problem_config', 'problem_detail', 'homework_detail_problem', 'contest_detail_problem'] %}
 <div class="section side">
   <div class="section__header">
     <h1 class="section__title">{{ _('Information') }}</h1>
   </div>
   {% include "partials/problem-sidebar-information.html" %}
 </div>
-{% elif page_name != 'contest_detail_problem' %}
+{% elif page_name != 'contest_detail_problem' and page_name != 'problem_config' %}
 <div class="section side nojs--hide">
   <div class="section__header">
     <h1 class="section__title">{{ _('Statistics') }}</h1>

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

@@ -0,0 +1,47 @@
+{% import "components/nothing.html" as nothing with context %}
+{% import "components/problem.html" as problem with context %}
+<div class="section side section--problem-sidebar-testdata">
+  <div class="section__header">
+    <h1 class="section__title">{{ testdata.length if testdata.length else 0 }} {{_('Testdata')}}</h1>
+  </div>
+  <ol class="menu">
+    <li class="menu__item flex-row">
+      <a class="menu__link half" href="javascript:;" name="testdata__upload">
+        <span class="icon icon-upload"></span> {{ _('Upload') }}
+      </a>
+      <a class="menu__link half" href="javascript:;" name="testdata__download">
+        <span class="icon icon-download"></span> {{ _('Download All') }}
+      </a>
+    </li>
+    <li class="menu__seperator"></li>
+  </ol>
+  <div class="section__body no-padding problem-sidebar-testdata__detail" data-fragment-id="problem-sidebar-testdata">
+    {% if testdata.length %}
+      <table class="data-table testdata-table">
+        <colgroup>
+          <col class="col--name">
+          <col class="col--size">
+          <col class="col--operation">
+        </colgroup>
+        <thead>
+          <tr>
+            <th class="col--name">{{ _('Filename') }}</th>
+            <th class="col--size">{{ _('Size') }}</th>
+            <th class="col--operation"><span class="icon icon-wrench"></span></th>
+          </tr>
+        </thead>
+        <tbody>
+          {%- for file in testdata -%}
+          <tr data-filename="{{ file.name }}" data-size="{{ file.size }}">
+            <td class="col--name" title="{{ file.name }}"><a href="{{ url('problem_file_download', {pid: pdoc.docId, filename: file.name, query:{type:'testdata'} }) }}">{{ file.name }}</a></td>
+            <td class="col--size">{{ size(file.size) }}</td>
+            <td class="col--operation"><a href="javascript:;" name="testdata__delete"><span class="icon icon-delete"></span></a></td>
+          </tr>
+          {%- endfor -%}
+        </tbody>
+      </table>
+    {% else %}
+      {{ nothing.render('No testdata at current.', compact = true) }}
+    {% endif %}
+  </div>
+</div>

packages/ui-default/templates/problem_config.html

@@ -0,0 +1,21 @@
+{% extends "layout/basic.html" %}
+{% block content %}
+<div class="row">
+  <div class="medium-9 columns">
+    <div class="section">
+      <div class="section__header">
+        <h1 class="section__title">{{_('Judge Config')}}(Beta)</h1>
+      </div>
+      <div id="ProblemConfig" class="section__body">
+        {{ noscript_note.render() }}
+        <div class="loader-container"><div class="loader"></div></div>
+      </div>
+    </div>
+  </div>
+  <div class="medium-3 columns">
+    {% include "partials/problem_sidebar_testdata.html" %}
+    {% set owner_udoc = udoc %}
+    {% include "partials/problem_sidebar.html" %}
+  </div>
+</div>
+{% endblock %}

packages/ui-default/templates/problem_detail.html

@@ -49,22 +49,22 @@
       </div>
       <div class="section__body">
         <ul class="problem__tags">
-          <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _('ID') }}: {{ pdoc.docId }}</span>
-          <span class="bp3-tag bp3-large bp3-minimal problem__tag-item icon icon-book">{{ _('problem_type.' + pdoc.config.type).format(pdoc.config.subType) }}</span>
+          <span class="bp4-tag bp4-large bp4-minimal problem__tag-item">{{ _('ID') }}: {{ pdoc.docId }}</span>
+          <span class="bp4-tag bp4-large bp4-minimal problem__tag-item icon icon-book">{{ _('problem_type.' + pdoc.config.type).format(pdoc.config.subType) }}</span>
           {% if pdoc.config.type != 'objective' and pdoc.config.type != 'submit_answer' %}
-            <span class="bp3-tag bp3-large bp3-minimal problem__tag-item icon icon-stopwatch">{{ pdoc.config.timeMax if pdoc.config.timeMax == pdoc.config.timeMin else pdoc.config.timeMin+'~'+pdoc.config.timeMax }}ms</span>
-            <span class="bp3-tag bp3-large bp3-minimal problem__tag-item icon icon-comparison">{{ pdoc.config.memoryMax if pdoc.config.memoryMax == pdoc.config.memoryMin else pdoc.config.memoryMin+'~'+pdoc.config.memoryMax }}MiB</span>
+            <span class="bp4-tag bp4-large bp4-minimal problem__tag-item icon icon-stopwatch">{{ pdoc.config.timeMax if pdoc.config.timeMax == pdoc.config.timeMin else pdoc.config.timeMin+'~'+pdoc.config.timeMax }}ms</span>
+            <span class="bp4-tag bp4-large bp4-minimal problem__tag-item icon icon-comparison">{{ pdoc.config.memoryMax if pdoc.config.memoryMax == pdoc.config.memoryMin else pdoc.config.memoryMin+'~'+pdoc.config.memoryMax }}MiB</span>
           {% endif %}
           {% if not tdoc %}
-            <a class="bp3-tag bp3-large bp3-minimal bp3-interactive problem__tag-item" href="{{ url('record_main', query={pid:pdoc.docId}) }}">{{ _('Tried') }}: {{ pdoc.nSubmit }}</a>
-            <a class="bp3-tag bp3-large bp3-minimal bp3-interactive problem__tag-item" href="{{ url('record_main', query={pid:pdoc.docId, status:1}) }}">{{ _('Accepted') }}: {{ pdoc.nAccept if ((not tdoc) or showAccept) else '?' }}</a>
-            <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _('Difficulty') }}: {{ pdoc['difficulty'] or lib.difficulty(pdoc.nSubmit, pdoc.nAccept) or _('(None)') }}</span>
+            <a class="bp4-tag bp4-large bp4-minimal bp4-interactive problem__tag-item" href="{{ url('record_main', query={pid:pdoc.docId}) }}">{{ _('Tried') }}: {{ pdoc.nSubmit }}</a>
+            <a class="bp4-tag bp4-large bp4-minimal bp4-interactive problem__tag-item" href="{{ url('record_main', query={pid:pdoc.docId, status:1}) }}">{{ _('Accepted') }}: {{ pdoc.nAccept if ((not tdoc) or showAccept) else '?' }}</a>
+            <span class="bp4-tag bp4-large bp4-minimal problem__tag-item">{{ _('Difficulty') }}: {{ pdoc['difficulty'] or lib.difficulty(pdoc.nSubmit, pdoc.nAccept) or _('(None)') }}</span>
           {% endif %}
-          <span class="bp3-tag bp3-large bp3-minimal bp3-interactive problem__tag-item">{{ _('Uploaded By') }}: {{ user.render_inline(udoc, badge=false) }}</span>
+          <span class="bp4-tag bp4-large bp4-minimal bp4-interactive problem__tag-item">{{ _('Uploaded By') }}: {{ user.render_inline(udoc, badge=false) }}</span>
           {% if pdoc.tag.length %}
-            <span name="show_tags" class="bp3-tag bp3-large bp3-minimal bp3-interactive problem__tag-item nojs--hide icon icon-tag">{{ _('Tags') + '>' }}</span>
+            <span name="show_tags" class="bp4-tag bp4-large bp4-minimal bp4-interactive problem__tag-item nojs--hide icon icon-tag">{{ _('Tags') + '>' }}</span>
             {%- for tag in pdoc.tag -%}
-              <span class="bp3-tag bp3-large bp3-minimal problem__tag-item tags hasjs--hide">{{ tag }}</span>
+              <span class="bp4-tag bp4-large bp4-minimal problem__tag-item tags hasjs--hide">{{ tag }}</span>
             {%- endfor -%}
           {% endif %}
         </ul>

packages/ui-default/templates/problem_edit.html

@@ -92,14 +92,15 @@
     </div>
   </div>
   <div class="medium-3 columns">
-    <div class="section side visiable nojs--hide">
+    <div class="section side visiable nojs--hide section--problem-sidebar-tags">
       <div class="section__header">
         <h1 class="section__title">{{ _('Categories') }} ({{ _('click to add') }})</h1>
       </div>
-      <div class="section__body">
+      <div class="section__body problem-sidebar-tags__detail">
         {% include "partials/category.html" %}
       </div>
     </div>
+    {% include "partials/problem_sidebar_additional_file.html" %}
     {% if page_name == 'problem_edit' %}
       {% set owner_udoc = udoc %}
       {% include "partials/problem_sidebar.html" %}

packages/ui-default/templates/problem_files.html

@@ -7,8 +7,9 @@
         <h1 class="section__title">{{ _('Testdata') }}</h1>
         <div class="section__tools">
           {% if not reference and (handler.user.own(pdoc, perm.PERM_EDIT_PROBLEM_SELF) or handler.user.hasPerm(perm.PERM_EDIT_PROBLEM)) %}
-            <button class="primary rounded button" name="create_testdata">{{ _('Create File') }}</button>
-            <button class="primary rounded button" name="upload_testdata">{{ _('Upload File') }}</button>
+            <a href="{{ url('problem_config', pid=pdoc.docId) }}" class="primary rounded button">{{ _('Config') }}</a>
+            <button class="primary rounded button" name="create_testdata">{{ _('Create') }}</button>
+            <button class="primary rounded button" name="upload_testdata">{{ _('Upload') }}</button>
           {% endif %}
         </div>
       </div>

packages/ui-default/templates/problem_main.html

@@ -3,8 +3,6 @@
 {% extends "layout/basic.html" %}
 {% block content %}
   {{ set(UiContext, {
-      getProblemUrlWithCategory: url('problem_category', category='{category}'),
-      getProblemUrlWithoutCategory: url('problem_main'),
       currentCategory: category
   }) }}
   <div class="row">
@@ -13,7 +11,7 @@
         <div class="section__body no-padding">
           <form method="get" id="searchForm" action="{{ url('problem_main') }}">
             <div class="search">
-              <input name="q" type="text" value="{{ category }}" placeholder="{{ _('Search') }}">
+              <input name="q" type="text" value="{{ qs }}" placeholder="{{ _('Search') }}">
               {% include "partials/problem_stat.html" %}
               <button type="submit">
                 <span class="icon icon-search"></span>