From 63abc499f20bf055e9335437204e6084212a3ae4 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Thu, 29 Jul 2021 08:08:54 +0200 Subject: [PATCH] fdfd --- drama/helpers/markdown.py | 9 ------ drama/templates/comments.html | 38 ++++++++++--------------- drama/templates/submission.html | 11 ++----- drama/templates/submission_listing.html | 10 ++----- 4 files changed, 19 insertions(+), 49 deletions(-) diff --git a/drama/helpers/markdown.py b/drama/helpers/markdown.py index 94014029f..d5b393de4 100644 --- a/drama/helpers/markdown.py +++ b/drama/helpers/markdown.py @@ -59,15 +59,6 @@ class RedditorMention2(SpanToken): self.target = (match_obj.group(1), match_obj.group(2)) -# class OpMention(SpanToken): - -# pattern = re.compile("(^|\W|\s)@([Oo][Pp])\b") -# parse_inner = False - -# def __init__(self, match_obj): -# self.target = (match_obj.group(1), match_obj.group(2)) - - class CustomRenderer(HTMLRenderer): def __init__(self, **kwargs): diff --git a/drama/templates/comments.html b/drama/templates/comments.html index f24b9a9c1..75fee5c09 100644 --- a/drama/templates/comments.html +++ b/drama/templates/comments.html @@ -267,7 +267,7 @@
  • Context
  • Copy link
    • - {% if v and v.admin_level>=3 and request.path.startswith ('/admin') %} + {% if v and v.admin_level>=3 %}
  • Remove
  • Approve
    • {% endif %} @@ -318,23 +318,19 @@ >Block user {% endif %} - {% if not v.id==c.author_id and v.admin_level == 1 %} - Ban user - {% endif %} + {% if not v.id==c.author_id and v.admin_level == 1 %} + Ban user + {% endif %} - {% if v.admin_level>=3 %} - {% if not c.is_banned %} - Remove - {% endif %} - {% if c.is_banned or request.path.startswith('/admin/') %} - Approve - {% endif %} - {% endif %} - {% if v.admin_level >=4 and c.oauth_app %} - API App - {% endif %} - {% endif %} + {% if v.admin_level>=3 %} + Remove + Approve + {% endif %} + {% if v.admin_level >=4 and c.oauth_app %} + API App + {% endif %} + {% endif %} {% if v and c.post and (v.admin_level >= 1 or v.id == c.post.author_id) %}
    @@ -505,12 +501,8 @@
  • {{'Undistinguish' if c.distinguish_level else 'Distinguish'}}
    • {% endif %} {% if v.admin_level>=3 %} - {% if not c.is_banned %} -
  • Remove
    • - {% endif %} - {% if c.is_banned or '/admin/' in request.path %} -
  • Approve
    • - {% endif %} +
  • Remove
    • +
  • Approve
    • {% endif %} {% if v.admin_level >=4 and c.oauth_app %}
  • API App
    • diff --git a/drama/templates/submission.html b/drama/templates/submission.html index 6497540f3..5950faf74 100644 --- a/drama/templates/submission.html +++ b/drama/templates/submission.html @@ -143,12 +143,8 @@ {% endif %} - - {% if p.is_banned %} - {% else %} - {% endif %} {% endif %} {% if v.admin_level >=4 and p.oauth_app %} @@ -371,11 +367,8 @@ {% if v %} {% if v.admin_level >=3 %} - {% if p.is_banned %} -
  • Approve
    • - {% else %} -
  • Remove
    • - {% endif %} +
  • Approve
    • +
  • Remove
    • {% endif %} {% if v.admin_level >= 4 and p.oauth_app %} diff --git a/drama/templates/submission_listing.html b/drama/templates/submission_listing.html index 47d0a9bc9..997c41ec7 100644 --- a/drama/templates/submission_listing.html +++ b/drama/templates/submission_listing.html @@ -205,11 +205,8 @@ {% if v %} {% if v.admin_level >=3 %} - {% if p.is_banned %} -
  • Approve
    • - {% else %} -
  • Remove
    • - {% endif %} +
  • Approve
    • +
  • Remove
    • {% endif %} {% if v.admin_level >= 4 and p.oauth_app %} @@ -382,11 +379,8 @@ {% endif %} - {% if p.is_banned %} - {% else %} - {% endif %} {% endif %} {% if v.admin_level >=4 and p.oauth_app %}