From 1712073f3a1b939babe0e19a2122c25a2a279d84 Mon Sep 17 00:00:00 2001 From: Walter Miller Date: Tue, 7 Nov 2023 06:56:10 -0500 Subject: [PATCH] revert change to comments.html --- files/templates/comments.html | 230 +++++++++++++++++----------------- 1 file changed, 115 insertions(+), 115 deletions(-) diff --git a/files/templates/comments.html b/files/templates/comments.html index 8807cb949..6ceef0d21 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -12,141 +12,141 @@ {% set replies = c.replies(v) %} {% if not c.visibility_and_message(v)[0] %} - {% if c.show_descendants(v) or is_notification_page %} -
-
-
-
-
- - - -
-
- {% if render_replies %} -
- {% if level <= RENDER_DEPTH_LIMIT - 1 %} - {% set standalone=false %} - {% for reply in replies %} - {{single_comment(reply, level=level+1)}} - {% endfor %} - {% endif %} -
- {% if replies and level >= RENDER_DEPTH_LIMIT -%} -
- {% if not is_notification_page %}{% endif %} - More comments -
- {%- endif %} - {% endif %} -
+{% if c.show_descendants(v) %} +
+
+
+
+ + + +
+
+ {% if render_replies %} +
+ {% if level <= RENDER_DEPTH_LIMIT - 1 %} + {% set standalone=false %} + {% for reply in replies %} + {{single_comment(reply, level=level+1)}} + {% endfor %} + {% endif %} +
+ {% if replies and level >= RENDER_DEPTH_LIMIT -%} +
+ {% if not is_notification_page %}{% endif %} + More comments +
+ {%- endif %} {% endif %} +
+
+{% endif %} {% else %} - {%- set voted = c.voted_display(v) -%} +{%- set voted = c.voted_display(v) -%} - {% if standalone and level==1 %} -
- {% if c.post and c.post.over_18 %}+18{% endif %} - - {{c.header_msg(v, is_notification_page) | safe}} - +{% if standalone and level==1 %} +
+ {% if c.post and c.post.over_18 %}+18{% endif %} + + {{c.header_msg(v, is_notification_page) | safe}} + +
+{% endif %} + +{% set isreply = not standalone and c.parent_comment and c.parent_comment.sentto %} + +
+ {% if not isreply %} +
+
+
{% endif %} + {%- include 'component/comment/user_info.html' -%} - {% set isreply = not standalone and c.parent_comment and c.parent_comment.sentto %} +
+
+ {%- include 'component/comment/reports.html'-%} + {% if c.state_mod == StateMod.REMOVED and c.state_mod_set_by and v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %} +
removed by @{{c.state_mod_set_by}}
+ {% endif %} -
- {% if not isreply %} -
-
-
+
+ {{c.realbody(v) | safe}}
- {% endif %} - {%- include 'component/comment/user_info.html' -%} - -
-
- {%- include 'component/comment/reports.html'-%} - {% if c.state_mod == StateMod.REMOVED and c.state_mod_set_by and v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %} -
removed by @{{c.state_mod_set_by}}
- {% endif %} - -
- {{c.realbody(v) | safe}} -
- {% if c.parent_submission %} - {%- include 'component/comment/editbox_comment.html' -%} -
-
-
-
    - {% if v and v.admin_level >= 2 %} -
  • - -
    • - {% endif %} - {% if v %} - - {% endif %} - -
  • - + {% if c.parent_submission %} + {%- include 'component/comment/editbox_comment.html' -%} +
    +
    +
    +
      + {% if v and v.admin_level >= 2 %} +
    • +
      • - {%- include 'component/comment/voting_mobile.html' -%} -
    -
    + {% endif %} + {% if v %} + + {% endif %} + +
  • + +
    • + {%- include 'component/comment/voting_mobile.html' -%} +
- -
    -
  • - {%- include 'component/comment/voting_desktop.html' -%} - {%- include 'component/comment/actions_desktop.html' -%} -
    • -
- {% endif %} -
- {% if v and v.id != c.author_id and c.body %} - - {% endif %} - - {%- include 'component/comment/replybox_comment.html' -%} - - {% if is_notification_page and c.is_strict_message and c.author_id not in (NOTIFICATIONS_ID, AUTOJANNY_ID) %} - {%- include 'component/comment/replybox_message.html' -%} - {% endif %} - - {% if render_replies %} - {% if level <= RENDER_DEPTH_LIMIT - 1 or is_notification_page %} -
- {% for reply in replies %} - {{single_comment(reply, level=level+1)}} - {% endfor %} -
- {% elif replies %} -
- - More comments -
- {% endif %} - {% else %} -
+
    +
  • + {%- include 'component/comment/voting_desktop.html' -%} + {%- include 'component/comment/actions_desktop.html' -%} +
    • +
+
{% endif %}
- {%- include 'component/comment/actions_mobile.html' -%} + {% if v and v.id != c.author_id and c.body %} + + {% endif %} - {% if v and v.admin_level >= 2 %} - {%- include 'component/comment/actions_mobile_admin.html' -%} - {% endif %} + {%- include 'component/comment/replybox_comment.html' -%} + + {% if is_notification_page and c.is_strict_message and c.author_id not in (NOTIFICATIONS_ID, AUTOJANNY_ID) %} + {%- include 'component/comment/replybox_message.html' -%} + {% endif %} + + {% if render_replies %} + {% if level <= RENDER_DEPTH_LIMIT - 1 or is_notification_page %} +
+ {% for reply in replies %} + {{single_comment(reply, level=level+1)}} + {% endfor %} +
+ {% elif replies %} +
+ + More comments +
+ {% endif %} + {% else %} +
+ {% endif %}
+ +{%- include 'component/comment/actions_mobile.html' -%} + +{% if v and v.admin_level >= 2 %} + {%- include 'component/comment/actions_mobile_admin.html' -%} +{% endif %} +
{% endif %} {% endmacro %}