From 16e23e6f5471c79bc2df98b2f1cbf8e4e4f32f57 Mon Sep 17 00:00:00 2001 From: gooseman <16601315+geese-suck@users.noreply.github.com> Date: Mon, 14 Nov 2022 17:28:43 -0800 Subject: [PATCH] make banners not retarded + increase future scalability --- files/assets/css/main.css | 8 +++ .../{banner_rotation => banners}/banner1.webp | Bin .../banner10.webp | Bin .../{banner_rotation => banners}/banner2.webp | Bin .../{banner_rotation => banners}/banner3.webp | Bin .../{banner_rotation => banners}/banner4.webp | Bin .../{banner_rotation => banners}/banner5.webp | Bin .../{banner_rotation => banners}/banner6.webp | Bin .../{banner_rotation => banners}/banner7.webp | Bin .../{banner_rotation => banners}/banner8.webp | Bin .../{banner_rotation => banners}/banner9.webp | Bin .../images/PCM/{banners => banners2}/1.webp | Bin .../images/PCM/{banners => banners2}/2.webp | Bin .../images/PCM/{banners => banners2}/3.webp | Bin .../images/PCM/{banners => banners2}/4.webp | Bin .../images/PCM/{banners => banners2}/5.webp | Bin .../images/PCM/{banners => banners2}/6.webp | Bin .../images/PCM/{banners => banners2}/7.webp | Bin .../images/PCM/{banners => banners2}/8.webp | Bin files/routes/jinja2.py | 4 +- files/templates/default.html | 46 ++++-------------- files/templates/sidebar_WPD.html | 3 +- files/templates/sidebar_rDrama.html | 3 +- files/templates/util/macros.html | 21 ++++++++ 24 files changed, 42 insertions(+), 43 deletions(-) rename files/assets/images/PCM/{banner_rotation => banners}/banner1.webp (100%) rename files/assets/images/PCM/{banner_rotation => banners}/banner10.webp (100%) rename files/assets/images/PCM/{banner_rotation => banners}/banner2.webp (100%) rename files/assets/images/PCM/{banner_rotation => banners}/banner3.webp (100%) rename files/assets/images/PCM/{banner_rotation => banners}/banner4.webp (100%) rename files/assets/images/PCM/{banner_rotation => banners}/banner5.webp (100%) rename files/assets/images/PCM/{banner_rotation => banners}/banner6.webp (100%) rename files/assets/images/PCM/{banner_rotation => banners}/banner7.webp (100%) rename files/assets/images/PCM/{banner_rotation => banners}/banner8.webp (100%) rename files/assets/images/PCM/{banner_rotation => banners}/banner9.webp (100%) rename files/assets/images/PCM/{banners => banners2}/1.webp (100%) rename files/assets/images/PCM/{banners => banners2}/2.webp (100%) rename files/assets/images/PCM/{banners => banners2}/3.webp (100%) rename files/assets/images/PCM/{banners => banners2}/4.webp (100%) rename files/assets/images/PCM/{banners => banners2}/5.webp (100%) rename files/assets/images/PCM/{banners => banners2}/6.webp (100%) rename files/assets/images/PCM/{banners => banners2}/7.webp (100%) rename files/assets/images/PCM/{banners => banners2}/8.webp (100%) create mode 100644 files/templates/util/macros.html diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 9f0dae9fb..485611548 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -6357,3 +6357,11 @@ div.markdown { object-fit: contain; -o-object-fit: contain; } + +img[alt*="banner"] { + width: 100%; +} +img[alt*="banner"][alt^="/h/"]{ + object-fit: cover; + max-height: min(42vh,30vw) !important; +} diff --git a/files/assets/images/PCM/banner_rotation/banner1.webp b/files/assets/images/PCM/banners/banner1.webp similarity index 100% rename from files/assets/images/PCM/banner_rotation/banner1.webp rename to files/assets/images/PCM/banners/banner1.webp diff --git a/files/assets/images/PCM/banner_rotation/banner10.webp b/files/assets/images/PCM/banners/banner10.webp similarity index 100% rename from files/assets/images/PCM/banner_rotation/banner10.webp rename to files/assets/images/PCM/banners/banner10.webp diff --git a/files/assets/images/PCM/banner_rotation/banner2.webp b/files/assets/images/PCM/banners/banner2.webp similarity index 100% rename from files/assets/images/PCM/banner_rotation/banner2.webp rename to files/assets/images/PCM/banners/banner2.webp diff --git a/files/assets/images/PCM/banner_rotation/banner3.webp b/files/assets/images/PCM/banners/banner3.webp similarity index 100% rename from files/assets/images/PCM/banner_rotation/banner3.webp rename to files/assets/images/PCM/banners/banner3.webp diff --git a/files/assets/images/PCM/banner_rotation/banner4.webp b/files/assets/images/PCM/banners/banner4.webp similarity index 100% rename from files/assets/images/PCM/banner_rotation/banner4.webp rename to files/assets/images/PCM/banners/banner4.webp diff --git a/files/assets/images/PCM/banner_rotation/banner5.webp b/files/assets/images/PCM/banners/banner5.webp similarity index 100% rename from files/assets/images/PCM/banner_rotation/banner5.webp rename to files/assets/images/PCM/banners/banner5.webp diff --git a/files/assets/images/PCM/banner_rotation/banner6.webp b/files/assets/images/PCM/banners/banner6.webp similarity index 100% rename from files/assets/images/PCM/banner_rotation/banner6.webp rename to files/assets/images/PCM/banners/banner6.webp diff --git a/files/assets/images/PCM/banner_rotation/banner7.webp b/files/assets/images/PCM/banners/banner7.webp similarity index 100% rename from files/assets/images/PCM/banner_rotation/banner7.webp rename to files/assets/images/PCM/banners/banner7.webp diff --git a/files/assets/images/PCM/banner_rotation/banner8.webp b/files/assets/images/PCM/banners/banner8.webp similarity index 100% rename from files/assets/images/PCM/banner_rotation/banner8.webp rename to files/assets/images/PCM/banners/banner8.webp diff --git a/files/assets/images/PCM/banner_rotation/banner9.webp b/files/assets/images/PCM/banners/banner9.webp similarity index 100% rename from files/assets/images/PCM/banner_rotation/banner9.webp rename to files/assets/images/PCM/banners/banner9.webp diff --git a/files/assets/images/PCM/banners/1.webp b/files/assets/images/PCM/banners2/1.webp similarity index 100% rename from files/assets/images/PCM/banners/1.webp rename to files/assets/images/PCM/banners2/1.webp diff --git a/files/assets/images/PCM/banners/2.webp b/files/assets/images/PCM/banners2/2.webp similarity index 100% rename from files/assets/images/PCM/banners/2.webp rename to files/assets/images/PCM/banners2/2.webp diff --git a/files/assets/images/PCM/banners/3.webp b/files/assets/images/PCM/banners2/3.webp similarity index 100% rename from files/assets/images/PCM/banners/3.webp rename to files/assets/images/PCM/banners2/3.webp diff --git a/files/assets/images/PCM/banners/4.webp b/files/assets/images/PCM/banners2/4.webp similarity index 100% rename from files/assets/images/PCM/banners/4.webp rename to files/assets/images/PCM/banners2/4.webp diff --git a/files/assets/images/PCM/banners/5.webp b/files/assets/images/PCM/banners2/5.webp similarity index 100% rename from files/assets/images/PCM/banners/5.webp rename to files/assets/images/PCM/banners2/5.webp diff --git a/files/assets/images/PCM/banners/6.webp b/files/assets/images/PCM/banners2/6.webp similarity index 100% rename from files/assets/images/PCM/banners/6.webp rename to files/assets/images/PCM/banners2/6.webp diff --git a/files/assets/images/PCM/banners/7.webp b/files/assets/images/PCM/banners2/7.webp similarity index 100% rename from files/assets/images/PCM/banners/7.webp rename to files/assets/images/PCM/banners2/7.webp diff --git a/files/assets/images/PCM/banners/8.webp b/files/assets/images/PCM/banners2/8.webp similarity index 100% rename from files/assets/images/PCM/banners/8.webp rename to files/assets/images/PCM/banners2/8.webp diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py index 392544362..f23d8f4dc 100644 --- a/files/routes/jinja2.py +++ b/files/routes/jinja2.py @@ -1,6 +1,6 @@ import time -from os import environ, listdir +from os import environ, listdir, path from jinja2 import pass_context @@ -44,7 +44,7 @@ def timestamp(timestamp): def inject_constants(): return {"environ":environ, "SITE":SITE, "SITE_NAME":SITE_NAME, "SITE_FULL":SITE_FULL, "AUTOJANNY_ID":AUTOJANNY_ID, "PUSHER_ID":PUSHER_ID, - "CC":CC, "CC_TITLE":CC_TITLE, "listdir":listdir, "AEVANN_ID":AEVANN_ID, + "CC":CC, "CC_TITLE":CC_TITLE, "listdir":listdir, "os_path":path, "AEVANN_ID":AEVANN_ID, "PIZZASHILL_ID":PIZZASHILL_ID, "DEFAULT_COLOR":DEFAULT_COLOR, "COLORS":COLORS, "time":time, "PERMS":PERMS, "FEATURES":FEATURES, "HOLE_NAME":HOLE_NAME, "HOLE_STYLE_FLAIR":HOLE_STYLE_FLAIR, "HOLE_REQUIRED":HOLE_REQUIRED, diff --git a/files/templates/default.html b/files/templates/default.html index e3e66e570..af1ef1fef 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -1,5 +1,6 @@ {%- import 'util/helpers.html' as help -%} {%- import 'html_head.html' as html_head with context -%} +{%- import 'util/macros.html' as macros with context -%} {% if request.path == '/' %} @@ -29,45 +30,16 @@ {% block Banner %} {% include "modals/expanded_image.html" %} - {% if '@' not in request.path %} - {% if sub and SITE_NAME != 'WPD' %} - - /h/{{sub}} banner - - {% elif SITE_NAME == 'rDrama' %} - - {% if v and (v.is_banned or v.agendaposter) %} - site banner - {% else %} - {% set path = "assets/images/" + SITE_NAME + "/banners" %} - {% set image = "/" + path + "/" + listdir('files/' + path)|random() + '?v=25' %} - site banner - {% endif %} - - {% elif SITE_NAME == 'WPD' %} - {% if v %} - {% set path = "assets/images/" + SITE_NAME + "/banners" %} - {% set banner = "/" + path + "/" + listdir('files/' + path)|random() + '?v=1' %} - {% else %} - {% set banner = 'cached.webp' | asset_siteimg %} - {% endif %} - - site banner - - {% else %} - {% if SITE_NAME == 'PCM' %} - {# set path = "assets/images/" + SITE_NAME + "/banners" #} - {# set banner = "/" + path + "/" + listdir('files/' + path)|max + '?v=1' #} - {% set path = "assets/images/" + SITE_NAME + "/banner_rotation" %} - {% set banner = "/" + path + "/" + listdir('files/' + path)|random() + '?v=1' %} - {% else %} - {% set banner = 'banner.webp' | asset_siteimg %} - {% endif %} + {% if '@' not in request.path %} - - site banner - + {% if sub and SITE_NAME != WPD %} + {% set src = sub.banner_url %} + {% set alt = ['/h/', sub, 'banner']|join %} + {% elif SITE_NAME == "rDrama" %} + {% set href = "https://secure.transequality.org/site/Donation2?df_id=1480" %} {% endif %} + + {{ macros.banner(src, href, alt) }} {% endif %} {% endblock %} diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html index d93a159b0..2c0521f12 100644 --- a/files/templates/sidebar_WPD.html +++ b/files/templates/sidebar_WPD.html @@ -1,8 +1,7 @@
{%- if v -%} - {%- set art_path = 'assets/images/WPD/sidebar' -%} - {%- set art_image = '/' + art_path + '/' + listdir('files/' + art_path)|random() + '?v=45' -%} + {%- set art_image = macros.random_image("sidebar") -%} {%- else -%} {%- set art_image = '/i/' + SITE_NAME + '/sidebar.webp?v=3000' -%} {%- endif -%} diff --git a/files/templates/sidebar_rDrama.html b/files/templates/sidebar_rDrama.html index 60a4f9d1e..92da421f5 100644 --- a/files/templates/sidebar_rDrama.html +++ b/files/templates/sidebar_rDrama.html @@ -3,8 +3,7 @@ {% if sub %} {% set image=sub.sidebar_url %} {% else %} - {% set path = "assets/images/" + SITE_NAME + "/sidebar" %} - {% set image = "/" + path + "/" + listdir('files/' + path)|random() + '?v=45' %} + {% set image = macros.random_image("sidebar") %} {% endif %} {% if request.path != '/sidebar' %} diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html new file mode 100644 index 000000000..2009f0dbd --- /dev/null +++ b/files/templates/util/macros.html @@ -0,0 +1,21 @@ +{% macro banner(src, href, alt) %} + + {{alt|default('site banner')}} + +{% endmacro %} + +{% macro live_banner() %} + {% set path = "files/assets/images/" + SITE_NAME %} + {% if not v and os_path.exists(path + "/cached.webp") %} + {{ 'cached.webp' | asset_siteimg }} + {% elif os_path.exists(path + "/banners") %} + {{ random_image("banners") }} + {% else %} + {{ 'banner.webp' | asset_siteimg }} + {% endif %} +{% endmacro %} + +{% macro random_image(assetdir) %} + {% set path = "assets/images/" + SITE_NAME + "/" + assetdir %} + {{ "/" + path + "/" + listdir('files/' + path)|random() + '?v=45' }} +{% endmacro %}