Conservancy/website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sfconservancy.org now has an SSL certificate; make site HTTPS-Everywhere compatible.

Browse source 
Change all links when possible to not mention a site, so HTTPS will be used
automatically for same-site links.

For embedded images, and other links out to the rest of the world, use HTTPS
when the site is known to support it.
This commit is contained in:
Bradley M. Kuhn 2013-04-26 12:48:19 -04:00
parent 1cea37a8bc
commit 1032f1d75f
9 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
www/conservancy/feeds.py
View file

@ -71,14 +71,14 @@ class OmnibusFeed(ConservancyFeedBase):
title_template = "feeds/omnibus_title.html"
description_template = "feeds/omnibus_description.html"
author_email = "info@sfconservancy.org"
author_link = "http://sfconservancy.org/"
author_link = "https://sfconservancy.org/"
author_name = "Software Freedom Conservancy"
def item_enclosure_mime_type(self): return "audio/mpeg"
def item_enclosure_url(self, item):
if hasattr(item, 'mp3_path'):
return "http://sfconservancy.org" + item.mp3_path
return "https://sfconservancy.org" + item.mp3_path
def item_enclosure_length(self, item):
if hasattr(item, 'mp3_path'):
return item.mp3_length
@ -93,7 +93,7 @@ class OmnibusFeed(ConservancyFeedBase):
return "Software Freedom Conservancy"
def item_author_link(self, obj):
return "http://sfconservancy.org"
return "https://sfconservancy.org"
def item_author_email(self, item):
if item.omnibus_type == "news":

8
www/conservancy/static/about/eval-committee/index.html
View file

@ -7,10 +7,10 @@
<p>The Evaluation Committee evaluates projects that have applied to become
members of Conservancy.
Conservancy's <a href="http://sfconservancy.org/about/board/">Board of
Directors</a> <a href="http://sfconservancy.org/news/2013/apr/23/linksvayer-and-eval-committee/">formally
charters and authorizes</a> this Committee to offer <a href="http://sfconservancy.org/members/">membership to
projects <a href="http://sfconservancy.org/members/apply/">that apply</a>
Conservancy's <a href="/about/board/">Board of
Directors</a> <a href="/news/2013/apr/23/linksvayer-and-eval-committee/">formally
charters and authorizes</a> this Committee to offer <a href="/members/">membership to
projects <a href="/members/apply/">that apply</a>
for membership in Conservancy.</p>
<h2>Jeremy Allison</h2>

4
www/conservancy/static/about/license/index.html
View file

@ -14,13 +14,13 @@
gitorious</a>.</p>
<p>The documents on this website are
licensed as <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC-By-SA-3.0
licensed as <a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-By-SA-3.0
Unported</a>. In some cases, the documents are dual-licensed
(AGPLv3-or-later|CC-By-SA-3.0-Unported-or-later), to make it more
convenient to intermix the document with code.</p>
<p>Conservancy's Logo is also licensed
under <a href="http://creativecommons.org/licenses/by-sa/3.0/us">CC-By-SA-3.0
under <a href="https://creativecommons.org/licenses/by-sa/3.0/us">CC-By-SA-3.0
USA</a>. A <a href="/img/conservancy-logo_package.zip">Conservancy
logo package in ZIP format is available, which includes high quality SVG,
PNG and other formats</a>.</p>

6
www/conservancy/static/donate/index.html
View file

@ -50,11 +50,11 @@ function validateAmount(amount){
<h3>Donate via Flattr</h3>
<p>
<a href="http://www.flattr.com">Flattr</a> is a social micro-payment system that allows users to make donations via the web. Like Google Checkout, Flattr does not charge any processing fees on donations to Conservancy. If you are a Flattr user and you would like to "flattr" Conservancy with a donation, click on the button below:
<a href="https://www.flattr.com">Flattr</a> is a social micro-payment system that allows users to make donations via the web. Like Google Checkout, Flattr does not charge any processing fees on donations to Conservancy. If you are a Flattr user and you would like to "flattr" Conservancy with a donation, click on the button below:
</p>
<a href="http://flattr.com/thing/922714/Donate-to-Software-Freedom-Conservancy" target="_blank">
<img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr us!" title="Flattr us!" border="0" /></a>
<a href="https://flattr.com/thing/922714/Donate-to-Software-Freedom-Conservancy" target="_blank">
<img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr us!" title="Flattr us!" border="0" /></a>

14
www/conservancy/static/members/apply/index.html
View file

@ -31,12 +31,12 @@
<h2>I sent in my inquiry letter and/or application a long time ago. Why haven't you replied?</h2>
<p>Conservancy receives an overwhelming level of interest and we have very few
<a href="http://sfconservancy.org/about/staff/">staff positions</a> to
<a href="/about/staff/">staff positions</a> to
meet the interest and demand
for <a href="http://sfconservancy.org/members/services/">Conservancy's
for <a href="/members/services/">Conservancy's
services</a> to its member projects. Meanwhile, Conservancy always
prioritizes needs of
its <a href="http://sfconservancy.org/members/current/">existing member
its <a href="/members/current/">existing member
projects</a> over new inquiries and applications. Therefore, it
sometimes can take quite a while to finish the application process and
be offered membership, but please note that such delays mean that should
@ -70,10 +70,10 @@
Source license by the Open Source Initiative</a>. All software
documentation for the project should be licensed under a license on
the preceding lists, or under Creative
Commons' <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC-By-SA</a>
or <a href="http://creativecommons.org/licenses/by/3.0/">CC-By</a>
Commons' <a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-By-SA</a>
or <a href="https://creativecommons.org/licenses/by/3.0/">CC-By</a>
or
<a href="http://creativecommons.org/choose/zero/">CC-0</a>.</li>
<a href="https://creativecommons.org/choose/zero/">CC-0</a>.</li>
<li>The project should have an existing, vibrant, diverse community
that develops and documents the software. For example, projects
@ -224,7 +224,7 @@ form their own independent tax-exempt non-profit.</p>
Conservancy processes to Conservancy's general fund, which primarily is
used to pay staff. (Details on how Conservancy spends its funds,
including salaries of key employees, can be found
in <a href="http://sfconservancy.org/about/filings/">Conservancy's
in <a href="/about/filings/">Conservancy's
annual filings</a>.)</p>
<p>Historically, Conservancy allowed projects to give less or nothing at

2
www/conservancy/static/members/services/index.html
View file

@ -137,7 +137,7 @@ burden on behalf of its projects.</p>
<p>Those familiar with non-profit terminology will recognize most of these
services
as <a href="http://en.wikipedia.org/wiki/Fiscal_sponsorship">fiscal
as <a href="https://en.wikipedia.org/wiki/Fiscal_sponsorship">fiscal
sponsorship services</a>. This term is not particularly well
known in the FLOSS community, and many are confused by that term.
However, if you are familiar with what a fiscal sponsor typically does

12
www/conservancy/templates/base_conservancy.html
View file

@ -34,14 +34,14 @@
<div id="conservancyfooter">
<p><a href="/">Main Page</a> | <a href="/about/contact/">Contact</a> | <a href="/sponsors/">Sponsors</a> | <a href="/privacy-policy/">Privacy Policy</a> | <a href="/feeds/omnibus/">RSS Feed</a></p>
<p>Follow Conservancy
on <a href="http://identi.ca/conservancy">identi.ca</a>
and <a href="http://twitter.com/conservancy">twitter</a>.
<a href="http://flattr.com/thing/922714/Donate-to-Software-Freedom-Conservancy" target="_blank">
<img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr us!" title="Flattr us!" border="0" /></a></p>
on <a href="https://identi.ca/conservancy">identi.ca</a>
and <a href="https://twitter.com/conservancy">twitter</a>.
<a href="https://flattr.com/thing/922714/Donate-to-Software-Freedom-Conservancy" target="_blank">
<img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr us!" title="Flattr us!" border="0" /></a></p>
<p class="copyright_info">
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us"><img alt="Creative Commons License" style="border-width:0" src="/img/cc-by-sa_88x31.png" /></a>
<a rel="license" href="https://creativecommons.org/licenses/by-sa/3.0/us"><img alt="Creative Commons License" style="border-width:0" src="/img/cc-by-sa_88x31.png" /></a>
<br />This page is licensed under a
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us">Creative
<a rel="license" href="https://creativecommons.org/licenses/by-sa/3.0/us">Creative
Commons Attribution-ShareAlike 3.0 USA License</a>.</p>
</div>
</body>

6
www/conservancy/templates/feeds/omnibus_description.html
View file

@ -1,10 +1,10 @@
{% ifequal obj.omnibus_type "news" %}
<p><i>A <a href="http://{{ site }}/news/">news item</a> from Software Freedom Conservancy.</i></p>
<p><i>A <a href="https://{{ site }}/news/">news item</a> from Software Freedom Conservancy.</i></p>
{% endifequal %}
{% ifequal obj.omnibus_type "event" %}
<p><i>An <a href="http://{{ site }}/events/">upcoming event</a> related to the Software Freedom Conservancy.</i></p>
<p><i>An <a href="https://{{ site }}/events/">upcoming event</a> related to the Software Freedom Conservancy.</i></p>
{% endifequal %}
{% ifequal obj.omnibus_type "blog" %}
<p><i>A <a href="http://{{ site }}/blog/">blog post</a> from Software Freedom Conservancy.</i></p>
<p><i>A <a href="https://{{ site }}/blog/">blog post</a> from Software Freedom Conservancy.</i></p>
{% endifequal %}
{% include obj.omnibus_feed_description_template %}

6
www/conservancy/templates/frontpage.html
View file

@ -38,12 +38,12 @@
<a href="/feeds/blog/">blog posts</a>.</p>
<p>You can also follow Conservancy
on <a href="http://identi.ca/conservancy">identi.ca</a>
and <a href="http://twitter.com/conservancy">twitter</a>.</p>
on <a href="https://identi.ca/conservancy">identi.ca</a>
and <a href="https://twitter.com/conservancy">twitter</a>.</p>
<p>
<span id="subbox">
<form method="post" action="http://lists.sfconservancy.org/mailman/subscribe/announce">
<form method="post" action="https://lists.sfconservancy.org/mailman/subscribe/announce">
You can also subscribe to Conservancy's low-traffic email announce list <br/><input name="email" placeholder="joe@example.org"/><input type="submit" name="email-button" value="Subscribe"/>
</form>
</span></p>