diff --git a/files/helpers/const.py b/files/helpers/const.py index ca53e21716..b1cb3b1931 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -138,7 +138,7 @@ AGENDAPOSTER_MSG = """Hi @{username},\n\nYour {type} has been automatically remo included. \n\n*This is an automated message; if you need help, you can message us [here](/contact).*""" -if SITE_NAME == 'Drama': +if SITE_NAME in ('Drama','2Much4You'): PW_ID = 3750 BASEDBOT_ID = 0 KIPPY_ID = 7150 diff --git a/files/routes/front.py b/files/routes/front.py index 1829b5efd4..45c0c811dd 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -151,10 +151,12 @@ def front_all(v, sub=None): if v: defaultsorting = v.defaultsorting - defaulttime = v.defaulttime + if sub or SITE_NAME == '2Much4You': defaulttime = 'all' + else: defaulttime = v.defaulttime else: defaultsorting = "hot" - defaulttime = defaulttimefilter + if sub or SITE_NAME == '2Much4You': defaulttime = 'all' + else: defaulttime = v.defaulttime sort=request.values.get("sort", defaultsorting) t=request.values.get('t', defaulttime) @@ -341,6 +343,9 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" if (sort == "hot" or (v and v.id == Q_ID)) and page == 1 and ccmode == "false" and not gt and not lt: pins = g.db.query(Submission).filter(Submission.stickied != None, Submission.is_banned == False) if sub: pins = pins.filter_by(sub=sub.name) + elif SITE_NAME == '2Much4You': pins = pins.filter(Submission.sub != None) + else: pins = pins.filter_by(sub=None) + if v and v.admin_level == 0: blocking = [x[0] for x in g.db.query(UserBlock.target_id).filter_by(user_id=v.id).all()] blocked = [x[0] for x in g.db.query(UserBlock.user_id).filter_by(target_id=v.id).all()] diff --git a/files/templates/authforms.html b/files/templates/authforms.html index ed6d9554ae..6d76ad8353 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -15,7 +15,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index 1bac5b79d3..5ea9e67efd 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -8,7 +8,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/header.html b/files/templates/header.html index 88505544aa..58a840f928 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -1,6 +1,15 @@ {% if SITE_NAME == 'Drama' or SUBS %} + + {% elif SUBS %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/login.html b/files/templates/login.html index 6ce3969e84..8195c133cd 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -19,7 +19,7 @@ - + diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index 6406708b99..673e0560b6 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -14,7 +14,7 @@ 2-Step Login - {{SITE_NAME}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index b7559bf269..b40ccbd48f 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -34,7 +34,7 @@ - + {% if v.agendaposter %} - + {% else %} - + {% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index ef6f67903b..50bd08ed7e 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -31,7 +31,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %} - + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 3e1a0226ab..eba2b7cc76 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -32,7 +32,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %} - + diff --git a/files/templates/submit.html b/files/templates/submit.html index 3b9da5be14..dc2f5f1d02 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -26,7 +26,7 @@ {% block stylesheets %} {% if v %} - + {% if v.agendaposter %} - + {% endif %} {% endblock %}