carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

order themes alphabetically

master
Aevann1 2022-08-05 18:26:44 +02:00
parent 6045667b91
commit 2ec5531080
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/helpers/const.py
View File

@ -380,7 +380,7 @@ bots = {AUTOJANNY_ID, SNAPPY_ID, LONGPOSTBOT_ID, ZOZBOT_ID, BASEDBOT_ID}
IMGUR_KEY = environ.get("IMGUR_KEY").strip() IMGUR_KEY = environ.get("IMGUR_KEY").strip()
PUSHER_ID = environ.get("PUSHER_ID", "").strip() PUSHER_ID = environ.get("PUSHER_ID", "").strip()
PUSHER_KEY = environ.get("PUSHER_KEY", "").strip() PUSHER_KEY = environ.get("PUSHER_KEY", "").strip()
DEFAULT_COLOR = environ.get("DEFAULT_COLOR", "fff").strip() DEFAULT_COLOR = environ.get("DEFAULT_COLOR", "805ad5").strip()
COLORS = {'ff66ac','805ad5','62ca56','38a169','80ffff','2a96f3','eb4963','ff0000','f39731','30409f','3e98a7','e4432d','7b9ae4','ec72de','7f8fa6', 'f8db58','8cdbe6', DEFAULT_COLOR} COLORS = {'ff66ac','805ad5','62ca56','38a169','80ffff','2a96f3','eb4963','ff0000','f39731','30409f','3e98a7','e4432d','7b9ae4','ec72de','7f8fa6', 'f8db58','8cdbe6', DEFAULT_COLOR}
AWARDS = { AWARDS = {
@ -1008,8 +1008,6 @@ hosts = "|".join(approved_embed_hosts).replace('.','\.')
SITE_NAME = environ.get("SITE_NAME").strip() SITE_NAME = environ.get("SITE_NAME").strip()
GUMROAD_LINK = environ.get("GUMROAD_LINK", "https://marsey1.gumroad.com/l/rdrama").strip() GUMROAD_LINK = environ.get("GUMROAD_LINK", "https://marsey1.gumroad.com/l/rdrama").strip()
DEFAULT_COLOR = environ.get("DEFAULT_COLOR", "ff0000").strip()
DEFAULT_THEME = environ.get("DEFAULT_THEME", "midnight").strip()
HCAPTCHA_SITEKEY = environ.get("HCAPTCHA_SITEKEY","").strip() HCAPTCHA_SITEKEY = environ.get("HCAPTCHA_SITEKEY","").strip()
HCAPTCHA_SECRET = environ.get("HCAPTCHA_SECRET","").strip() HCAPTCHA_SECRET = environ.get("HCAPTCHA_SECRET","").strip()
SPAM_SIMILARITY_THRESHOLD = float(environ.get("SPAM_SIMILARITY_THRESHOLD", 0.5)) SPAM_SIMILARITY_THRESHOLD = float(environ.get("SPAM_SIMILARITY_THRESHOLD", 0.5))

2
files/routes/settings.py
View File

@ -252,7 +252,7 @@ def settings_profile_post(v):
theme = request.values.get("theme") theme = request.values.get("theme")
if theme: if theme:
if theme in {"dramblr", "reddit", "classic", "classic_dark", "transparent", "win98", "dark", "light", "coffee", "tron", "4chan", "midnight"}: if theme in {"4chan","classic","classic_dark","coffee","dark","dramblr","light","midnight","reddit","transparent","tron","win98"}:
if theme == "transparent" and not v.background: if theme == "transparent" and not v.background:
return {"error": "You need to set a background to use the transparent theme!"} return {"error": "You need to set a background to use the transparent theme!"}
v.theme = theme v.theme = theme

4
files/templates/settings_profile.html
View File

@ -130,9 +130,9 @@
<select autocomplete="off" id='theme' class="form-control" form="profile-settings" name="theme" onchange="post_toast(this,'/settings/profile?theme='+document.getElementById('theme').value, true)"> <select autocomplete="off" id='theme' class="form-control" form="profile-settings" name="theme" onchange="post_toast(this,'/settings/profile?theme='+document.getElementById('theme').value, true)">
{% if SITE_NAME == 'rDrama' %} {% if SITE_NAME == 'rDrama' %}
{% set themes = ["dramblr", "classic", "classic_dark", "transparent", "win98", "dark", "light", "coffee", "tron", "4chan", "midnight"] %} {% set themes = ["4chan","classic","classic_dark","coffee","dark","dramblr","light","midnight","reddit","transparent","tron","win98"] %}
{% else %} {% else %}
{% set themes = ["dramblr", "reddit", "transparent", "win98", "dark", "light", "coffee", "tron", "4chan", "midnight"] %} {% set themes = ["4chan","classic","classic_dark","coffee","dark","dramblr","light","midnight","reddit","transparent","tron","win98"] %}
{% endif %} {% endif %}
{% for entry in themes %} {% for entry in themes %}