diff --git a/files/helpers/const.py b/files/helpers/const.py index 50402f022..162b0924a 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -19,6 +19,8 @@ for k, val in result.items(): del result +marseys = dict(sorted(marseys.items(), key=lambda x: x[1])) + if SITE == 'rdrama.net': topmakers = {} for k, val in marseys.items(): diff --git a/files/routes/admin.py b/files/routes/admin.py index 6d5a273c6..954f36b66 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -272,7 +272,7 @@ def post_sidebar(v): @auth_required def shadowbanned(v): if not (v and v.admin_level > 1): abort(404) - users = [x for x in g.db.query(User).filter(User.shadowbanned != None).all()] + users = [x for x in g.db.query(User).filter(User.shadowbanned != None).order_by(User.shadowbanned).all()] if not v or v.oldsite: template = '' else: template = 'CHRISTMAS/' return render_template(f"{template}shadowbanned.html", v=v, users=users) diff --git a/files/templates/admins.html b/files/templates/admins.html index 3e6b1d97a..80bd42cb4 100644 --- a/files/templates/admins.html +++ b/files/templates/admins.html @@ -14,7 +14,7 @@ # - Name + Name Truescore Mod actions diff --git a/files/templates/grassed.html b/files/templates/grassed.html index bf8cf0a78..179428eed 100644 --- a/files/templates/grassed.html +++ b/files/templates/grassed.html @@ -1,15 +1,13 @@ {% extends "settings2.html" %} {% block content %} - -
- +
- - + + {% for user in users %} diff --git a/files/templates/marseys.html b/files/templates/marseys.html index 9d687609c..9fb5ec177 100644 --- a/files/templates/marseys.html +++ b/files/templates/marseys.html @@ -4,7 +4,7 @@ -
#NameGrasserNameGrasser
+
diff --git a/files/templates/shadowbanned.html b/files/templates/shadowbanned.html index 1c66510fb..4e2aea419 100644 --- a/files/templates/shadowbanned.html +++ b/files/templates/shadowbanned.html @@ -1,15 +1,14 @@ {% extends "settings2.html" %} {% block content %} -
-
#
+
- - + + {% for user in users %}
#NameShadowbanned byNameShadowbanned by