From 39570ecbfd5772e1f586ee2be69dfee12fa54bda Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 21 Dec 2021 01:42:16 +0200 Subject: [PATCH 01/14] sfdsd --- .gitignore | 3 ++- files/__main__.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 573861baef..a3c077c104 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ disablesignups **/.pytest_cache/ venv/ .vscode/ -.sass-cache/ \ No newline at end of file +.sass-cache/ +flask_session/ \ No newline at end of file diff --git a/files/__main__.py b/files/__main__.py index f30308c004..8f05a6a1dc 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -8,6 +8,7 @@ from flask_limiter import Limiter from flask_compress import Compress from flask_limiter.util import get_ipaddr from flask_mail import Mail +from flask_session import Session from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import sessionmaker, scoped_session @@ -17,6 +18,8 @@ from werkzeug.middleware.proxy_fix import ProxyFix import redis app = Flask(__name__, template_folder='templates') +app.config["SESSION_TYPE"] = "filesystem" +Session(app) app.wsgi_app = ProxyFix(app.wsgi_app, x_for=3) app.url_map.strict_slashes = False From a94e002588f851096fb113e7fea83ef01b55c3bd Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 21 Dec 2021 01:43:20 +0200 Subject: [PATCH 02/14] fsdfsd --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index eed0a0b025..c0e0aab67d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,7 @@ Flask-Caching Flask-Compress Flask-Limiter==1.1.0 Flask-Mail==0.9.1 +Flask-Session gevent greenlet gunicorn From e248421d9fd42384faff39d3bd1db6a8d74dc8e4 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 21 Dec 2021 01:44:56 +0200 Subject: [PATCH 03/14] sfdfsd --- files/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/__main__.py b/files/__main__.py index 8f05a6a1dc..2d42f3202c 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -18,7 +18,7 @@ from werkzeug.middleware.proxy_fix import ProxyFix import redis app = Flask(__name__, template_folder='templates') -app.config["SESSION_TYPE"] = "filesystem" +app.config["SESSION_TYPE"] = "redis" Session(app) app.wsgi_app = ProxyFix(app.wsgi_app, x_for=3) From 3490ad533fb84cf3e7213270b6229a18104f7f5d Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 21 Dec 2021 01:46:15 +0200 Subject: [PATCH 04/14] fdsdfs --- files/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/__main__.py b/files/__main__.py index 2d42f3202c..cbd4e811d7 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -62,7 +62,7 @@ app.config["RATELIMIT_ENABLED"] = True app.config["RATELIMIT_DEFAULTS_DEDUCT_WHEN"]=lambda:True app.config["RATELIMIT_DEFAULTS_EXEMPT_WHEN"]=lambda:False app.config["RATELIMIT_HEADERS_ENABLED"]=True -app.config["CACHE_TYPE"] = "filesystem" +app.config["CACHE_TYPE"] = "redis" app.config["CACHE_DIR"] = "cache" app.config["RATELIMIT_STORAGE_URL"] = environ.get("REDIS_URL", "redis://localhost") app.config['MAIL_SERVER'] = 'smtp.gmail.com' From de21363ca6d536219aaa81b51b913b2783d95027 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 21 Dec 2021 01:50:02 +0200 Subject: [PATCH 05/14] fsdfds --- files/classes/user.py | 4 ++++ files/templates/notifications.html | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/files/classes/user.py b/files/classes/user.py index 5378ace780..58ff5d2b02 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -377,6 +377,10 @@ class User(Base): def post_notifications_count(self): return g.db.query(Notification.id).join(Comment).filter(Notification.user_id == self.id, Notification.read == False, Comment.author_id == AUTOJANNY_ID).count() + @property + @lazy + def not_post_notifications_count(self): + return self.notifications_count - self.post_notifications_count @property @lazy diff --git a/files/templates/notifications.html b/files/templates/notifications.html index e8581a7ef3..7cd7d9471f 100644 --- a/files/templates/notifications.html +++ b/files/templates/notifications.html @@ -16,8 +16,8 @@
  • - - All + + All{% if v.not_post_notifications_count %} ({{v.not_post_notifications_count}}){% endif %}
  • From 93b9be61c4a9f7ee630cc9978af8e5ff7bdd4b63 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 21 Dec 2021 01:51:04 +0200 Subject: [PATCH 06/14] fdsfsd --- files/templates/notifications.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/notifications.html b/files/templates/notifications.html index 7cd7d9471f..dfcf59f32b 100644 --- a/files/templates/notifications.html +++ b/files/templates/notifications.html @@ -16,7 +16,7 @@
    • - + All{% if v.not_post_notifications_count %} ({{v.not_post_notifications_count}}){% endif %}
      • From 927f84dceaed0f3edfcdf2a5e47242961cf5be3b Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 21 Dec 2021 01:55:59 +0200 Subject: [PATCH 07/14] fdsfsd --- docker-compose.yml | 1 - env | 1 - files/__main__.py | 11 ++++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 496cf97a39..cb8253dd8f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,6 @@ services: - DOMAIN=localhost - SITE_NAME=Drama - GIPHY_KEY=3435tdfsdudebussylmaoxxt43 - - FORCE_HTTPS=0 - DISCORD_SERVER_ID=3435tdfsdudebussylmaoxxt43 - DISCORD_CLIENT_ID=3435tdfsdudebussylmaoxxt43 - DISCORD_CLIENT_SECRET=3435tdfsdudebussylmaoxxt43 diff --git a/env b/env index a3f4b83fb4..f96bfbb8d6 100644 --- a/env +++ b/env @@ -3,7 +3,6 @@ export MASTER_KEY="XuxGqp5NyygJrM24b5gt3YgyvFVGdQnwVDwLzLwpu3eQwY" export DOMAIN="localhost" export SITE_NAME="Drama" export GIPHY_KEY="3435tdfsdudebussylmaoxxt43" -export FORCE_HTTPS="0" export DISCORD_SERVER_ID="3435tdfsdudebussylmaoxxt43" export DISCORD_CLIENT_ID="3435tdfsdudebussylmaoxxt43" export DISCORD_CLIENT_SECRET="3435tdfsdudebussylmaoxxt43" diff --git a/files/__main__.py b/files/__main__.py index cbd4e811d7..d0e715658f 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -27,6 +27,7 @@ app.jinja_env.cache = {} app.jinja_env.auto_reload = True import faulthandler faulthandler.enable() + app.config["SITE_NAME"]=environ.get("SITE_NAME").strip() app.config["COINS_NAME"]=environ.get("COINS_NAME").strip() @@ -39,14 +40,14 @@ app.config['SEND_FILE_MAX_AGE_DEFAULT'] = 86400 app.config["SESSION_COOKIE_NAME"] = f'session_{environ.get("DOMAIN")}'.strip().lower() app.config["VERSION"] = "1.0.0" app.config['MAX_CONTENT_LENGTH'] = 8 * 1024 * 1024 -app.config["SESSION_COOKIE_SECURE"] = bool(int(environ.get("FORCE_HTTPS", 1))) +app.config["SESSION_COOKIE_SECURE"] = True app.config["SESSION_COOKIE_SAMESITE"] = "Lax" app.config["PERMANENT_SESSION_LIFETIME"] = 60 * 60 * 24 * 365 app.config["SESSION_REFRESH_EACH_REQUEST"] = True app.config["SLOGAN"] = environ.get("SLOGAN", "").strip() app.config["DEFAULT_COLOR"] = environ.get("DEFAULT_COLOR", "ff0000").strip() app.config["DEFAULT_THEME"] = environ.get("DEFAULT_THEME", "midnight").strip() -app.config["FORCE_HTTPS"] = int(environ.get("FORCE_HTTPS", 1)) if ("localhost" not in app.config["SERVER_NAME"] and "localhost" not in app.config["SERVER_NAME"]) else 0 +app.config["FORCE_HTTPS"] = True app.config["UserAgent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36" app.config["HCAPTCHA_SITEKEY"] = environ.get("HCAPTCHA_SITEKEY","").strip() app.config["HCAPTCHA_SECRET"] = environ.get("HCAPTCHA_SECRET","").strip() @@ -71,6 +72,10 @@ app.config['MAIL_USE_TLS'] = True app.config['MAIL_USERNAME'] = environ.get("MAIL_USERNAME", "").strip() app.config['MAIL_PASSWORD'] = environ.get("MAIL_PASSWORD", "").strip() +app.config["SESSION_USE_SIGNER"] = True +app.config["SESSION_COOKIE_DOMAIN"] = app.config["SERVER_NAME"] + + r=redis.Redis(host=environ.get("REDIS_URL", "redis://localhost"), decode_responses=True, ssl_cert_reqs=None) limiter = Limiter( @@ -106,7 +111,7 @@ def before_request(): session.permanent = True if not session.get("session_id"): session["session_id"] = secrets.token_hex(16) - if app.config["FORCE_HTTPS"] and request.url.startswith("http://") and "localhost" not in app.config["SERVER_NAME"]: + if request.url.startswith("http://") and "localhost" not in app.config["SERVER_NAME"]: url = request.url.replace("http://", "https://", 1) return redirect(url, code=301) From 035ecf98d02354396debc5bbcd10d69d127daa47 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 21 Dec 2021 01:56:48 +0200 Subject: [PATCH 08/14] fsdfds --- files/__main__.py | 2 +- files/classes/user.py | 2 +- files/routes/login.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/files/__main__.py b/files/__main__.py index d0e715658f..8908da2061 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -109,7 +109,7 @@ def before_request(): if not request.path.startswith("/assets") and not request.path.startswith("/images") and not request.path.startswith("/hostedimages"): session.permanent = True - if not session.get("session_id"): session["session_id"] = secrets.token_hex(16) + if not session.get("session_id"): session["session_id"] = secrets.token_hex(50) if request.url.startswith("http://") and "localhost" not in app.config["SERVER_NAME"]: url = request.url.replace("http://", "https://", 1) diff --git a/files/classes/user.py b/files/classes/user.py index 58ff5d2b02..0299e7e4ad 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -302,7 +302,7 @@ class User(Base): def formkey(self): if "session_id" not in session: - session["session_id"] = token_hex(16) + session["session_id"] = token_hex(50) msg = f"{session['session_id']}+{self.id}+{self.login_nonce}" diff --git a/files/routes/login.py b/files/routes/login.py index 7252cad50a..66a35df3d0 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -136,7 +136,7 @@ def login_post(): session["user_id"] = account.id session["logged_in"] = account.id - session["session_id"] = token_hex(16) + session["session_id"] = token_hex(50) session["login_nonce"] = account.login_nonce session.permanent = True @@ -343,7 +343,7 @@ def sign_up_post(v): session["user_id"] = new_user.id session["logged_in"] = new_user.id - session["session_id"] = token_hex(16) + session["session_id"] = token_hex(50) g.db.commit() From 6761caaff2b168c7e03317fda1595b57bae166c4 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 21 Dec 2021 01:58:30 +0200 Subject: [PATCH 09/14] sdfdfs --- files/routes/static.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/routes/static.py b/files/routes/static.py index 16f4602fc5..d8263f2059 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -104,10 +104,10 @@ def cached_chart(days): days = int((nowstamp - firstsignup) / 86400) if days > 31: - file = "/weekly_chart.webp" + file = "/weekly_chart.png" day_cutoffs = [today_cutoff - 86400 * 7 * i for i in range(31)][1:] else: - file = "/daily_chart.webp" + file = "/daily_chart.png" day_cutoffs = [today_cutoff - 86400 * i for i in range(31)][1:] day_cutoffs.insert(0, calendar.timegm(now)) From f0747fa1b315966a5ab6a83cfe64734986400d22 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 21 Dec 2021 02:06:34 +0200 Subject: [PATCH 10/14] fdsfsd --- files/__main__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/files/__main__.py b/files/__main__.py index 8908da2061..837ee83418 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -43,7 +43,6 @@ app.config['MAX_CONTENT_LENGTH'] = 8 * 1024 * 1024 app.config["SESSION_COOKIE_SECURE"] = True app.config["SESSION_COOKIE_SAMESITE"] = "Lax" app.config["PERMANENT_SESSION_LIFETIME"] = 60 * 60 * 24 * 365 -app.config["SESSION_REFRESH_EACH_REQUEST"] = True app.config["SLOGAN"] = environ.get("SLOGAN", "").strip() app.config["DEFAULT_COLOR"] = environ.get("DEFAULT_COLOR", "ff0000").strip() app.config["DEFAULT_THEME"] = environ.get("DEFAULT_THEME", "midnight").strip() From fed97dbb88a2eb396fc381a02adb11391bc15c6a Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 21 Dec 2021 02:23:50 +0200 Subject: [PATCH 11/14] dsffsd --- files/routes/admin.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/files/routes/admin.py b/files/routes/admin.py index 8808bfdb2f..379d4f4bf3 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -1030,8 +1030,10 @@ def api_sticky_post(post_id, v): else: post.stickied = None else: pins = g.db.query(Submission.id).filter(Submission.stickied != None, Submission.is_banned == False).count() - if pins > 2: return {"error": "Can't exceed 3 pinned posts limit!"}, 403 - post.stickied = v.username + if pins > 2: + t = int(time.time()) + 3600 + post.stickied = f"t:{t}" + else: post.stickied = v.username g.db.add(post) ma=ModAction( From 48a68b171f88617fda25be9620fa747127de3003 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 21 Dec 2021 02:24:18 +0200 Subject: [PATCH 12/14] fdsfsd --- files/routes/admin.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/files/routes/admin.py b/files/routes/admin.py index 379d4f4bf3..fe179b8eef 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -1031,8 +1031,10 @@ def api_sticky_post(post_id, v): else: pins = g.db.query(Submission.id).filter(Submission.stickied != None, Submission.is_banned == False).count() if pins > 2: - t = int(time.time()) + 3600 - post.stickied = f"t:{t}" + if v.admin_level > 2: + t = int(time.time()) + 3600 + post.stickied = f"t:{t}" + else: return {"error": "Can't exceed 3 pinned posts limit!"}, 403 else: post.stickied = v.username g.db.add(post) From 1d4b7fb2959b2355fa30af61b6c345098f81169d Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 21 Dec 2021 02:28:51 +0200 Subject: [PATCH 13/14] fdsfds --- files/templates/comments.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/comments.html b/files/templates/comments.html index 22fe594dd3..6110dde155 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -297,7 +297,7 @@ Save Edit Cancel -
      +
      Formatting help
    {% endif %} From 5b6e6b8b7f5f441637755d6a1a0b53b6cf7b8f10 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 21 Dec 2021 02:29:05 +0200 Subject: [PATCH 14/14] fd --- files/templates/CHRISTMAS/authforms.html | 4 ++-- files/templates/CHRISTMAS/default.html | 4 ++-- files/templates/CHRISTMAS/login.html | 4 ++-- files/templates/CHRISTMAS/login_2fa.html | 2 +- files/templates/CHRISTMAS/settings.html | 4 ++-- files/templates/CHRISTMAS/sign_up.html | 4 ++-- files/templates/CHRISTMAS/sign_up_failed_ref.html | 2 +- files/templates/CHRISTMAS/tailwind.html | 2 +- files/templates/authforms.html | 4 ++-- files/templates/default.html | 4 ++-- files/templates/log.html | 4 ++-- files/templates/login.html | 2 +- files/templates/login_2fa.html | 2 +- files/templates/settings.html | 2 +- files/templates/settings2.html | 4 ++-- files/templates/sign_up.html | 2 +- files/templates/sign_up_failed_ref.html | 2 +- files/templates/submit.html | 4 ++-- 18 files changed, 28 insertions(+), 28 deletions(-) diff --git a/files/templates/CHRISTMAS/authforms.html b/files/templates/CHRISTMAS/authforms.html index 6a86f01685..0ef68cfd27 100644 --- a/files/templates/CHRISTMAS/authforms.html +++ b/files/templates/CHRISTMAS/authforms.html @@ -14,11 +14,11 @@ {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index ca192e8e14..45dbf556b5 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -186,9 +186,9 @@ {% block stylesheets %} - + - + diff --git a/files/templates/CHRISTMAS/login.html b/files/templates/CHRISTMAS/login.html index 08cdc17adf..86c637bbd7 100644 --- a/files/templates/CHRISTMAS/login.html +++ b/files/templates/CHRISTMAS/login.html @@ -13,9 +13,9 @@ Login - {{'SITE_NAME' | app_config}} {% endblock %} - + - + diff --git a/files/templates/CHRISTMAS/login_2fa.html b/files/templates/CHRISTMAS/login_2fa.html index 415ca9105d..8fa4ef088f 100644 --- a/files/templates/CHRISTMAS/login_2fa.html +++ b/files/templates/CHRISTMAS/login_2fa.html @@ -13,7 +13,7 @@ 2-Step Login - {{'SITE_NAME' | app_config}} - + diff --git a/files/templates/CHRISTMAS/settings.html b/files/templates/CHRISTMAS/settings.html index b41e0afe4c..8482e14ed3 100644 --- a/files/templates/CHRISTMAS/settings.html +++ b/files/templates/CHRISTMAS/settings.html @@ -28,9 +28,9 @@ {% block stylesheets %} - + - + diff --git a/files/templates/CHRISTMAS/sign_up.html b/files/templates/CHRISTMAS/sign_up.html index 6dfd55de31..3634f56509 100644 --- a/files/templates/CHRISTMAS/sign_up.html +++ b/files/templates/CHRISTMAS/sign_up.html @@ -26,9 +26,9 @@ {% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %} - + - + diff --git a/files/templates/CHRISTMAS/sign_up_failed_ref.html b/files/templates/CHRISTMAS/sign_up_failed_ref.html index 3cbebfe6f2..6aee3cfbb4 100644 --- a/files/templates/CHRISTMAS/sign_up_failed_ref.html +++ b/files/templates/CHRISTMAS/sign_up_failed_ref.html @@ -31,7 +31,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %} - + diff --git a/files/templates/CHRISTMAS/tailwind.html b/files/templates/CHRISTMAS/tailwind.html index 273cdbcff5..e3e520504c 100644 --- a/files/templates/CHRISTMAS/tailwind.html +++ b/files/templates/CHRISTMAS/tailwind.html @@ -5,7 +5,7 @@ - + Flask + Tailwind CSS diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 9fe37eba77..607565bd29 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -14,11 +14,11 @@ {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index 1adfdbc8eb..f18547295e 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -6,12 +6,12 @@ {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} diff --git a/files/templates/log.html b/files/templates/log.html index 9436b5147c..9b9391981a 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -6,11 +6,11 @@ {% block content %} {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %}
    diff --git a/files/templates/login.html b/files/templates/login.html index 6c45097bcb..ad945e3575 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -17,7 +17,7 @@ {% endblock %} - + diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index aed01ba8ee..7a3c08f867 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -13,7 +13,7 @@ 2-Step Login - {{'SITE_NAME' | app_config}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index 8f4a111499..2c2541b12c 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -33,7 +33,7 @@ - + {% if v.agendaposter %}{% elif v.css %}{% endif %} diff --git a/files/templates/settings2.html b/files/templates/settings2.html index ed9757ca58..f318e17630 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -38,10 +38,10 @@ {% if v %} - + {% else %} - + {% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 430e1476ab..6f869f2ed2 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -30,7 +30,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %} - + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 0124ac1d40..abe1f7750b 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -31,7 +31,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %} - + diff --git a/files/templates/submit.html b/files/templates/submit.html index 5644a5cd95..db1f692561 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -25,11 +25,11 @@ {% block stylesheets %} {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} {% endblock %}