From 437f7e63d7845b6c88e598961deb5c0c7aed6ea3 Mon Sep 17 00:00:00 2001
From: justcool393 <justcool393@gmail.com>
Date: Fri, 7 Oct 2022 22:38:29 -0700
Subject: [PATCH] upper admin tools macro also we change the remove admin and
 revert admin actions button to be red

---
 files/templates/userpage.html            | 24 +++---------------------
 files/templates/userpage_admintools.html | 13 +++++++++++++
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 342302e0b..602ddc4b2 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -202,16 +202,8 @@
 
 						<a class="btn btn-primary" role="button" onclick="post_toast(this,'/settings/block?username={{u.username}}',true)">Block</a>
 
-						{% if v.admin_level >= PERMS['ADMIN_ADD'] and SITE != 'rdrama.net' %}
-							<a id="admin" class="{% if u.admin_level >= PERMS['ADMIN_ADD_PERM_LEVEL'] %}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast(this,'/@{{u.username}}/make_admin','admin','unadmin','d-none')">Make admin</a>
-						{% endif %}
-						{% if v.admin_level >= PERMS['ADMIN_REMOVE'] %}
-							<a id="unadmin" class="{% if u.admin_level < 1 %}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast(this,'/@{{u.username}}/remove_admin','admin','unadmin','d-none')">Remove admin</a>
-						{% endif %}
-						</div>
-						{% if v.admin_level >= PERMS['ADMIN_ACTIONS_REVERT'] and u.admin_level %}
-							<a class="btn btn-primary" role="button" onclick="post_toast(this,'/@{{u.username}}/revert_actions')">Revert admin actions</a>
-						{% endif %}
+						{{ userpage_admintools.userAdminToolsUpper('desktop') }}
+						
 						<form class="d-none toggleable" id="message" action="/@{{u.username}}/message" onsubmit="submitFormAjax(event)">
 							<input type="hidden" name="formkey" value="{{v.formkey}}"> 
 							<pre></pre>
@@ -319,7 +311,6 @@
 			</div>
 			<div class="mt-n3 py-3">
 				{{ userpage_admintools.userBanBlock('desktop') }}
-				
 				<h1 class="h5 d-inline-block" id="profile-mobile--name" style="color: #{{u.name_color}}"><span {% if u.patron %}class="patron" style="background-color:#{{u.name_color}}"{% endif %}>{{u.user_name}}</span></h1>
 
 				{% if u.username != u.original_username %}
@@ -463,16 +454,7 @@
 
 					<a class="btn btn-primary" role="button" onclick="post_toast(this,'/settings/block?username={{u.username}}',true)">Block</a>
 
-					{% if v.admin_level >= PERMS['ADMIN_ADD'] and SITE != 'rdrama.net' %}
-						<a id="admin2" class="{% if u.admin_level >= PERMS['ADMIN_ADD_PERM_LEVEL'] %}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast(this,'/@{{u.username}}/make_admin','admin2','unadmin2','d-none')">Make admin</a>
-					{% endif %}
-
-					{% if v.admin_level >= PERMS['ADMIN_REMOVE'] %}
-						<a id="unadmin2" class="{% if u.admin_level < 1 %}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast(this,'/@{{u.username}}/remove_admin','admin2','unadmin2','d-none')">Remove admin</a>
-					{% endif %}
-					{% if v.admin_level >= PERMS['ADMIN_ACTIONS_REVERT'] and u.admin_level %}
-						<a class="btn btn-primary" role="button" onclick="post_toast(this,'/@{{u.username}}/revert_actions')">Revert admin actions</a>
-					{% endif %}
+					{{ userpage_admintools.userAdminToolsUpper('mobile') }}
 					<form class="d-none toggleable" id='message-mobile' action="/@{{u.username}}/message" onsubmit="submitFormAjax(event)">
 						<pre></pre>
 						<input type="hidden" name="formkey" value="{{v.formkey}}"> 
diff --git a/files/templates/userpage_admintools.html b/files/templates/userpage_admintools.html
index d65ec6e53..302a52e4b 100644
--- a/files/templates/userpage_admintools.html
+++ b/files/templates/userpage_admintools.html
@@ -20,6 +20,19 @@
 	{% endif %}
 {%- endmacro %}
 
+{% macro userAdminToolsUpper(deviceType) -%}
+	{% if v and v.id != u.id and v.admin_level >= PERMS['USER_MODERATION_TOOLS_VISIBLE'] %}
+		{% if v.admin_level >= PERMS['ADMIN_ADD'] and SITE != 'rdrama.net' %}
+			<a id="add-admin-{{deviceType}}" class="{% if u.admin_level >= PERMS['ADMIN_ADD_PERM_LEVEL'] %}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast(this,'/@{{u.username}}/make_admin','add-admin-{{deviceType}}','remove-admin-{{deviceType}}','d-none')">Make admin</a>
+		{% endif %}
+		{% if v.admin_level >= PERMS['ADMIN_REMOVE'] %}
+			<a id="remove-admin-{{deviceType}}" class="{% if u.admin_level < 1 %}d-none{% endif %} btn btn-danger" href="javascript:void(0)" onclick="post_toast(this,'/@{{u.username}}/remove_admin','add-admin-{{deviceType}}','remove-admin-{{deviceType}}','d-none')">Remove admin</a>
+		{% endif %}
+		{% if v.admin_level >= PERMS['ADMIN_ACTIONS_REVERT'] and u.admin_level %}
+			<a class="btn btn-danger" role="button" onclick="post_toast(this,'/@{{u.username}}/revert_actions')">Revert admin actions</a>
+		{% endif %}
+{%- endmacro %}
+
 {% macro userAdminToolsLower(deviceType) -%}
 	{% if v and v.id != u.id and v.admin_level >= PERMS['USER_MODERATION_TOOLS_VISIBLE'] %}
 		<div class="admintools-user-lower-{{deviceType}}">