diff --git a/conservancy/podjango/feeds.py b/conservancy/podjango/feeds.py index a0e32aa2..9f24d34a 100644 --- a/conservancy/podjango/feeds.py +++ b/conservancy/podjango/feeds.py @@ -59,13 +59,13 @@ class CastFeedBase(Feed): def for_podcast_feed_extra_kwargs(self, obj): return { 'managingEditorNames': 'Bradley and Karen', - 'rssImage': {'url': 'http://faif.us/img/cast/faif_144x144.jpg', + 'rssImage': {'url': 'https://sfconservancy.org/static/podjango/img/cast/faif_144x144.jpg', 'width': '144', 'height': '144'}, 'webMaster': 'oggcast@faif.us (Bradley and Karen)', 'dcCreator': 'oggcast@faif.us (Bradley and Karen)', 'iTunesExplicit': 'No', 'iTunesBlock': 'No', - 'iTunesImage': {'url': 'http://faif.us/img/cast/faif_300x300.jpg', + 'iTunesImage': {'url': 'https://sfconservancy.org/static/podjango/img/cast/faif_300x300.jpg', 'title': 'The Corresponding Source (formerly Free as in Freedom)', 'link': self.author_link, 'type': 'video/jpg'}, diff --git a/conservancy/podjango/templates/podjango/feeds/podcast_description.html b/conservancy/podjango/templates/podjango/feeds/podcast_description.html index 6fcca1fe..c16eccd2 100644 --- a/conservancy/podjango/templates/podjango/feeds/podcast_description.html +++ b/conservancy/podjango/templates/podjango/feeds/podcast_description.html @@ -1,8 +1,10 @@ +{% load static %} +
{{ obj.summary|safe }} diff --git a/conservancy/static/GiveUpGitHub/index.html b/conservancy/static/GiveUpGitHub/index.html index 78b6ded0..f8cb2ed5 100644 --- a/conservancy/static/GiveUpGitHub/index.html +++ b/conservancy/static/GiveUpGitHub/index.html @@ -1,4 +1,5 @@ {% extends "base_compliance.html" %} +{% load static %} {% block subtitle %}Give Up GitHub - {% endblock %} {% block submenuselection %}GiveUpGitHub{% endblock %} {% block content %} @@ -9,8 +10,8 @@ calling on all FOSS developers to give up on GitHub.
-We realize this is not an easy task; GitHub is ubiquitous. Through their effective marketing, GitHub has convinced Free and Open Source Software @@ -39,7 +40,7 @@ as we'll continue to update it throughout 2022 and beyond!
There are so many reasons to give up on GitHub, but we list here a few of the most important ones: - +
Copilot is a for-profit product — developed and marketed by Microsoft @@ -107,7 +108,7 @@ top. We've personally observed various GitHub employees over the years arguing in many venues to convince projects to avoid copyleft; we've even seen a GitHub employee do this in a GitHub bug ticket directly.
GitHub is wholly owned by Microsoft, a company whose executives have historically repeatedly attacked copyleft licensing.
Conservancy's Logo is also licensed under CC-By-SA - 4.0. A Conservancy logo + 4.0. A Conservancy logo package in ZIP format is available, which includes high quality SVG, PNG and other formats.
diff --git a/conservancy/static/css/conservancy.css b/conservancy/static/css/conservancy.css index bdb3b92f..17101a5d 100644 --- a/conservancy/static/css/conservancy.css +++ b/conservancy/static/css/conservancy.css @@ -583,7 +583,7 @@ body.conservancy-sponsors #navbar ul li.sponsors > a /* NO COMMA HERE! */ display: inline-block; height: 2em; width: 2em; - background-image: url(/img/conservancy-supporter-heart.svg); + background-image: url(/static/img/conservancy-supporter-heart.svg); background-size: contain; background-repeat: no-repeat; padding: 0.25em 1.2em 0.25em 0.25em; diff --git a/conservancy/static/docs/GiveUpGitHub-README.md b/conservancy/static/docs/GiveUpGitHub-README.md index 998e1aae..8f7d251c 100644 --- a/conservancy/static/docs/GiveUpGitHub-README.md +++ b/conservancy/static/docs/GiveUpGitHub-README.md @@ -8,4 +8,4 @@ Any use of this project's code by GitHub Copilot, past or present, is done witho Join us; you can [give up GitHub](https://GiveUpGitHub.org) too! -![Logo of the GiveUpGitHub campaign](https://sfconservancy.org/img/GiveUpGitHub.png) +![Logo of the GiveUpGitHub campaign](https://sfconservancy.org/static/img/GiveUpGitHub.png) diff --git a/conservancy/static/docs/SupportGiveUpGitHub-README-snippet.md b/conservancy/static/docs/SupportGiveUpGitHub-README-snippet.md index 3e9f7a0e..345aa338 100644 --- a/conservancy/static/docs/SupportGiveUpGitHub-README-snippet.md +++ b/conservancy/static/docs/SupportGiveUpGitHub-README-snippet.md @@ -21,4 +21,4 @@ Any use of this project's code by GitHub Copilot, past or present, is done without our permission. We do not consent to GitHub's use of this project's code in Copilot. -![Logo of the GiveUpGitHub campaign](https://sfconservancy.org/img/GiveUpGitHub.png) +![Logo of the GiveUpGitHub campaign](https://sfconservancy.org/static/img/GiveUpGitHub.png) diff --git a/conservancy/static/fossy/index.html b/conservancy/static/fossy/index.html index af2fc166..18a7a0ed 100644 --- a/conservancy/static/fossy/index.html +++ b/conservancy/static/fossy/index.html @@ -1,4 +1,5 @@ {% extends "base_standard.html" %} +{% load static %} {% block subtitle %}FOSSY - {% endblock %} {% block submenuselection %}FOSSY{% endblock %} {% block content %} @@ -15,7 +16,7 @@ Center!CC-BY 2.0 Oregon Convention Center
Conservancy has a plan to help all non-profit organizations (NPOs) by creating an Open Source and Free Software accounting system usable by diff --git a/conservancy/static/projects/current/index.html b/conservancy/static/projects/current/index.html index aabda1ad..54c7d198 100644 --- a/conservancy/static/projects/current/index.html +++ b/conservancy/static/projects/current/index.html @@ -1,4 +1,5 @@ {% extends "base_projects.html" %} +{% load static %} {% block subtitle %}Current Projects - {% endblock %} {% block submenuselection %}Current{% endblock %} {% block head %} @@ -12,7 +13,7 @@
Sourceware is a Free Software hosting project for toolchain and developer tools. Free Software needs Free Infrastructure. It is @@ -618,7 +619,7 @@ projects.
Copy and paste this HTML for the image above:
Also, please enjoy these “Sustainer Cards”, which you print out and carry with you. You've earned it! The cards are available in two different - styles: Style 1 - (SVG), Style 2 + styles: Style 1 + (SVG), Style 2 (SVG).
{% endblock %} diff --git a/conservancy/templates/base_conservancy.html b/conservancy/templates/base_conservancy.html index d71a25fb..c30b376e 100644 --- a/conservancy/templates/base_conservancy.html +++ b/conservancy/templates/base_conservancy.html @@ -26,7 +26,7 @@ diff --git a/conservancy/templates/blog/entry_detail.html b/conservancy/templates/blog/entry_detail.html index 87488a68..9d166859 100644 --- a/conservancy/templates/blog/entry_detail.html +++ b/conservancy/templates/blog/entry_detail.html @@ -1,8 +1,9 @@ {% extends "base_blog.html" %} +{% load static %} {% block head %} {% include "opengraph_partial.html" with url=object.get_absolute_url title=object.headline description=object.get_description %} -{% include "opengraph_urllist_partial.html" with property='image' urls=object.get_one_image_url fallback='/img/conservancy-logo.png' %} +{% include "opengraph_urllist_partial.html" with property='image' urls=object.get_one_image_url fallback='/static/img/conservancy-logo.png' %} {% include "opengraph_urllist_partial.html" with property='video' urls=object.get_one_video_url %} {% endblock %} diff --git a/conservancy/templates/blog/entry_list.html b/conservancy/templates/blog/entry_list.html index 60e5fd7d..624133b8 100644 --- a/conservancy/templates/blog/entry_list.html +++ b/conservancy/templates/blog/entry_list.html @@ -1,4 +1,6 @@ {% extends "base_blog.html" %} +{% load static %} + {% block subtitle %}Conservancy Blog - {% endblock %} {% block content %} @@ -6,7 +8,7 @@Displaying posts
diff --git a/conservancy/templates/frontpage.html b/conservancy/templates/frontpage.html
index 6fabcb68..dcf31aab 100644
--- a/conservancy/templates/frontpage.html
+++ b/conservancy/templates/frontpage.html
@@ -52,15 +52,15 @@ strategies that defend FOSS (such as copyleft).
(Page {{ news.number }} of {{ news.paginator.num_pages }})
Download Karen's talk
or watch on YouTube Group Picture: Outreachy interns, mentors, and community coordinators gathered to celebrate the 1,000 interns milestone in Lagos, Nigeria. You can view a video of the celebration here. Sustainers pose with Karen! We are providing a 30-day window, starting on February 3, 2024 (and ending at 23:59 AoE on March 4, 2024), in which companies can send us the email address of their CCIRT (to compliance@sfconservancy.org with Subject "CCIRT contact") so we can contact this team about any source candidates we receive, giving them 7 calendar days to confirm all potential copyleft licenses issues are resolved. At the end of these 7 days, we will publish the updated source candidate (if we receive one), or the original (if no update is received). If we have no contact registered, the source candidate will be published without any grace period following the initial 30-day window. After this initial 30-day window, companies can still send us the email address of their CCIRT and, after we receive this email address, we will give them 7 calendar days from the first notification of an incomplete source candidate to resolve the issue. However, it is best for companies to let us know about their CCIRT before this 30-day window ends in case there are any pending source candidates to publish when that 30-day window ends. The process after these 30 days is as follows: For the avoidance of doubt, and to hopefully prevent a wave of last-minute CCIRT submissions on the final day of this 30-day window, SFC is providing for 7 calendar days after the 30-day window ends (so 37 days from February 3, or until 23:59 AoE on March 11, 2024), to any company that provides the email address of their CCIRT at any time during this 30-day window, the option to correct its source candidates before we publish them. So it is beneficial for companies to inform us of their CCIRT sooner rather than later, so they have as much of that 37 days as possible to correct all copyleft compliance issues. SFC looks forward to working with all the CCIRTs who register with us. News
+ News
{% for pressr in press_releases|slice:":4" %}
{% if forloop.first %}
{% include "news/pressrelease_partial.html" with pressr=pressr show="summary" only %}
@@ -73,7 +73,7 @@ strategies that defend FOSS (such as copyleft).
Articles
+ Articles
{% for entry in blog|slice:":5" %}
{% if forloop.first or entry.pub_date|date_within_past_days:180 %}
{% if not forloop.first %}
{% endif %}
diff --git a/conservancy/templates/news/pressrelease_detail.html b/conservancy/templates/news/pressrelease_detail.html
index 90ac7fcf..378809fb 100644
--- a/conservancy/templates/news/pressrelease_detail.html
+++ b/conservancy/templates/news/pressrelease_detail.html
@@ -1,8 +1,9 @@
{% extends "base_news.html" %}
+{% load static %}
{% block head %}
{% include "opengraph_partial.html" with url=object.get_absolute_url title=object.headline description=object.get_description %}
-{% include "opengraph_urllist_partial.html" with property='image' urls=object.get_one_image_url fallback='/img/conservancy-logo.png' %}
+{% include "opengraph_urllist_partial.html" with property='image' urls=object.get_one_image_url fallback='/static/img/conservancy-logo.png' %}
{% include "opengraph_urllist_partial.html" with property='video' urls=object.get_one_video_url %}
{% endblock %}
diff --git a/conservancy/templates/news/pressrelease_list.html b/conservancy/templates/news/pressrelease_list.html
index e97ab213..05611f70 100644
--- a/conservancy/templates/news/pressrelease_list.html
+++ b/conservancy/templates/news/pressrelease_list.html
@@ -1,4 +1,6 @@
{% extends "base_news.html" %}
+{% load static %}
+
{% block subtitle %}News - {% endblock %}
{% block outercontent %}
@@ -7,7 +9,7 @@
- Conservancy News
+ Conservancy News
{% ifnotequal news.number 1 %}
-
diff --git a/conservancy/templates/supporter/banners.html b/conservancy/templates/supporter/banners.html
index d965ea68..1c0512ee 100644
--- a/conservancy/templates/supporter/banners.html
+++ b/conservancy/templates/supporter/banners.html
@@ -1,4 +1,6 @@
{% extends "base_conservancy.html" %}
+{% load static %}
+
{% block subtitle %}Sustainer Banners - {% endblock %}
{% block category %}sustainer{% endblock %}
@@ -13,7 +15,7 @@
<div style="margin: 0 auto; max-width: 1200px;">
<a href="https://sfconservancy.org/sustainer">
<img style="width: 100%;"
- src="https://sfconservancy.org/img/banners/2019-individuals-banner.png"
+ src="https://sfconservancy.org/static/img/banners/2019-individuals-banner.png"
alt="Conservancy is a proponent for community driven free software projects.
Will you join me in supporting them? Donate today!">
</a>
@@ -23,7 +25,7 @@
<div style="margin: 0 auto; max-width: 1200px;">
<a href="https://sfconservancy.org/sustainer">
<img style="width: 100%;"
- src="https://sfconservancy.org/img/banners/2019-member-projects-banner.png"
+ src="https://sfconservancy.org/static/img/banners/2019-member-projects-banner.png"
alt="Conservancy helps make our work possible.
Please donate to them today to support community-driven free software projects!"
</a>
@@ -44,7 +46,7 @@
Help us Continue this Work
From left: Stefano “Zack” Zacchiroli, Karen M. Sandler, John Sullivan, and Jim Wright