Merge branch 'master' into remove-union

packages/ui-default/templates/contest_manage.html

@@ -2,6 +2,7 @@
 {% import "components/contest.html" as contest with context %}
 {% import "components/problem.html" as problem with context %}
 {% block content %}
+{{ set(UiContext, 'tdoc', tdoc) }}
 <div class="row">
   <div class="medium-9 columns">
     <div class="row">

packages/ui-default/templates/partials/homepage/starred_problems.html

@@ -1,5 +1,4 @@
 {% set pdocs = payload[0] %}
-{% set psdict = payload[1] %}
 {% if pdocs.length %}
   <div class="section side nojs--hide">
     <div class="section__header">
@@ -7,15 +6,9 @@
     </div>
     <div class="section__body typo no-media col--problem-name">
       {%- for pdoc in pdocs -%}
-        <form class="form--inline" action="{{ url('problem_main') }}" method="post">
-          <input type="hidden" name="pid" value="{{ pdoc.docId }}">
-          <input type="hidden" name="operation" value="unstar">
-          <button class="star activated" type="submit">
-            <span class="starred--hide"><span class="icon icon-star--outline" data-tooltip="{{ _('Star') }}"></span></span>
-            <span class="starred--show"><span class="icon icon-star" data-tooltip="{{ _('Unstar') }}"></span></span>
-          </button>
-        </form>
-        {{ problem.render_problem_title(pdoc, show_tags=false, show_invisible_flag=false) }}<br/>
+        <p data-pid="{{ pdoc.docId }}" data-star="true">
+          {{ problem.render_problem_title(pdoc, show_tags=false, show_invisible_flag=false) }}
+        </p>
       {%- endfor -%}
     </div>
   </div>

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

@@ -54,17 +54,7 @@
             <td class="col--status record-status--border edit-mode-hide"></td>
           {% endif %}
         {% endif %}
-        <td class="col--name col--problem-name">
-          {% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %}
-            <form class="form--inline" action="{{ url('problem_main', domainId = pdoc.domainId) }}" method="post">
-              <input type="hidden" name="pid" value="{{ pdoc.docId }}">
-              <input type="hidden" name="operation" value="{{ "star" if not psdoc.star else "unstar" }}">
-              <button class="star{% if psdoc.star %} activated{% endif %}" type="submit">
-                <span class="starred--hide"><span class="icon icon-star--outline" data-tooltip="{{ _('Star') }}"></span></span>
-                <span class="starred--show"><span class="icon icon-star" data-tooltip="{{ _('Unstar') }}"></span></span>
-              </button>
-            </form>
-          {% endif %}
+        <td class="col--name col--problem-name" {% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %} data-star="{{ psdoc.star }}"{% endif %}>
           {{ problem.render_problem_title(pdoc) }}
         </td>
         <td class="col--ac-tried">{{ pdoc.nAccept }} / {{ pdoc.nSubmit }}</td>

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

@@ -103,7 +103,7 @@
                   {% set pdoc=pdict[pid] %}
                   {% set psdoc=psdict[pid] %}
                   {% set self_psdoc=selfPsdict[pid] %}
-                  <tr>
+                  <tr data-pid="{{ pid }}">
                     {% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %}
                       {% if psdoc['rid'] %}
                         {{ record.render_status_td(psdoc, rid_key='rid', short=should_compare) }}
@@ -118,17 +118,7 @@
                         {% endif %}
                       {% endif %}
                     {% endif %}
-                    <td class="col--name col--problem-name">
-                      {% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %}
-                        <form class="form--inline" action="{{ url('problem_main') }}" method="post">
-                          <input type="hidden" name="pid" value="{{ pdoc.docId }}">
-                          <input type="hidden" name="operation" value="{% if not psdoc['star'] %}star{% else %}unstar{% endif %}">
-                          <button class="star{% if psdoc['star'] %} activated{% endif %}" type="submit">
-                            <span class="starred--hide"><span class="icon icon-star--outline" data-tooltip="{{ _('Star') }}"></span></span>
-                            <span class="starred--show"><span class="icon icon-star" data-tooltip="{{ _('Unstar') }}"></span></span>
-                          </button>
-                        </form>
-                      {% endif %}
+                    <td class="col--name col--problem-name"{% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %} data-star="{{ psdoc.star }}"{% endif %}>
                       {{ problem.render_problem_title(
                         pdoc,
                         invalid=not tsdoc['enroll'] or nsdict[node['_id']]['isInvalid'],

packages/ui-default/templates/problem_detail.html

@@ -36,9 +36,9 @@
             </a>
           {% endif %}
           {% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) and not tdoc %}
-            <form class="form--inline" action="{{ url('problem_main') }}" method="post">
-              <input type="hidden" name="pid" value="{{ pdoc.docId }}">
-              <input type="hidden" name="operation" value="{{ "star" if not psdoc.star else "unstar" }}">
+            <form class="form--inline" action="" method="post">
+              <input type="hidden" name="star" value="{{ 'true' if not psdoc.star else 'false' }}">
+              <input type="hidden" name="operation" value="star">
               <button class="star{% if psdoc.star %} activated{% endif %}" type="submit">
                 <span class="starred--hide"><span class="icon icon-star--outline" data-tooltip="{{ _('Star') }}"></span></span>
                 <span class="starred--show"><span class="icon icon-star" data-tooltip="{{ _('Unstar') }}"></span></span>