Merge branch 'master' of https://github.com/LQDJudge/online-judge

templates/problem/problem.html

@@ -399,6 +399,17 @@
             </div>
         </div>
     {% endif %}
+    {% if not (contest_problem and contest_problem.contest.use_clarifications) %}
+        <div id="comment-announcement-container">
+            <div id="comment-announcement">
+                {% if has_comments %}
+                    {{_('View comments')}} ({{comment_list.count()}})
+                {% else %}
+                    {{_('Be the first to comment')}}
+                {% endif %}
+            </div>
+        </div>
+    {% endif %}
 {% endblock %}
 
 {% block comments %}

templates/ticket/feed.html

@@ -1,11 +1,11 @@
 <div class="blog-box">
     <h3 class="problem-feed-name">
+        <a href="{{ ticket.linked_item.get_absolute_url() }}">
+            {{ ticket.linked_item|item_title }}</a>
+        &#183
         <a href="{{ url('ticket', ticket.id) }}">
             {{ ticket.title }}
         </a>
-        -
-        <a href="{{ ticket.linked_item.get_absolute_url() }}">
-            {{ ticket.linked_item|item_title }}</a>
     </h3>
     {% with author=ticket.user %}
         {% if author %}