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 %} +
+

The Software Freedom Conservancy

The Software Freedom Conservancy is a not-for-profit organization that @@ -16,21 +18,58 @@ focus on what they do best — writing and improving FLOSS for the general public — while Conservancy takes care of the projects' needs that do not relate directly to software development.

+
+
+ +

-More about Conservancy… -Conservancy's member projects… +

Learn More about Conservancy

+An Overview of Conservancy… +Conservancy's current member projects… +Services that Conservancy provides to its member projects…

+

Support Conservancy!

+

As a 501(c)(3) non-profit organization, Conservancy relies on + charitable donations for its operations. + Please donate generously to help our work! +

+
+
{% if press_releases.0.pub_date|date_within_past_days:30 %}
-

[RSS] Latest News

+

[RSS] Recent News

{{ press_releases.0.pub_date|date:"F j, Y" }}

{{ press_releases.0.headline|safe }}

{{ press_releases.0.summary|safe }} {% if press_releases.0.body %}

Read More...

{% endif %} -

News Archive...

{% endif %} +

Conservancy News Archive…

+{% if blog.0.is_recent %} +

[RSS] Conservancy Blog

+
+

{{ blog.0.pub_date|date:"F j, Y" }}

+

{{ blog.0.headline|safe }}

+{{ blog.0.summary|safe }} +

Read More...

+

Posted by {{ blog.0.author.formal_name }}

+{% endif %} +{% if blog.1.is_recent %} +
+

{{ blog.1.pub_date|date:"F j, Y" }}

+

{{ blog.1.headline|safe }}

+{{ blog.1.summary|safe }} +

Read More...

+

Posted by {{ blog.1.author.formal_name }}

+

Conservancy Blog Archive...

+
+{% else %} +

Conservancy Blog Archive…

+
+{% endif %} +
+
{% 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')), )