From c144b0c54ec82e12d06e9d2bcb59d06352bea152 Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@ebb.org>
Date: Mon, 4 Oct 2010 10:54:09 -0400
Subject: [PATCH] Added blog to URL list and to front page.  Fixed columns on
 front page.

---
 www/conservancy/templates/frontpage.html | 47 ++++++++++++++++++++++--
 www/conservancy/urls.py                  |  1 +
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/www/conservancy/templates/frontpage.html b/www/conservancy/templates/frontpage.html
index 3b9f6b37..2b1498b1 100644
--- a/www/conservancy/templates/frontpage.html
+++ b/www/conservancy/templates/frontpage.html
@@ -7,6 +7,8 @@
 
 {% block content %}
 
+<div class="singleColumn">
+
 <h1>The Software Freedom Conservancy</h1>
 
 <p>The Software Freedom Conservancy is a not-for-profit organization that
@@ -16,21 +18,58 @@
   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.</p>
+</div>
 
+<div class="columns">
+
+<div class="column column-small column-left">
 <p>
-<span class="continued"><a href="/overview/">More about Conservancy&hellip;</a></span>
-<span class="continued"><a href="/members/">Conservancy's member projects&hellip;</a></span>
+<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>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.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/">Latest News</a></h2>
+<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 %}
-<p><a href="/news/">News Archive...</a></p>
 </div>
 {% endif %}
+<p><span class="continued"><a href="/news/">Conservancy News Archive&hellip;</a></p>
+{% if blog.0.is_recent %}
+<h2><a href="/feeds/blog/" class="feedlink"><img src="/img/feed-icon-14x14.png" alt="[RSS]"/></a> <a href="/blog/">Conservancy Blog</a></h2>
+<div class="shaded">
+<p class="date">{{ blog.0.pub_date|date:"F j, Y" }}</p>
+<h3><a href="{{ blog.0.get_absolute_url }}">{{ blog.0.headline|safe }}</a></h3>
+{{ blog.0.summary|safe }}
+<p><span class="continued"><a href="{{ blog.0.get_absolute_url }}">Read More...</a></span></p>
+<p class="small date">Posted by {{ blog.0.author.formal_name }}</p>
+{% endif %}
 
+{% if blog.1.is_recent %}
+<div class="shaded">
+<p class="date">{{ blog.1.pub_date|date:"F j, Y" }}</p>
+<h3><a href="{{ blog.1.get_absolute_url }}">{{ blog.1.headline|safe }}</a></h3>
+{{ blog.1.summary|safe }}
+<p><span class="continued"><a href="{{ blog.1.get_absolute_url }}">Read More...</a></span></p>
+<p class="small date">Posted by {{ blog.1.author.formal_name }}</p>
+<p><a href="/blog/">Conservancy Blog Archive...</a></p>
+</div>
+{% else %}
+<p><span class="continued"><a href="/blog/">Conservancy Blog Archive&hellip;</a></p>
+</div>
+{% endif %}
+</div>
+</div>
 {% endblock %}
diff --git a/www/conservancy/urls.py b/www/conservancy/urls.py
index 65ceea23..c6f401b0 100644
--- a/www/conservancy/urls.py
+++ b/www/conservancy/urls.py
@@ -9,4 +9,5 @@ urlpatterns = patterns('',
      {'feed_dict': feed_dict}),
     (r'^feeds/$', 'conservancy.feeds.view'),
     (r'^news/', include('conservancy.apps.news.urls')),
+    (r'^blog/', include('conservancy.apps.blog.urls')),
 )