diff --git a/files/templates/comments.html b/files/templates/comments.html
index abe3d45da..08ca7997a 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -1,3 +1,7 @@
+{% if v %}
+ {% include "award_modal.html" %}
+{% endif %}
+
-{% if v %}
- {% include "award_modal.html" %}
-
-
-{% endif %}
-
-{% if v and v.admin_level > 1 %}
-
-{% endif %}
-
-
-
-
-{% include "expanded_image_modal.html" %}
-
-
-
{% macro single_comment(c, level=1) %}
-{% if p and not (v and v.id==c.author_id) and (not v or v.highlightcomments) %}
-
-{% endif %}
-
-
-
-
+
-
+
{{c.author.username}}
@@ -109,11 +46,9 @@
{% for b in c.author.badges %}
{% if b.url %}
-
-
-
+
{% else %}
-
+
{% endif %}
{% endfor %}
@@ -155,7 +90,7 @@
-
+
@@ -163,7 +98,7 @@
- {% if standalone and c.over_18 %}+18{% endif %}
+ {% if standalone and c.over_18 %}+18 {% endif %}
{% if c.is_banned %}removed by @{{c.ban_reason}}{% elif c.deleted_utc > 0 %}Deleted by author{% elif c.is_blocking %}You are blocking @{{c.author.username}}{% endif %}
{{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %} {% if v and v.admin_level > 1 %}[remove]{% endif %}
+
{{f.user.username}}{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}[remove]{% endif %}
{% endfor %}
{% endif %}
{% if c.is_banned and c.ban_reason %}
-
Removed by @{{c.ban_reason}}
+
removed by @{{c.ban_reason}}
{% endif %}
-
+
{{c.realbody(v) | safe}}
{% if c.options %}
- {% for o in c.options %}
-
-
-
-
- {% endfor %}
-
+ {{c.options_html(v) | safe}}
{% endif %}
{% if c.author.sig_html and (c.author_id == 1904 or not (v and v.sigs_disabled)) %}
@@ -408,45 +247,230 @@
{% if not c.parent_submission and c.author_id!=NOTIFICATIONS_ID and c.author_id!=AUTOJANNY_ID and c.author_id!=v.id %}
- Reply
+ Reply
-
+
{% endif %}
{% if c.parent_submission %}
-
+
{% if v and v.id==c.author_id %}
- {% include "/comments/CommentEditForm.html" %}
+
+
+ {% if v %}
+ Give Award
+
+ Unsave
+
+ Save
+
+ Reply
+ {% endif %}
+
+ Context
+ Copy link
+ {% if v %}
+ Report
+ {% endif %}
+
+
+ {% if v and c.parent_submission and c.author_id==v.id %}
+
+ Edit
+
+ {% if c.deleted_utc > 0 %}
+ Undelete
+ {% else %}
+ Delete
+ {% endif %}
+
+ {% endif %}
+ {% if v and v.admin_level > 0 and v.id==c.author_id %}
+ Undistinguish
+ Distinguish
+ {% endif %}
+
+ {% if v and not v.id==c.author_id%}
+ Unblock user
+
+ Are you sure?
+
+ Block user
+ {% endif %}
+
+ {% if v and c.post and (v.admin_level > 1 or v.id == c.post.author_id) %}
+ Unpin
+
+ Pin
+ {% endif %}
+
+
+ {% if v and v.admin_level > 1 %}
+ {% if "/reported/" in request.path %}
+ Approve
+ Remove
+ {% else %}
+ Approve
+ Remove
+ {% endif %}
+ {% endif %}
+
+ {% if v and c.parent_submission and (c.author_id==v.id or v.admin_level > 0) %}
+ Unmark +18
+ Mark +18
+ {% endif %}
+
+ {% if v and v.admin_level > 1 and v.id != c.author_id %}
+ Unban user
+ Ban user
+ {% endif %}
+
+ {% if v and v.admin_level > 1 and c.oauth_app %}
+ API App
+ {% endif %}
+
+
+ {% if v and request.path.startswith('/@') and v.admin_level == 0 %}
+ {% if voted==1 %}{% endif %}
+ {% elif v %}
+
+ {% else %}
+
+ {% endif %}
+
{{score}}
+ {% if v and request.path.startswith('/@') and v.admin_level == 0 %}
+ {% if voted==-1 %}
+
+ {% endif %}
+ {% elif v %}
+
+ {% else %}
+
+ {% endif %}
+
{% endif %}
-
-
- {% include "/comments/CommentReplyForm.html" %}
+
+ 
+
{% for f in c.ordered_flags %} -- {{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %} {% if v and v.admin_level > 1 %}[remove]{% endif %}
+ - {{f.user.username}}{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}[remove]{% endif %}
{% endfor %}
+ + {% if v and request.path.startswith('/@') and v.admin_level == 0%} + {% if voted==1 %} + + {% endif %} + {% elif v %} + + + + {% else %} + + + {% endif %} + +-
+ {{score}}
+
+
+ {% if v and request.path.startswith('/@') and v.admin_level == 0 %}
+ {% if voted==-1 %}
+
+ {% endif %}
+ {% elif v %}
+
+
+ {% else %}
+
+
+
+ {% endif %}
+
+ - Votes
+
+ {% if v %}
+ Give Award
+
+ Unsave
+
+ Save
+
+ Reply
+ {% endif %}
+
+ Context
+ Copy link
+ {% if v %}
+ Report
+ {% endif %}
+
+
+ {% if v and c.parent_submission and c.author_id==v.id %}
+
+ Edit
+
+ {% if c.deleted_utc > 0 %}
+ Undelete
+ {% else %}
+ Delete
+ {% endif %}
+
+ {% endif %}
+ {% if v and v.admin_level > 0 and v.id==c.author_id %}
+ Undistinguish
+ Distinguish
+ {% endif %}
+
+ {% if v and not v.id==c.author_id%}
+ Unblock user
+
+ Are you sure?
+
+ Block user
+ {% endif %}
+
+ {% if v and c.post and (v.admin_level > 1 or v.id == c.post.author_id) %}
+ Unpin
+
+ Pin
+ {% endif %}
+
+
+ {% if v and v.admin_level > 1 %}
+ {% if "/reported/" in request.path %}
+ Approve
+ Remove
+ {% else %}
+ Approve
+ Remove
+ {% endif %}
+ {% endif %}
+
+ {% if v and c.parent_submission and (c.author_id==v.id or v.admin_level > 0) %}
+ Unmark +18
+ Mark +18
+ {% endif %}
+
+ {% if v and v.admin_level > 1 and v.id != c.author_id %}
+ Unban user
+ Ban user
+ {% endif %}
+
+ {% if v and v.admin_level > 1 and c.oauth_app %}
+ API App
+ {% endif %}
+
+
+ {% if v and request.path.startswith('/@') and v.admin_level == 0 %}
+ {% if voted==1 %}{% endif %}
+ {% elif v %}
+
+ {% else %}
+
+ {% endif %}
+ - {{score}}
+ {% if v and request.path.startswith('/@') and v.admin_level == 0 %}
+ {% if voted==-1 %}
+
+ {% endif %}
+ {% elif v %}
+
+ {% else %}
+
+ {% endif %}
+
Report 's comment
+ +