Redesign UI

templates/chat/chat.html

@@ -14,6 +14,12 @@ let message_template = `
     {% include "chat/message.html" %}
 {% endwith %}  
 `;
+let META_HEADER = [
+    "{{_('Recent')}}",
+    "{{_('Following')}}",
+    "{{_('Admin')}}",
+    "{{_('Other')}}",
+];
 </script>
 <script type="text/javascript">
     window.currentPage = 1;

templates/chat/user_online_status.html

@@ -26,7 +26,13 @@
     </button>
     <div id="setting-content">
         <li>
-            <a href="{{url('toggle_ignore', other_user.id)}}" style="color: {{'green' if is_ignored else 'red'}}">{{_('Unignore') if is_ignored else _('Ignore')}}</a>
+            <a href="{{url('toggle_ignore', other_user.id)}}" style="color: {{'green' if is_ignored else 'red'}}">
+                {% if is_ignored %}
+                    {{_('Unignore')}}
+                {% else %}
+                    {{_('Ignore')}}
+                {% endif %}
+            </a>
         </li>
     </div>
 </span>

templates/comments/list.html

@@ -1,5 +1,5 @@
 <div id="comments" class="comment-area">
-    <h2><i style="padding-right: 0.3em" class="fa fa-comments"></i>{{ _('Comments') }}</h2>
+    <h2 id="comment-header"><i style="padding-right: 0.3em" class="fa fa-comments"></i>{{ _('Comments') }}</h2>
     {% if has_comments %}
         <ul class="comments top-level-comments new-comments">
             {% set logged_in = request.user.is_authenticated %}

templates/problem/comments.html

@@ -0,0 +1,25 @@
+{% extends "common-content.html" %}
+
+{% block content_js_media %}
+    {% include "comments/media-js.html" %}
+{% endblock %}
+
+{% block content_media %}
+    {% include "comments/media-css.html" %}
+    <style>
+        #comment-header {
+            display: none;
+        }
+    </style>
+{% endblock %}
+
+{% block body %}
+    {% include "comments/list.html" %}
+{% endblock %}
+
+{% block bodyend %}
+    {% if REQUIRE_JAX %}
+        {% include "mathjax-load.html" %}
+    {% endif %}
+    {% include "comments/math.html" %}
+{% endblock %}

templates/problem/problem.html

@@ -1,6 +1,5 @@
 {% extends "common-content.html" %}
 {% block content_media %}
-    {% include "comments/media-css.html" %}
     <style>
         .title-state {
             font-size: 2em;
@@ -59,7 +58,6 @@
 {% endblock %}
 
 {% block content_js_media %}
-    {% include "comments/media-js.html" %}
     {% if request.in_contest %}
         <script type="text/javascript">
             window.register_contest_notification("{{url('contest_clarification_ajax', request.participation.contest.key)}}");
@@ -166,9 +164,10 @@
     {% endif %}
     <div><a href="{{ url('chronological_submissions', problem.code) }}">{{ _('All submissions') }}</a></div>
     <div><a href="{{ url('ranked_submissions', problem.code) }}">{{ _('Best submissions') }}</a></div>
+    <hr>
+    <div><a href="{{ url('problem_comments', problem.code) }}">{{ _('Discuss') }}</a></div>
     {% if editorial and editorial.is_public and 
             not (request.user.is_authenticated and request.profile.current_contest) %}
-        <hr>
         <div><a href="{{ url('problem_editorial', problem.code) }}">{{ _('Read editorial') }}</a></div>
     {% endif %}
     {% if can_edit_problem %}
@@ -345,7 +344,8 @@
 
 {% block post_description_end %}
     {% if request.user.is_authenticated and not request.profile.mute %}
-        <a href="{{ url('new_problem_ticket', problem.code) }}" class="button clarify">
+        <a href="{{ url('new_problem_ticket', problem.code) }}" class="clarify">
+            <i class="fa fa-flag" style="margin-right:0.5em"></i>
             {%- if contest_problem and contest_problem.contest.use_clarifications and request.profile.current_contest.live -%}
                 {{ _('Request clarification') }}
             {%- else -%}
@@ -372,8 +372,6 @@
                 <p class="no-comments-message">{{ _('No clarifications have been made at this time.') }}</p>
             {% endif %}
         </div>
-    {% else %}
-        {% include "comments/list.html" %}
     {% endif %}
     <iframe name="raw_problem" id="raw_problem"></iframe>
 {% endblock %}

templates/user/user-base.html

@@ -112,6 +112,14 @@
                     <input type="submit" value="{{ _('View submissions') }}" style="width:135px">
                 </form>
             </div>
+            <br>
+            <div>
+                <form action="{{ url('get_or_create_room') }}" method="POST">
+                    {% csrf_token %}
+                    <input type="hidden" value="{{ chat_param(request.profile, user)}}" name="other">
+                    <input type="submit" value="{{ _('Send message') }}" style="width:135px">
+                </form>
+            </div>
 
             {% if ratings %}
                 <br>