From 18de3adfce7aeddcd33d50bdd80c27880aa835c2 2024-02-26 22:34:11
From: Ben Sturmfels <ben@sturm.com.au>
Date: 2024-02-26 22:34:11
Subject: [PATCH] Similarly load CSS via Django staticfiles app

---

diff --git a/conservancy/static/activities/index.html b/conservancy/static/activities/index.html
index 8e2a9ecfff4b3e80a01d0feec0203022d457a50b..e7f89cef206076803ba7fe0e0a7272c427ad4867 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 %}
-<link href="/css/forms.css" rel="stylesheet" type="text/css"/>
+<link href="{% static 'css/forms.css' %}" rel="stylesheet" type="text/css"/>
 
 {% endblock %}
 
diff --git a/conservancy/static/sustainer/event.html b/conservancy/static/sustainer/event.html
index 949a9853efe58107456ad05083138fd29c2bb9e4..a08c09135c4ad3ffd5948182c0f6b94ae66373cb 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 %}
-<link href="/css/forms.css" rel="stylesheet" type="text/css"/>
+<link href="{% static 'css/forms.css' %}" rel="stylesheet" type="text/css"/>
 {% endblock %}
 
 {% block content %}
diff --git a/conservancy/static/sustainer/original-supporter-appeal.html b/conservancy/static/sustainer/original-supporter-appeal.html
index 7aae27c0ed13015f82418bab6ed87ea948508dc1..d99159a7e3b0c4ac445214cf6b4898b28b1063f3 100644
--- a/conservancy/static/sustainer/original-supporter-appeal.html
+++ b/conservancy/static/sustainer/original-supporter-appeal.html
@@ -6,7 +6,7 @@
 
 {% block head %}
 <script type="text/javascript" src="{% static 'js/supporter-page.js' %}"></script>
-<link href="/css/forms.css" rel="stylesheet" type="text/css"/>
+<link href="{% static 'css/forms.css' %}" rel="stylesheet" type="text/css"/>
 {% endblock %}
 
 {% block content %}
diff --git a/conservancy/templates/base_compliance.html b/conservancy/templates/base_compliance.html
index ae2e61c327a9b22f4712536d6f9ef76bfc5793dc..60bf02611edaefaa36517bb04c911d7e510f1715 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 %}
-<link href="/css/forms.css" rel="stylesheet" type="text/css"/>
+<link href="{% static 'css/forms.css' %}" rel="stylesheet" type="text/css"/>
 
 {% endblock %}
 
diff --git a/conservancy/templates/base_conservancy.html b/conservancy/templates/base_conservancy.html
index ccc9ccc73e628a2ad3c6dd4297935771a80928f9..7e3c8b2bdbb5aba5ce159efa43f6325aa8379b7c 100644
--- a/conservancy/templates/base_conservancy.html
+++ b/conservancy/templates/base_conservancy.html
@@ -12,9 +12,9 @@
     <meta name="description" content="The Software Freedom Conservancy provides a non-profit home and services to Free, Libre and Open Source Software (FLOSS) projects." />
     <meta name="keywords" content="software, freedom, conservancy, open source, gnu, GNU, Open Source, Free and Open Source, Free and Open Source Software, FLOSS, FOSS, protect, protection, help, policy, linux, non-profit" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
-    <link rel="stylesheet" type="text/css" href="/css/tachyons.css"/>
-    <link rel="stylesheet" type="text/css" media="screen" href="/css/conservancy.css" />
-    <link rel="stylesheet" type="text/css" media="(min-width: 67em)" href="/css/conservancy-bigscreen.css" />
+    <link rel="stylesheet" type="text/css" href="{% static 'css/tachyons.css' %}"/>
+    <link rel="stylesheet" type="text/css" media="screen" href="{% static 'css/conservancy.css' %}" />
+    <link rel="stylesheet" type="text/css" media="(min-width: 67em)" href="{% static 'css/conservancy-bigscreen.css' %}" />
     <script type="text/javascript" src="{% static 'js/jquery-1.7.2.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/conservancy.js' %}"></script>
     {% block head %}{% endblock %}
diff --git a/conservancy/templates/base_press.html b/conservancy/templates/base_press.html
index 2be7edf438b9c83297b786fec97bbe32befc5342..4db2e11a1734e565407914d047f1a0f21b714781 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 %}
-<link href="/css/forms.css" rel="stylesheet" type="text/css"/>
+<link href="{% static 'css/forms.css' %}" rel="stylesheet" type="text/css"/>
 
 {% endblock %}
 
diff --git a/conservancy/templates/base_vizio.html b/conservancy/templates/base_vizio.html
index 36a7ba7055102695b16c7adb4401bc3a9b091225..471f0bda0f24109bfab79f12773b62cff0fbef5b 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 %}
-<link href="/css/forms.css" rel="stylesheet" type="text/css"/>
+<link href="{% static 'css/forms.css' %}" rel="stylesheet" type="text/css"/>
 
 {% endblock %}
 
diff --git a/conservancy/templates/supporter/index.html b/conservancy/templates/supporter/index.html
index 0a3a07de73aedb0d75ac54c85a4b2c13e94b3fa8..dc55b75602a622d67422bee68c7449c6aa198f5a 100644
--- a/conservancy/templates/supporter/index.html
+++ b/conservancy/templates/supporter/index.html
@@ -5,7 +5,7 @@
 
 {% block head %}
 <script type="text/javascript" src="{% static 'js/supporter-page.js' %}"></script>
-<link href="/css/forms.css" rel="stylesheet" type="text/css"/>
+<link href="{% static 'css/forms.css' %}" rel="stylesheet" type="text/css"/>
 {% include "opengraph_partial.html" with url="/sustainer/" title="Support Conservancy!" description="Software freedom is critical to many of today&rsquo;s most pressing social issues, but it&rsquo;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 0a325345cc582a5ec2155ecccea9a168e5df46c4..ce8120162c3b6c847bcd6283c88abe689f5e19f4 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),