Changeset - 1032f1d75f33
[Not reviewed]
0 9 0
Bradley Kuhn (bkuhn) - 11 years ago 2013-04-26 16:48:19
bkuhn@ebb.org
sfconservancy.org now has an SSL certificate; make site HTTPS-Everywhere compatible.

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.
9 files changed with 32 insertions and 32 deletions:
0 comments (0 inline, 0 general)
www/conservancy/feeds.py
Show inline comments
...
 
@@ -62,47 +62,47 @@ class OmnibusFeedType(Rss201rev2Feed):
 
        # Block things that don't have an enclosure from iTunes in
 
        # case someone uploads this feed there.
 
        handler.addQuickElement("itunes:block", 'Yes')
 

	
 
class OmnibusFeed(ConservancyFeedBase):
 
    feed_type = OmnibusFeedType
 
    link ="/news/"
 
    title = "The Software Freedom Conservancy"
 
    description = "An aggregated feed of all RSS content available from the Software Freedom Conservancy, including both news items and blogs."
 
    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
 

	
 
    def item_pubdate(self, item):
 
        return item.pub_date
 

	
 
    def item_author_name(self, item):
 
        if item.omnibus_type == "blog":
 
            return item.author.formal_name
 
        else:
 
            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":
 
            return "info@sfconservancy.org"
 
        elif hasattr(item, 'author'):
 
            return "%s@sfconservancy.org" % item.author
 
        else:
 
            return "info@sfconservancy.org"
 

	
 
    def item_pubdate(self, item):
 
        if item.omnibus_type == "event":
 
            return item.date_created
www/conservancy/static/about/eval-committee/index.html
Show inline comments
 
{% extends "base_about.html" %}
 
{% block subtitle %}Evaluation Committee - {% endblock %}
 
{% block submenuselection %}Eval{% endblock %}
 
{% block content %}
 

	
 
<h1>Evaluation Committee</h1>
 

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

	
 
<p>Jeremy Allison is one of the lead developers on the Samba Team, a group
 
of programmers developing an Open Source Windows compatible file and print
 
server product for UNIX systems. Developed over the Internet in a
 
distributed manner similar to the Linux system, Samba is used by all Linux
 
distributions as well as many thousands of corporations and products
 
worldwide. Jeremy handles the co-ordination of Samba development efforts
 
and acts as a corporate liaison to companies using the Samba code
 
commercially.</p>
www/conservancy/static/about/license/index.html
Show inline comments
...
 
@@ -5,24 +5,24 @@
 
<h1>License and Source For This Website</h1>
 

	
 
<p>The software running this website is licensed under
 
  the <a href="http://www.gnu.org/licenses/agpl-3.0.html">AGPLv3</a>-or-later.
 
  You can find a <a href="/source/">full copy of the sources hosted on
 
  this site</a>, but it may be more interesting to know that the site is
 
  running on stock Debian squeeze with Apache, Django, mod_python, and
 
  sqlite installed, and that the main sources for the site's code itself
 
  is <a href="http://gitorious.org/conservancy/website">hosted on
 
  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>
 

	
 
{% endblock %}
www/conservancy/static/donate/index.html
Show inline comments
...
 
@@ -41,29 +41,29 @@ function validateAmount(amount){
 
        <tr>
 
            <td align="right" nowrap="nowrap" width="1%">&#x24; <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="6" type="text" value="100.00"/>
 
            </td>
 
            <td align="left" width="1%">
 
                <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&amp;w=115&amp;h=50&amp;style=white&amp;variant=text&amp;loc=en_US" type="image"/>
 
            </td>
 
        </tr>
 
    </table>
 
</form>
 

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

	
 

	
 

	
 
<h3>Donate by paper check</h3>
 

	
 
<p>Send paper check donations, drawn in USD, to:</p>
 

	
 
<p>Software Freedom Conservancy<br />
 
137 MONTAGUE ST  STE 380<br/>
 
Brooklyn, NY 11201-3548<br/>
 
USA
 
</p>
www/conservancy/static/members/apply/index.html
Show inline comments
...
 
@@ -22,30 +22,30 @@
 
  chartered by Conservancy's <a href="/about/board/">Board of
 
  Directors</a>.</p>
 

	
 
<h1>Project Membership Application FAQs</h1>
 

	
 
<p>The following are various questions that we typically get from project
 
  leaders that wish to apply to Conservancy.</p>
 

	
 

	
 
<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
 
  your project ultimately become a member project, your project will then
 
  be a beneficiary of this policy.</p>
 

	
 
<h2>What are the key criteria our project must meet to join?</h2>
 

	
 
<p>In order to join, projects need to meet certain criteria.  A rough
 
  outline of those criteria are as follows:</p>
 
<p>
 
<ul><li>The project must be a software development or documentation
...
 
@@ -61,28 +61,28 @@
 
    way to advance the public good, and must develop the software in
 
    public.</li>
 

	
 
    <li>The project must be licensed in a way fitting with software
 
      freedom principles.  Specifically, all software of the project
 
      should be licensed under a license that is listed both as
 
      a <a href="http://www.gnu.org/licenses/license-list.html">Free
 
      Software license by the Free Software Foundation</a> and as
 
      an <a href="http://www.opensource.org/licenses/alphabetical">Open
 
      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
 
      that have been under development for less than a year or only a
 
      &ldquo;proof of concept&rdquo; implementation are generally not
 
      eligible.</li>
 
</ul>
 
</p>
 

	
 
<p>While any project meeting the criteria above can apply, meeting these
 
  criteria doesn't guarantee acceptance of your project.  Conservancy
 
  favors projects that are well-established and have some track record of
...
 
@@ -215,25 +215,25 @@ form their own independent tax-exempt non-profit.</p>
 
  contributors find this process of formalizing the leadership structure
 
  helps them clarify in their own minds the governance of their project,
 
  even though the process can be difficult.  Since it can be a complicated
 
  process, we suggest that you prepare your project community for this
 
  discussion once your project is accepted.</p>
 

	
 
<h2>How much does it cost us financially to join Conservancy?</h2>
 

	
 
<p>New Conservancy members are required to pay 10% of their revenue that
 
  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
 
  all to the general fund, but we unfortunately discovered that without
 
  this requirement, Conservancy was not able to offer the myriad of
 
  services to all its projects, particularly to larger projects that
 
  have more income and therefore need more attention from staff.</p>
 

	
 
<p>We do understand that, particularly for small projects that only
 
  receive a few small donations, that donating a percentage of your income
 
  back to Conservancy can be a high burden.  Therefore, Conservancy
 
  remains open to discussion on a case-by-case basis for smaller projects
www/conservancy/static/members/services/index.html
Show inline comments
...
 
@@ -128,23 +128,23 @@ burden on behalf of its projects.</p>
 
<h2>Some Personal Liability Protection</h2>
 

	
 
<p>When a project joins Conservancy, it formally becomes part of the
 
  Conservancy. (The project is thus somewhat analogous to a division of a
 
  company or a department in a large agency.)  As such, project leaders
 
  benefit from some amount of protection from personal liability for their
 
  work on the project.</p>
 

	
 
<hr/>
 

	
 
<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
 
  in the non-profit sector, the term does fit many of services that
 
  Conservancy offers its member projects.</p>
 

	
 
<p>Project
 
leaders that believe their project might benefit from these services can
 
<a href="/members/apply/">apply to become a member project</a>.</p>
 
{% endblock %}
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -25,24 +25,24 @@
 
	  <li class="Members"><a href="/members/">Member Projects &amp; Services</a></li>
 
          <li class="About"><a href="/about/">About</a></li>
 
	  <li class="sponsors"><a href="/sponsors/">Sponsors</a></li>
 
	  <li class="donate"><a href="/donate/">Support Conservancy!</a></li>
 
	</ul>
 
      </div>
 
      <div id="navbar-clear"></div>
 
    </div>
 
      {% block outercontent %}<div id="mainContent">{% block content %}{% endblock %}</div>{% endblock %}
 
    <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>
 
</html>
www/conservancy/templates/feeds/omnibus_description.html
Show inline comments
 
{% 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  %}
www/conservancy/templates/frontpage.html
Show inline comments
...
 
@@ -29,30 +29,30 @@
 
<p>
 
<span class="continued"><a href="/overview/">An Overview of Conservancy&hellip;</a></span>
 
<span class="continued"><a href="/members/current/">Conservancy's current member projects&hellip;</a></span>
 
<span class="continued"><a href="/members/services/">Services that Conservancy provides to its member projects&hellip;</a></span>
 
</p>
 
<h2>Follow Conservancy RSS Feeds, Microblogs, and mailing list</h2>
 

	
 
<p>There is a <a href="/feeds/omnibus/">full site feed available</a>, as
 
  well as separate feeds for the <a href="/feeds/news/">news items</a> and
 
  <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>
 

	
 
<h2>Support Conservancy</h2>
 
<p>As a 501(c)(3) non-profit organization, Conservancy relies on
 
  charitable donations for its operations.
 
  Please <a href="/donate/">donate generously</a> to help our work!
 
</p>
 
</div>
 

	
 
<div class="column column-large">
0 comments (0 inline, 0 general)