From 8f2d656bb31833f584d61f8ebf58339886db490d Mon Sep 17 00:00:00 2001
From: justcool393 <justcool393@gmail.com>
Date: Fri, 7 Oct 2022 22:29:20 -0700
Subject: [PATCH] rename page and also add macro for ban area

---
 files/templates/userpage.html                 | 37 +++----------------
 ...ls_lower.html => userpage_admintools.html} | 22 +++++++++++
 2 files changed, 28 insertions(+), 31 deletions(-)
 rename files/templates/{userpage_admintools_lower.html => userpage_admintools.html} (90%)

diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 4849f8ed4..342302e0b 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -29,7 +29,7 @@
 <meta name="twitter:url" content="{{u.url}}">
 {% endblock %}
 
-{% import 'userpage_admintools_lower.html' as userpage_admintools_lower with context %}
+{% import 'userpage_admintools.html' as userpage_admintools with context %}
 
 {% block desktopUserBanner %}
 
@@ -49,25 +49,7 @@
 							</a>
 						</div>
 						<div id="profilestuff" class="ml-3 w-100">
-							{% if u.is_suspended %}
-								<h5 class="text-primary" id="profile--banned">BANNED USER
-									{% if u.ban_reason %}:
-										{{u.ban_reason | safe}}
-									{% endif %}
-									(by <a href="{{u.banned_by.url}}">@{{u.banned_by.username}}</a>)
-								</h5>
-								{% if u.unban_utc %}
-									<h5 class="text-primary" id="profile--unban">{{u.unban_string}}</h5>
-								{% endif %}
-							{% endif %}
-							{% if v and v.admin_level >= PERMS['USER_SHADOWBAN'] and u.shadowbanned %}
-								<h5 class="text-primary" id="profile--shadowbanned">SHADOWBANNED USER
-									{% if u.ban_reason %}:
-										{{u.ban_reason | safe}}
-									{% endif %}
-									(by <a href="/@{{u.shadowbanned}}">@{{u.shadowbanned}}</a>)
-								</h5>
-							{% endif %}
+							{{ userpage_admintools.userBanBlock('desktop') }}
 							<div class="d-flex align-items-center mt-1 mb-2">
 								<h1 class="font-weight-bolder h3 my-0 mr-2" id="profile--name" style="color: #{{u.name_color}}"><span {% if u.patron %}class="patron" style="background-color:#{{u.name_color}}"{% endif %}>{{u.user_name}}</span></h1>
 
@@ -271,7 +253,7 @@
 						<a class="btn btn-secondary" role="button" onclick="toggle()">Toggle anthem</a>
 					{% endif %}
 					
-					{{ userpage_admintools_lower.userAdminToolsLower('desktop') }}
+					{{ userpage_admintools.userAdminToolsLower('desktop') }}
 
 					<pre></pre>
 					<div id="profile--info">
@@ -336,15 +318,8 @@
 				</a>
 			</div>
 			<div class="mt-n3 py-3">
-				{% if u.is_suspended %}
-					<h5 class="text-primary" id="profile-mobile--banned">BANNED USER{% if u.ban_reason %}: {{u.ban_reason | safe}}{% endif %} (by <a href="{{u.banned_by.url}}">@{{u.banned_by.username}}</a>)</h5>
-					{% if u.unban_utc %}<h5 class="text-primary" id="profile-mobile--unban">{{u.unban_string}}</h5>{% endif %}
-				{% endif %}
-
-				{% if v and v.admin_level >= PERMS['USER_SHADOWBAN'] and u.shadowbanned %}
-					<h5 class="text-primary" id="profile-mobile--banned">SHADOWBANNED USER{% if u.ban_reason %}: {{u.ban_reason | safe}}{% endif %} (by <a href="/@{{u.shadowbanned}}">@{{u.shadowbanned}}</a>)</h5>
-				{% endif %}
-
+				{{ 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 %}
@@ -530,7 +505,7 @@
 						<button class="btn btn-primary mt-2 mb-3" onclick="transferBux(true)">Gift</button>
 					</div>
 
-					{{ userpage_admintools_lower.userAdminToolsLower('mobile') }}
+					{{ userpage_admintools.userAdminToolsLower('mobile') }}
 					
 				{% endif %}
 				<pre></pre>
diff --git a/files/templates/userpage_admintools_lower.html b/files/templates/userpage_admintools.html
similarity index 90%
rename from files/templates/userpage_admintools_lower.html
rename to files/templates/userpage_admintools.html
index c3112e0ec..5724aec0b 100644
--- a/files/templates/userpage_admintools_lower.html
+++ b/files/templates/userpage_admintools.html
@@ -1,3 +1,25 @@
+{% macro userBanBlock(deviceType) -%}
+	{% if u.is_suspended %}
+			<h5 class="text-primary" id="profile-{{deviceType}}--banned">BANNED USER
+			{% if u.ban_reason %}:
+				{{u.ban_reason | safe}}
+			{% endif %}
+			(by <a href="{{u.banned_by.url}}">@{{u.banned_by.username}}</a>)
+			</h5>
+			{% if u.unban_utc %}
+				<h5 class="text-primary" id="profile--unban">{{u.unban_string}}</h5>
+			{% endif %}
+		{% endif %}
+		{% if v and v.admin_level >= PERMS['USER_SHADOWBAN'] and u.shadowbanned %}
+			<h5 class="text-primary" id="profile-{{deviceType}}--shadowbanned">SHADOWBANNED USER
+			{% if u.ban_reason %}:
+				{{u.ban_reason | safe}}
+			{% endif %}
+			(by <a href="/@{{u.shadowbanned}}">@{{u.shadowbanned}}</a>)
+			</h5>
+		{% 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}}">