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 %} +

-[Direct download of cast in Ogg/Vorbis
-                                          format] -[Direct download of cast in MP3 format] +[Direct download of cast in Ogg/Vorbis
+                                          format] +[Direct download of cast in MP3 format]

{{ 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.

-
-A parody of the GitHub logo, walling off user rights and demanding payment +
+A parody of the GitHub logo, walling off user rights and demanding payment

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: - +

diff --git a/conservancy/static/about/license/index.html b/conservancy/static/about/license/index.html index c3a843d6..dbff414d 100644 --- a/conservancy/static/about/license/index.html +++ b/conservancy/static/about/license/index.html @@ -1,4 +1,5 @@ {% extends "base_about.html" %} +{% load static %} {% block subtitle %}License and Sources - {% endblock %} {% block submenuselection %}License{% endblock %} {% block content %} @@ -20,7 +21,7 @@

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!

- Aerial photograph of the Oregon Convention Center + Aerial photograph of the Oregon Convention Center

CC-BY 2.0 Oregon Convention Center

diff --git a/conservancy/static/npoacct/index.html b/conservancy/static/npoacct/index.html index 1942e93f..d69f3cd3 100644 --- a/conservancy/static/npoacct/index.html +++ b/conservancy/static/npoacct/index.html @@ -1,5 +1,6 @@ {% extends "base_conservancy.html" %} {% load humanize %} +{% load static %} {% block subtitle %}NPOAcct - {% endblock %} {% block category %}npoacct{% endblock %} @@ -38,7 +39,7 @@

Non-Profit Accounting Software

-Conservancy accounting campaign logo +Conservancy accounting campaign logo

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 @@

ArgoUML

- +
@@ -26,7 +27,7 @@ and is available in ten languages. See the feature list for more details.

Backdrop CMS

- + @@ -42,7 +43,7 @@ can still afford a fantastic Open Source Content Management System.

Bongo

- +

The Bongo Project is creating fun and simple mail, calendaring and contacts software: on top of a standards-based server stack; we're @@ -53,7 +54,7 @@ much more focused on how people want to organize their lives.

Buildbot

- + @@ -70,7 +71,7 @@ software development cycle.

BusyBox

- + @@ -96,7 +97,7 @@ in /etc, and a Linux kernel.

Common Workflow Language

- + @@ -113,7 +114,7 @@ bioinformatics, medical imaging, astronomy, physics, and chemistry.

coreboot

- + @@ -130,7 +131,7 @@ and Internet of Things devices.

Darcs

- + @@ -162,7 +163,7 @@ licensed under the GNU GPL.

Etherpad

- + @@ -175,7 +176,7 @@ collaborative real-time editing.

FreeDV

- +

FreeDV is a suite of open source software and accompanying hardware for digital voice communication over HF radio. It consists of a voice codec @@ -205,7 +206,7 @@ protocol implementations cooperative and support for SSL sockets.

Git

- + @@ -240,7 +241,7 @@ Linux kernel.

Harvey OS

- + @@ -266,7 +267,7 @@ maintain themselves.

Inkscape

- + @@ -304,7 +305,7 @@ software operating systems and research tools.

K-3D

- + @@ -320,7 +321,7 @@ professional artists.

Kallithea

- + @@ -335,7 +336,7 @@ version control system of your choice.

LibreHealth

- + @@ -370,7 +371,7 @@ Linux XIA's speed and flexibility.

Mercurial

- + @@ -388,7 +389,7 @@ Public License.

Metalink

- + @@ -406,7 +407,7 @@ or safety.

MicroBlocks

- + @@ -418,7 +419,7 @@ or safety.

North Bay Python

- + @@ -432,7 +433,7 @@ students interested in the Python programming language.

OpenTripPlanner

- + @@ -451,7 +452,7 @@ transportation analysis, including measures of mobility and accessibility.

OpenWrt

- + @@ -471,7 +472,7 @@ never envisioned.

Outreachy

- + @@ -487,7 +488,7 @@ internship opportunities twice a year with many free software organizations.

phpMyAdmin

- + @@ -508,7 +509,7 @@ seventy languages.

QEMU

- + @@ -529,7 +530,7 @@ seventy languages.

Racket

- + @@ -543,7 +544,7 @@ or use one of the dozens already available.

Reproducible Builds

- + @@ -558,7 +559,7 @@ whistleblowers, or anyone wishing to communicate securely under a repressive reg

Samba

- + @@ -585,7 +586,7 @@ of systems, and equipment. Samba is released under the GPL.

Selenium

- + @@ -609,7 +610,7 @@ Safari and Opera.

- +

Sourceware is a Free Software hosting project for toolchain and developer tools. Free Software needs Free Infrastructure. It is @@ -618,7 +619,7 @@ projects.

Squeak

- +
@@ -635,7 +636,7 @@ educational platforms to commercial web application development.

SurveyOS

- +

The Survey Open Source (SurveyOS) Project is a non-profit project of the Software Freedom Conservancy dedicated to fostering cooperation @@ -648,7 +649,7 @@ functionality to other software.

SWIG

- + @@ -667,7 +668,7 @@ C/C++ software.

Teaching Open Source

- + @@ -683,7 +684,7 @@ both academia and FLOSS projects.

Wine

- + @@ -703,7 +704,7 @@ x86-based Unixes, including Linux, Mac OS X, FreeBSD, and Solaris.

Xapian

- + diff --git a/conservancy/static/sustainer/original-supporter-appeal.html b/conservancy/static/sustainer/original-supporter-appeal.html index d99159a7..05baf931 100644 --- a/conservancy/static/sustainer/original-supporter-appeal.html +++ b/conservancy/static/sustainer/original-supporter-appeal.html @@ -73,7 +73,7 @@ community-focused free software and help us be able to continue our charitable work. Donating to Conservancy is a great non-technical way to contribute to the cause.

-*** The Conservancy T-Shirt that Supporters Receive *** +*** The Conservancy T-Shirt that Supporters Receive ***

For the first time, we're launching a Supporter program. For , you can @@ -112,7 +112,7 @@ of dollars in licensing fees for subpar accounting software. discusses important legal and policy issues in open source and free software. -* +*

As an organization, we try to do everything transparently; even our @@ -172,7 +172,7 @@ internal policies are published and available for scrutiny.


@@ -233,7 +233,7 @@ internal policies are published and available for scrutiny.




Button above redirects to PayPal's site for credit diff --git a/conservancy/static/sustainer/thank-you.html b/conservancy/static/sustainer/thank-you.html index 03d02791..3e3999fc 100644 --- a/conservancy/static/sustainer/thank-you.html +++ b/conservancy/static/sustainer/thank-you.html @@ -1,4 +1,5 @@ {% extends "base_conservancy.html" %} +{% load static %} {% block subtitle %}Thanks for Your Support - {% endblock %} {% block category %}sustainer{% endblock %} @@ -24,18 +25,18 @@ special Sustainer-only benefits in the coming year.

a “Sustainer Badge” on your website, social media, or other locations where people view information about you:

-

Become a Conservancy Sustainer!

+

Become a Conservancy Sustainer!

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 @@

Home / News

-

[RSS] Conservancy Blog{% if author %} — {{ author.formal_name }}{% endif %}

+

[RSS] Conservancy Blog{% if author %} — {{ author.formal_name }}{% endif %}

{% if authors or tags %}

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).

Software Freedom Conservancy introduction video
+ + +Software Freedom Conservancy introduction video
(watch on Youtube)

-

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 @@ -

[RSS] Conservancy News

+

[RSS] Conservancy News

{% ifnotequal news.number 1 %}

(Page {{ news.number }} of {{ news.paginator.num_pages }})

{% endifnotequal %} diff --git a/conservancy/templates/sponsors.html b/conservancy/templates/sponsors.html index c54b4c9c..601ca6ec 100644 --- a/conservancy/templates/sponsors.html +++ b/conservancy/templates/sponsors.html @@ -1,4 +1,6 @@ {% extends "base_conservancy.html" %} +{% load static %} + {% block subtitle %}Sponsors - {% endblock %} {% block category %}sponsors{% endblock %} {% block head %} @@ -28,17 +30,17 @@ any of its sponsors.

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 @@
 
Conservancy is a proponent for community driven free software projects.
               Will you join me in supporting them? Donate today! @@ -34,7 +36,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 @@
 
Conservancy helps make our work possible.
               Please donate to them today to support community-driven free software projects! diff --git a/conservancy/templates/supporter/index.html b/conservancy/templates/supporter/index.html index dc55b756..c9fa52e7 100644 --- a/conservancy/templates/supporter/index.html +++ b/conservancy/templates/supporter/index.html @@ -7,7 +7,7 @@ {% 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' %} +{% include "opengraph_urllist_partial.html" with property='image' urls='' fallback='/static/img/conservancy-logo.png' %} {% endblock %} {% block content %} @@ -40,7 +40,7 @@ Please ensure all form data above is correct.
- +

@@ -58,9 +58,9 @@ a Sustainer:

@@ -180,9 +180,9 @@ In November she spoke at

Download Karen's talk or watch on YouTube

@@ -222,7 +222,7 @@ software projects. Part of the unique position of our organization is the expertise necessary to do this kind of work.

- Group Picture: Outreachy interns, mentors, and community coordinators gathered to celebrate the 1,000 interns milestone in Lagos, Nigeria.

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.

@@ -283,7 +283,7 @@ reach for reproducibility.

Help us Continue this Work

- Zack, Karen, John and Jim pose, mostly wearing the vintage t-shirt! + Zack, Karen, John and Jim pose, mostly wearing the vintage t-shirt!

Sustainers pose with Karen!
From left: Stefano “Zack” Zacchiroli, Karen M. Sandler, John Sullivan, and Jim Wright

diff --git a/conservancy/urls.py b/conservancy/urls.py index ce812016..d1441a62 100644 --- a/conservancy/urls.py +++ b/conservancy/urls.py @@ -28,8 +28,6 @@ from .static import views as static_views admin.autodiscover() urlpatterns = [ - # Uncomment these 3 lines when testing locally to get static content - url(r'^img', static_views.index), url(r'^$', frontpage.view), url(r'^sponsors$', frontpage.view), url(r'^sponsors/$', sponsors.view), diff --git a/conservancy/usethesource/templates/usethesource/ccirt_process.html b/conservancy/usethesource/templates/usethesource/ccirt_process.html index 29e7d8ab..f6bc889c 100644 --- a/conservancy/usethesource/templates/usethesource/ccirt_process.html +++ b/conservancy/usethesource/templates/usethesource/ccirt_process.html @@ -1,4 +1,5 @@ {% extends "usethesource/base.html" %} +{% load static %} {% block title %}Use The Source - Software Freedom Conservancy{% endblock %} @@ -15,11 +16,11 @@

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.

-

initial CCIRT process, showing 30-day and 7-day windows

+

initial CCIRT process, showing 30-day and 7-day windows

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:

-

ongoing CCIRT process, showing standard 7-day window

+

ongoing CCIRT process, showing standard 7-day window

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.