题目搜索，收藏功能

templates/discussion_main_or_node.html

@@ -38,6 +38,7 @@
       </div>
     </div>
   {% endif %}
+  {% include 'partials/discussion_nodes_widget.html' %}
   </div>
 </div>
 {% endblock %}

templates/main.html

@@ -3,12 +3,12 @@
 {% extends "layout/basic.html" %}
 {% import "components/contest.html" as contest with context %}
 {% block content %}
-{% if system['bulletin'] %}
+{% if domain['bulletin'] %}
 <div class="row">
   <div class="large-12 columns">
     <div class="section">
       <div class="section__body typo">
-        {{ system['bulletin']|markdown }}
+        {{ domain['bulletin']|markdown|safe }}
       </div>
     </div>
   </div>
@@ -158,7 +158,7 @@
   </div>
   <div class="large-3 columns">
   {% if handler.hasPerm(perm.PERM_VIEW_DISCUSSION) %}
-    {#{% include 'discussion_nodes_widget.html' %} // TODO(masnn) #}
+    {% include 'partials/discussion_nodes_widget.html' %}
   {% endif %}
     <div class="section side">
       <div class="section__header">

templates/partials/discussion_nodes_widget.html

@@ -0,0 +1,17 @@
+<div class="section side">
+  <div class="section__header">
+    <h1 class="section__title">{{ _('Discussion Nodes') }}</h1>
+  </div>
+  <div class="section__body"><ul class="group-list">
+  {%- for category, nodes in vnodes|groupby('content') -%}
+    <li class="group-list__item">
+      <h2 class="section__title">{{ category }}</h2>
+      <ol class="chip-list">
+      {%- for node in nodes -%}
+        <li class="chip-list__item"><a class="typo-a" href="{{ url('discussion_node', type=model.discussion.typeDisplay[model.document.TYPE_DISCUSSION_NODE], name=node.docId) }}">{{ node.docId }}</a></li>
+      {%- endfor -%}
+      </ol>
+    </li>
+  {%- endfor -%}
+  </ul></div>
+</div>

templates/problem_main.html

@@ -50,10 +50,10 @@
                 <div class="section__header">
                     <h1 class="section__title">{{ _('Search') }}</h1>
                 </div>
-                <form method="get" action="{{ url('problem_search') }}">
+                <form method="get" action="{{ url('problem_main') }}">
                     <div class="section__body">
                         <label>
-                            <input name="q" type="text" class="textbox" value="" placeholder="1001">
+                            <input name="q" type="text" class="textbox" value="{{ category }}" placeholder="1001">
                         </label>
                         <button type="submit" class="primary button">{{ _('Search') }}</button>
                     </div>

templates/training_detail.html

@@ -153,9 +153,7 @@
         </div>
       </div>
       {% endfor %}
-
       <div class="section__body">&nbsp;<!-- space placeholder --></div>
-
     </div>
   </div>
   <div class="medium-3 columns">
@@ -194,7 +192,7 @@
           {% endif %}
           <dt>{{ _('Enrollees') }}</dt><dd>{{ tdoc['enroll']|default(0) }}</dd>
           <dt>{{ _('Created By') }}</dt>
-          <dd>{{ user.render_inline(owner_udoc, badge=false) }}</dd>
+          <dd>{{ user.render_inline(owner, badge=false) }}</dd>
         </dl>
       </div>
     </div>