From c897c73fbf041648f52171142ef6276c815c6af5 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 6 Mar 2022 00:09:06 +0200
Subject: [PATCH] done queen

---
 files/routes/static.py       |  5 ++++-
 files/templates/marseys.html | 12 ++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/files/routes/static.py b/files/routes/static.py
index d46b136b5..4862376cf 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -19,7 +19,10 @@ def privacy(v):
 @auth_required
 def marseys(v):
 	if SITE_NAME == 'Drama':
-		marseys = g.db.query(Marsey, User).join(User, User.id==Marsey.author_id).order_by(Marsey.count.desc())
+		marseys = g.db.query(Marsey, User).join(User, User.id==Marsey.author_id)
+		sort = request.values.get(sort, "usage")
+		if sort == "usage": marseys = marseys.order_by(Marsey.count.desc())
+		else: marseys = marseys.order_by(User.username)
 	else:
 		marseys = g.db.query(Marsey).order_by(Marsey.count.desc())
 	return render_template("marseys.html", v=v, marseys=marseys)
diff --git a/files/templates/marseys.html b/files/templates/marseys.html
index 33f5ee38b..af545a952 100644
--- a/files/templates/marseys.html
+++ b/files/templates/marseys.html
@@ -1,21 +1,17 @@
 {% extends "default.html" %}
 {% block content %}
-
-<script src="/static/assets/js/sort_table.js?v=240"></script>
-
 <pre>
 
 	
 </pre>
-<div class="overflow-x-auto">
-<table  id="sortable_table"class="table table-striped mb-5">
+<div class="overflow-x-auto"><table class="table table-striped mb-5">
 <thead class="bg-primary text-white">
 	<tr>
 		<th>#</th>
 		<th>Name</th>
 		<th>Marsey</th>
-		<th role="button" onclick="sort_table(3)">Usage</th>
-		{% if SITE_NAME == 'Drama' %}<th role="button" onclick="sort_table(4)">Author</th>{% endif %}
+		<th><a href="?sort=usage">Usage</a></th>
+		{% if SITE_NAME == 'Drama' %}<th><a href="?sort=author">Author</a></th>{% endif %}
 	</tr>
 </thead>
 <tbody id="followers-table">
@@ -26,7 +22,7 @@
 			<td>{{marsey.name}}</td>
 			<td><img class="marsey" loading="lazy" data-bs-toggle="tooltip" alt=":{{marsey.name}}:" title=":{{marsey.name}}:" src="/e/{{marsey.name}}.webp?v=1012" ></td>
 			<td>{{marsey.count}}</td>
-			<td>{{author.truecoins}}</td>
+			<td><a style="color:#{{author.namecolor}};font-weight:bold" href="/@{{author.username}}"><img loading="lazy" src="{{author.profile_url}}" class="pp20"><span {% if author.patron %}class="patron" style="background-color:#{{author.namecolor}}"{% endif %}>{{author.username}}</span></a></td>
 		</tr>
 	{% endfor %}
 {% else %}