Changeset - cc655f38bd09
[Not reviewed]
0 2 0
Bradley Kuhn (bkuhn) - 8 years ago 2015-12-25 00:55:19
bkuhn@ebb.org
Be consistent about names of social networks.

Also, a grammar fix.
2 files changed with 4 insertions and 4 deletions:
0 comments (0 inline, 0 general)
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -18,60 +18,60 @@
 
    <script type="text/javascript" src="/js/jquery-1.7.2.js"></script>
 
    <script type="text/javascript" src="/js/jquery-ui-1.8.22.custom.min.js"></script>
 
    <script type="text/javascript" src="/js/jquery.outerhtml.js"></script>
 
    <script type="text/javascript" src="/js/jquery.ui.multiprogressbar.js"></script>
 
    <script type="text/javascript" src="/js/supporter-page.js"></script>
 
    {% block head %}{% endblock %}
 
  </head>
 

	
 
  <body class="conservancy-{% block category %}other{% endblock %}">
 
    <h1 id="conservancyheader"><a id="logobutton" href="/">Software Freedom Conservancy</a></h1>
 
    <div id="navbar-outer">
 
      <div id="navbar">
 
	<ul>
 
          <li class="About"><a href="/about/">About</a></li>
 
          <li class="news"><a href="/news/">News</a></li>
 
          <li class="blog"><a href="/blog/">Blog</a></li>
 
	  <li class="Members"><a href="/members/">Membership</a></li>
 
	  <li class="sponsors"><a href="/sponsors/">Sponsors</a></li>
 
          <li class="compliance"><a href="/linux-compliance/">Copyleft Compliance</a></li>
 
          <li class="npoacct"><a href="/npoacct/">NPOAcct</a></li>
 
	  <li class="donate"><a href="/donate/">Donate</a></li>
 
          <li class="supporter"><a href="/supporter/">Become a Supporter!</a></li>
 
	</ul>
 
      </div>
 
      <div id="navbar-clear"></div>
 

	
 
    </div>
 
    <div class="fundraiser-top-text">
 
   <em>Conservancy
 
   <a href="/supporter/">needs <span id="site-fundraiser-middle-goal">{{ sitefundgoal.fundraiser_donation_count|intcomma }}</span> Supporters</a> to continue its basic community services &amp;
 
   <span id="site-fundraiser-final-goal">{{ sitefundgoal.fundraiser_goal_amount|intcomma }}</span> to
 
   avoid hibernating its enforcement efforts!
 
{% if sitefundgoal.fundraiser_donation_count_disclose_threshold < 632 %}
 
The next {{ 632|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold }} supporters
 
who sign up by January 31 will count twice, thanks to <a href="https://www.privateinternetaccess.com/">Private Internet Access</a>!
 
{% endif %}
 
</em>
 
<a href="/supporter"><div id="siteprogressbar">
 
    <span id="site-fundraiser-so-far">{{ sitefundgoal.fundraiser_so_far_amount|intcomma }}</span> have joined so far
 
{% if sitefundgoal.fundraiser_donation_count_disclose_threshold > 0 %}
 
    and match pledges reduced our 2,500 maximum need by <span id="site-fundraiser-match-count">{{ sitefundgoal.fundraiser_donation_count_disclose_threshold|min:632|intcomma }}</span>
 
{% endif %}
 
!</div></a>
 
</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="https://identi.ca/conservancy">identi.ca</a>,
 
      and <a href="https://twitter.com/conservancy">twitter</a>, <a href="https://plus.google.com/104268783278405704634/">Google+</a>,
 
      on <a href="https://identi.ca/conservancy">pump.io</a>,
 
      and <a href="https://twitter.com/conservancy">Twitter</a>, <a href="https://plus.google.com/104268783278405704634/">Google+</a>,
 
      and <a href="https://www.youtube.com/channel/UCUEeuNvX2UyTTyTYXR9dm_A">Youtube</a>.</p>
 
      <p class="copyright_info">
 
      <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0"><img alt="Creative Commons License" style="border-width:0" src="/img/cc-by-sa_88x31.png" /></a> 
 
      <br />This page, and all contents herein, unless a license is otherwise
 
      specified, are licensed under a
 
      <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0">Creative
 
      Commons Attribution-ShareAlike 4.0 International License</a>.</p>
 
    </div>
 
  </body>
 
</html>
www/conservancy/templates/frontpage.html
Show inline comments
 
{% extends "base_conservancy.html" %}
 
{% load date_within %}
 

	
 
{% block head %}
 
<link rel="alternate" type="application/rss+xml" title="Software Freedom Conservancy Complete Feed" href="/feeds/omnibus/" />
 
<link rel="alternate" type="application/rss+xml" title="Software Freedom Conservancy News" href="/feeds/news/" />
 
<link rel="alternate" type="application/rss+xml" title="Software Freedom Conservancy Blogs" href="/feeds/blog/" />
 
{% endblock %}
 

	
 
{% block content %}
 

	
 
<div class="singleColumn">
 

	
 
<h1>Software Freedom Conservancy</h1>
 

	
 
<p>Software Freedom Conservancy is a not-for-profit charity that
 
  helps promote, improve, develop, and defend Free, Libre, and Open Source
 
  Software (FLOSS) projects.  Conservancy provides a non-profit home and
 
  infrastructure for FLOSS projects.  This allows FLOSS developers to
 
  focus on what they do best &mdash; writing and improving FLOSS for the
 
  general public &mdash; while Conservancy takes care of the projects' needs that
 
  do not relate directly to software development and documentation.</p>
 
</div>
 

	
 
<div class="columns">
 

	
 
<div class="column column-small column-left">
 
<h2>Learn More about Conservancy</h2>
 
<p>
 
<span class="continued"><a href="/about/">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 Conservancy provides to its member projects&hellip;</a></span>
 
<span class="continued"><a href="/copyleft-compliance/">Conservancy's unique work  defending and upholding  copyleft licenses (e.g., the GPL) &hellip;</a></span>
 
<span class="continued"><a href="/npoacct/">Conservancy's Non-Profit Accounting Project &hellip;</a></span>
 
</p>
 
<h2>Support Conservancy</h2>
 
<p>As a 501(c)(3) non-profit charity, Conservancy relies on
 
  charitable donations for its operations.
 
  Please join {{supporters_count|safe}} others and <a href="/supporter/"><strong>become a Conservancy Supporter
 
  today</strong></a> and/or <a href="/donate/">donate generously</a> to help our work!
 
</p>
 
<h2>Follow Conservancy News &amp; Blogs</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>).  You can follow Conservancy
 
 on <a href="https://identi.ca/conservancy">identi.ca (aka pump.io)</a>, 
 
 on <a href="https://identi.ca/conservancy">pump.io</a>, 
 
  <a href="https://twitter.com/conservancy">Twitter</a>, <a href="https://plus.google.com/104268783278405704634/">Google+</a>,
 
      <a href="https://www.youtube.com/channel/UCUEeuNvX2UyTTyTYXR9dm_A">Youtube</a>,
 
      and probably can be found on whatever social network you prefer.  Look
 
      for everywhere and follow us!</p>
 
      for us everywhere and follow us!</p>
 

	
 
<p>
 
    <span id="subbox">
 
        <form method="post" action="https://lists.sfconservancy.org/mailman/subscribe/announce">
 
          You can also subscribe to Conservancy's low-traffic email announce
 
          list
 
          (and <a href="http://lists.sfconservancy.org/pipermail/announce/">read
 
          its archives</a>): <br/><input name="email" placeholder="person@example.org"/><input type="submit" name="email-button" value="Subscribe"/>
 
        </form>
 
      </span></p>
 

	
 
</div>
 

	
 
<div class="column column-large">
 
{% if press_releases.0 %}
 
{% if press_releases.0.pub_date|date_within_past_days:60 %}
 
<div class="shaded">
 
<h2><a href="/feeds/news/" class="feedlink"><img src="/img/feed-icon-14x14.png" alt="[RSS]"/></a> <a href="/news/">Recent News</a></h2>
 
<p class="date">{{ press_releases.0.pub_date|date:"F j, Y" }}</p>
 
<h3><a href="{{ press_releases.0.get_absolute_url }}">{{ press_releases.0.headline|safe }}</a></h3>
 
{{ press_releases.0.summary|safe }}
 
{% if press_releases.0.body %}<p><span class="continued"><a href="{{ press_releases.0.get_absolute_url }}">Read More...</a></span></p>{% endif %}
 
{% if press_releases.1 %}
 
{% if press_releases.1.pub_date|date_within_past_days:30 %}
 
<hr/>
 
<p class="date">{{ press_releases.1.pub_date|date:"F j, Y" }}</p>
 
<h3><a href="{{ press_releases.1.get_absolute_url }}">{{ press_releases.1.headline|safe }}</a></h3>
 
{{ press_releases.1.summary|safe }}
 
{% if press_releases.1.body %}<p><span class="continued"><a href="{{ press_releases.1.get_absolute_url }}">Read More...</a></span></p>{% endif %}
 
{% endif %}
 
{% endif %}
 
{% if press_releases.2 %}
 
{% if press_releases.2.pub_date|date_within_past_days:25 %}
 
<hr/>
 
<p class="date">{{ press_releases.2.pub_date|date:"F j, Y" }}</p>
 
<h3><a href="{{ press_releases.2.get_absolute_url }}">{{ press_releases.2.headline|safe }}</a></h3>
 
{{ press_releases.2.summary|safe }}
 
{% if press_releases.2.body %}<p><span class="continued"><a href="{{ press_releases.2.get_absolute_url }}">Read More...</a></span></p>{% endif %}
 
{% endif %}
 
{% endif %}
 
</div>
 
{% endif %}
 
{% endif %}
 
<p><span class="continued"><a href="/news/">Conservancy News Archive&hellip;</a></span></p>
 
{% if blog.0.is_recent %}
 
<div class="shaded">
 
<h2><a href="/feeds/blog/" class="feedlink"><img src="/img/feed-icon-14x14.png" alt="[RSS]"/></a> <a href="/blog/">Conservancy Blog</a></h2>
 
<h3><a href="{{ blog.0.get_absolute_url }}">{{ blog.0.headline|safe }}</a></h3>
0 comments (0 inline, 0 general)