diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py index dcdf615d5..a6c535c2b 100644 --- a/bookwyrm/context_processors.py +++ b/bookwyrm/context_processors.py @@ -1,16 +1,18 @@ """ customize the info available in context for rendering templates """ from bookwyrm import models -from bookwyrm.settings import SITE_PATH, STATIC_URL, STATIC_PATH, MEDIA_URL, MEDIA_PATH +from bookwyrm.settings import STATIC_URL, STATIC_PATH, MEDIA_URL, MEDIA_PATH def site_settings(request): # pylint: disable=unused-argument """include the custom info about the site""" + request_protocol = "https://" if request.is_secure() else "http://" + return { "site": models.SiteSettings.objects.get(), "active_announcements": models.Announcement.active_announcements(), - "site_path": SITE_PATH, "static_url": STATIC_URL, "media_url": MEDIA_URL, "static_path": STATIC_PATH, "media_path": MEDIA_PATH, + "request_protocol": request_protocol, } diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 47553c65f..b0ff5a72c 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -182,14 +182,12 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.2/howto/static-files/ -SITE_PATH = "https://%s" % DOMAIN - PROJECT_DIR = os.path.dirname(os.path.abspath(__file__)) STATIC_URL = "/static/" -STATIC_PATH = "%s/%s" % (SITE_PATH, env("STATIC_ROOT", "static")) +STATIC_PATH = "%s/%s" % (DOMAIN, env("STATIC_ROOT", "static")) STATIC_ROOT = os.path.join(BASE_DIR, env("STATIC_ROOT", "static")) MEDIA_URL = "/images/" -MEDIA_PATH = "%s/%s" % (SITE_PATH, env("MEDIA_ROOT", "images")) +MEDIA_PATH = "%s/%s" % (DOMAIN, env("MEDIA_ROOT", "images")) MEDIA_ROOT = os.path.join(BASE_DIR, env("MEDIA_ROOT", "images")) USER_AGENT = "%s (BookWyrm/%s; +https://%s/)" % ( diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 7b47e32b6..c40209964 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -4,8 +4,8 @@ {% block title %}{{ book|book_title }}{% endblock %} {% block opengraph_images %} - - + + {% endblock %} {% block content %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 625a224e6..c06294d9c 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -17,8 +17,8 @@ {% block opengraph_images %} - - + + {% endblock %} diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index b73d47c84..a645b07bb 100644 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -8,8 +8,8 @@ {% block title %}{{ user.display_name }}{% endblock %} {% block opengraph_images %} - - + + {% endblock %} {% block content %}