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 %} - - -
-
# | Name | Marsey | -Usage | - {% if SITE_NAME == 'Drama' %}Author | {% endif %} +Usage | + {% if SITE_NAME == 'Drama' %}Author | {% endif %}{{marsey.name}} | ![]() |
{{marsey.count}} | -{{author.truecoins}} | +
---|