From ededc24426a368d9511555aedf8a0b74c3d0606a Mon Sep 17 00:00:00 2001
From: Aevann1 <Aevann1@protonmail.com>
Date: Sat, 31 Jul 2021 13:18:34 +0200
Subject: [PATCH] dffd

---
 drama/templates/comments.html           | 15 ++++++-------
 drama/templates/submission.html         | 28 ++++++++++++-------------
 drama/templates/submission_listing.html |  8 -------
 3 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/drama/templates/comments.html b/drama/templates/comments.html
index ec50c297a..42f5d55b1 100644
--- a/drama/templates/comments.html
+++ b/drama/templates/comments.html
@@ -439,8 +439,9 @@
 
 				{% endif %}
 
-					{% if v and c.parent_submission and (c.author_id==v.id or v.admin_level > 0) %}
-					<li class="list-group-item"><a class="text-danger d-block" href="javascript:void(0)" onclick="post('/toggle_comment_nsfw/{{c.id}}', function(){window.location.reload(true);})"><i class="fas fa-eye-evil text-danger"></i>Toggle +18</a></li>
+					{% if v and c.post and (v.admin_level >= 1 or v.id == c.post.author_id) and c.level == 1 %}
+						<li class="list-group-item"><a class="d-block text-info" id="pin-comment-{{c.id}}" href="javascript:void(0)" data-dismiss="modal" data-target="#actionsModal-{{c.id}}" onclick="post('/comment_pin/{{c.id}}', function(){window.location.reload(true);})"><i class="fas fa-thumbtack fa-rotate--45 text-info"></i>{{'Unpin' if c.is_pinned else 'Pin'}}</a>
+						</li>
 					{% endif %}
 
 					{% if v %}
@@ -448,8 +449,8 @@
 								<li class="list-group-item"><a class="d-block" id="distinguish-{{c.id}}" href="javascript:void(0)" onclick="admin_comment('{{c.id}}')"><i class="fas fa-id-badge"></i>{{'Undistinguish' if c.distinguish_level else 'Distinguish'}}</a></li>
 							{% endif %}
 							{% if v.admin_level>=3 %}
-								<li class="list-group-item"><a class="text-danger d-block" href="javascript:void(0)" onclick="removeComment('{{c.id}}')"><i class="fas fa-ban text-danger"></i>Remove</a></li>
 								<li class="list-group-item"><a class="text-success d-block" href="javascript:void(0)" onclick="approveComment('{{c.id}}')"><i class="fas fa-check text-success"></i>Approve</a></li>
+								<li class="list-group-item"><a class="text-danger d-block" href="javascript:void(0)" onclick="removeComment('{{c.id}}')"><i class="fas fa-ban text-danger"></i>Remove</a></li>
 							{% endif %}
 							{% if v.admin_level >=4 and c.oauth_app %}
 								<li class="list-group-item"><a class="d-block text-info" href="{{c.oauth_app.permalink}}/comments"><i class="fas fa-code text-info"></i>API App</a></li>
@@ -461,11 +462,11 @@
 								</li>
 							{% endif %}
 					{% endif %}
-						
-					{% if v and c.post and (v.admin_level >= 1 or v.id == c.post.author_id) and c.level == 1 %}
-						<li class="list-group-item"><a class="d-block text-info" id="pin-comment-{{c.id}}" href="javascript:void(0)" data-dismiss="modal" data-target="#actionsModal-{{c.id}}" onclick="post('/comment_pin/{{c.id}}', function(){window.location.reload(true);})"><i class="fas fa-thumbtack fa-rotate--45 text-info"></i>{{'Unpin' if c.is_pinned else 'Pin'}}</a>
-						</li>
+
+					{% if v and c.parent_submission and (c.author_id==v.id or v.admin_level > 0) %}
+						<li class="list-group-item"><a class="text-danger d-block" href="javascript:void(0)" onclick="post('/toggle_comment_nsfw/{{c.id}}', function(){window.location.reload(true);})"><i class="fas fa-eye-evil text-danger"></i>Toggle +18</a></li>
 					{% endif %}
+
 					{% if v and (c.post and v.admin_level == 6) %}
 						{% if c.author_id != v.id %}
 								{% if c.author.is_banned %}
diff --git a/drama/templates/submission.html b/drama/templates/submission.html
index e8c09c376..9c565c6b1 100644
--- a/drama/templates/submission.html
+++ b/drama/templates/submission.html
@@ -132,10 +132,6 @@
 						<button class="btn btn-link btn-block btn-lg text-left text-muted"><a href="javascript:void(0)" onclick="post('/save_post/{{p.id}}', function(){window.location.reload(true);})"><i class="fas fa-save text-center text-muted mr-3"></i>Save</a></button>
 					{% endif %}
 
-					{% if v and (v.id==p.author_id or v.admin_level>=3) %}
-						<button class="btn btn-link btn-block btn-lg text-left text-danger" onclick="post('/toggle_post_nsfw/{{p.id}}', function(){window.location.reload(true);})"><i class="far fa-eye-evil text-center text-danger mr-3"></i>Toggle +18</button>
-					{% endif %}
-
 					{% if v %}
 						{% if v.admin_level >=3 %}
 							<button class="btn btn-link btn-block btn-lg text-info text-left" id="sticky-post-{{p.id}}" href="javascript:void(0)" onclick="post('/sticky/{{p.id}}',callback=function(){window.location.reload(true);})"><i class="fas fa-thumbtack text-center mr-3"></i>{% if p.stickied %}Unpin{% else %}Pin{% endif %}</button>
@@ -159,13 +155,17 @@
 						<button id="unblock-user-button-{{p.id}}" class="btn btn-link btn-block btn-lg text-left{% if not p.is_blocking %} d-none{% endif %}" data-dismiss="modal" onclick="post_toast('/settings/unblock?username={{p.author.username}}', callback=function(){document.getElementById('block-user-button-{{p.id}}').classList.toggle('d-none');document.getElementById('unblock-user-button-{{p.id}}').classList.toggle('d-none');})"
 						><i class="fas fa-eye mr-3"></i>Unblock user</button>
 					{% endif %}
-					
-					{% if v and v.admin_level == 6 and v.id!=p.author_id %}
-					{% if p.author.is_banned %}
-						<button class="btn btn-link btn-block btn-lg text-success text-left" href="javascript:void(0)" onclick="post_toast('/unban_user/{{p.author_id}}?toast=1')"><i class="fas fa-user-minus mr-3"></i>Unban user</a></button>
-					{% else %}
-						<button class="btn btn-link btn-block btn-lg text-danger text-left" href="javascript:void(0)" onclick="post_toast('/ban_user/{{p.author_id}}?toast=1')"><i class="fas fa-user-minus mr-3"></i>Ban user</a></button>
+
+					{% if v and (v.id==p.author_id or v.admin_level>=3) %}
+						<button class="btn btn-link btn-block btn-lg text-left text-danger" onclick="post('/toggle_post_nsfw/{{p.id}}', function(){window.location.reload(true);})"><i class="far fa-eye-evil text-center text-danger mr-3"></i>Toggle +18</button>
 					{% endif %}
+
+					{% if v and v.admin_level == 6 and v.id!=p.author_id %}
+						{% if p.author.is_banned %}
+							<button class="btn btn-link btn-block btn-lg text-success text-left" href="javascript:void(0)" onclick="post_toast('/unban_user/{{p.author_id}}?toast=1')"><i class="fas fa-user-minus mr-3"></i>Unban user</a></button>
+						{% else %}
+							<button class="btn btn-link btn-block btn-lg text-danger text-left" href="javascript:void(0)" onclick="post_toast('/ban_user/{{p.author_id}}?toast=1')"><i class="fas fa-user-minus mr-3"></i>Ban user</a></button>
+						{% endif %}
 					{% endif %}
 
 				</ul>
@@ -381,11 +381,11 @@
 
 							{% if v.admin_level >=3 and v.id!=p.author_id %}
 								{% if p.author.is_banned %}
-									<li class="list-inline-item"><a  href="javascript:void(0)" onclick="post_toast('/unban_user/{{p.author_id}}')"
-									><i class="fas fa-user-slash"></i>Unban user</a></li>
+									<li class="list-inline-item"><a class="text-success" href="javascript:void(0)" onclick="post_toast('/unban_user/{{p.author_id}}')"
+									><i class="fas fa-user-slash text-success"></i>Unban user</a></li>
 								{% else %}
-									<li class="list-inline-item"><a  href="javascript:void(0)" onclick="post_toast('/ban_user/{{p.author_id}}')"
-									><i class="fas fa-user-slash"></i>Ban user</a></li>
+									<li class="list-inline-item "><a class="text-danger" href="javascript:void(0)" onclick="post_toast('/ban_user/{{p.author_id}}')"
+									><i class="fas fa-user-slash text-danger"></i>Ban user</a></li>
 								{% endif %}
 							{% endif %}
 						{% endif %}
diff --git a/drama/templates/submission_listing.html b/drama/templates/submission_listing.html
index 187cd3b32..3433d4657 100644
--- a/drama/templates/submission_listing.html
+++ b/drama/templates/submission_listing.html
@@ -325,14 +325,6 @@
 
 					{% if v %}
 						{% if v.admin_level >=3 %}
-							{% if v.id!=p.author_id %}
-							{% if p.author.is_banned %}
-							<button class="btn btn-link btn-block btn-lg text-left text-danger" href="javascript:void(0)" onclick="post_toast('/unban_user/{{p.author_id}}')"><i class="fas fa-user-minus mr-3"></i>Unban user</a></button>
-							{% else %}
-							<button class="btn btn-link btn-block btn-lg text-left text-danger" href="javascript:void(0)" onclick="post_toast('/ban_user/{{p.author_id}}')"><i class="fas fa-user-minus mr-3"></i>Ban user</a></button>
-							{% endif %}
-							{% endif %}
-
 							<button class="btn btn-link btn-block btn-lg text-info text-left" id="sticky-post-{{p.id}}" href="javascript:void(0)" onclick="post('/sticky/{{p.id}}',callback=function(){window.location.reload(true);})"><i class="fas fa-thumbtack text-center mr-3"></i>{% if p.stickied %}Unpin{% else %}Pin{% endif %}</button>
 							
 							{% if v==p.author %}