From 18de3adfce7aeddcd33d50bdd80c27880aa835c2 Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Tue, 27 Feb 2024 09:34:11 +1100 Subject: [PATCH] Similarly load CSS via Django staticfiles app --- conservancy/static/activities/index.html | 3 ++- conservancy/static/sustainer/event.html | 3 ++- conservancy/static/sustainer/original-supporter-appeal.html | 2 +- conservancy/templates/base_compliance.html | 3 ++- conservancy/templates/base_conservancy.html | 6 +++--- conservancy/templates/base_press.html | 3 ++- conservancy/templates/base_vizio.html | 3 ++- conservancy/templates/supporter/index.html | 2 +- conservancy/urls.py | 2 -- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/conservancy/static/activities/index.html b/conservancy/static/activities/index.html index 8e2a9ecf..e7f89cef 100644 --- a/conservancy/static/activities/index.html +++ b/conservancy/static/activities/index.html @@ -1,9 +1,10 @@ {% extends "base_conservancy.html" %} {% load cache %} {% load humanize %} +{% load static %} {% block category %}WhatWeDo{% endblock %} {% block head %} - + {% endblock %} diff --git a/conservancy/static/sustainer/event.html b/conservancy/static/sustainer/event.html index 949a9853..a08c0913 100644 --- a/conservancy/static/sustainer/event.html +++ b/conservancy/static/sustainer/event.html @@ -1,9 +1,10 @@ {% extends "base_conservancy.html" %} +{% load static %} {% block subtitle %}Attend Supporter Night - {% endblock %} {% block category %}supporter{% endblock %} {% block head %} - + {% endblock %} {% block content %} diff --git a/conservancy/static/sustainer/original-supporter-appeal.html b/conservancy/static/sustainer/original-supporter-appeal.html index 7aae27c0..d99159a7 100644 --- a/conservancy/static/sustainer/original-supporter-appeal.html +++ b/conservancy/static/sustainer/original-supporter-appeal.html @@ -6,7 +6,7 @@ {% block head %} - + {% endblock %} {% block content %} diff --git a/conservancy/templates/base_compliance.html b/conservancy/templates/base_compliance.html index ae2e61c3..60bf0261 100644 --- a/conservancy/templates/base_compliance.html +++ b/conservancy/templates/base_compliance.html @@ -2,8 +2,9 @@ {% block category %}WhatWeDo{% endblock %} {% load cache %} {% load humanize %} +{% load static %} {% block head %} - + {% endblock %} diff --git a/conservancy/templates/base_conservancy.html b/conservancy/templates/base_conservancy.html index ccc9ccc7..7e3c8b2b 100644 --- a/conservancy/templates/base_conservancy.html +++ b/conservancy/templates/base_conservancy.html @@ -12,9 +12,9 @@ - - - + + + {% block head %}{% endblock %} diff --git a/conservancy/templates/base_press.html b/conservancy/templates/base_press.html index 2be7edf4..4db2e11a 100644 --- a/conservancy/templates/base_press.html +++ b/conservancy/templates/base_press.html @@ -1,9 +1,10 @@ {% extends "base_conservancy.html" %} {% load cache %} {% load humanize %} +{% load static %} {% block category %}News{% endblock %} {% block head %} - + {% endblock %} diff --git a/conservancy/templates/base_vizio.html b/conservancy/templates/base_vizio.html index 36a7ba70..471f0bda 100644 --- a/conservancy/templates/base_vizio.html +++ b/conservancy/templates/base_vizio.html @@ -1,9 +1,10 @@ {% extends "base_conservancy.html" %} {% load cache %} {% load humanize %} +{% load static %} {% block category %}Vizio{% endblock %} {% block head %} - + {% endblock %} diff --git a/conservancy/templates/supporter/index.html b/conservancy/templates/supporter/index.html index 0a3a07de..dc55b756 100644 --- a/conservancy/templates/supporter/index.html +++ b/conservancy/templates/supporter/index.html @@ -5,7 +5,7 @@ {% block head %} - + {% include "opengraph_partial.html" with url="/sustainer/" title="Support Conservancy!" description="Software freedom is critical to many of today’s most pressing social issues, but it’s only effective when FOSS is for everyone. Support Conservancy today to help make that happen!" %} {% include "opengraph_urllist_partial.html" with property='image' urls='' fallback='/img/conservancy-logo.png' %} {% endblock %} diff --git a/conservancy/urls.py b/conservancy/urls.py index 0a325345..ce812016 100644 --- a/conservancy/urls.py +++ b/conservancy/urls.py @@ -29,9 +29,7 @@ admin.autodiscover() urlpatterns = [ # Uncomment these 3 lines when testing locally to get static content - url(r'^css', static_views.index), url(r'^img', static_views.index), - url(r'^js', static_views.index), url(r'^$', frontpage.view), url(r'^sponsors$', frontpage.view), url(r'^sponsors/$', sponsors.view),