website Changeset - 0df7cde8907a · Conservancy Kallithea

Changeset - 0df7cde8907a

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Bradley Kuhn (bkuhn) - 13 years ago 2011-02-15 15:35:21
bkuhn@ebb.org

Added Twitter and Identica follow links.

2 files changed with 8 insertions and 1 deletions:

www/conservancy/templates/base_conservancy.html

www/conservancy/templates/frontpage.html

0 comments (0 inline, 0 general)

www/conservancy/templates/base_conservancy.html

➞

Show inline comments

@@ ... / @@ -11,32 +11,34 @@ @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     {% block head %}{% endblock %}
   </head>
   <body class="conservancy-{% block category %}other{% endblock %}">
     <div id="conservancyheader">
       <h1><span id="logobutton"><a href="/">Software Freedom Conservancy</a></span></h1>
     </div>
     <div id="navbar-outer">
       <div id="navbar">
 	<ul>
           <li class="overview"><a href="/overview/">Overview</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/">Member Projects &amp; Services</a></li>
           <li class="About"><a href="/about/">About</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="/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>.</p>
       <p class="copyright_info">
       <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><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/">Creative
       Commons Attribution-ShareAlike 3.0 Unported License</a>.</p>
     </div>
   </body>
 </html>

www/conservancy/templates/frontpage.html

➞

Show inline comments

@@ ... / @@ -10,54 +10,59 @@ @@
 {% block content %}
 <div class="singleColumn">
 <h1>The Software Freedom Conservancy</h1>
 <p>The Software Freedom Conservancy is a not-for-profit organization 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">
 <p>
 <h2>Learn More about Conservancy</h2>
 <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</h2>
+<h2>Follow Conservancy RSS Feeds and Microblogs</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>
 <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">
 {% if press_releases.0 %}
 {% if press_releases.0.pub_date|date_within_past_days:30 %}
 <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:15 %}
 <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 %}

0 comments (0 inline, 0 general)