Author: jacob
Date: 2008-07-11 10:19:27 -0500 (Fri, 11 Jul 2008)
New Revision: 7892

Added:
   djangoproject.com/django_website/templates/flatpages/code.html
   djangoproject.com/django_website/templates/flatpages/community.html
   djangoproject.com/django_website/templates/flatpages/docs.html
   djangoproject.com/django_website/templates/flatpages/download.html
   djangoproject.com/django_website/templates/flatpages/foundation.html
   djangoproject.com/django_website/templates/flatpages/homepage.html
   djangoproject.com/django_website/templates/flatpages/legacy_docs.html
Removed:
   djangoproject.com/django_website/templates/flatfiles/code.html
   djangoproject.com/django_website/templates/flatfiles/community.html
   djangoproject.com/django_website/templates/flatfiles/docs.html
   djangoproject.com/django_website/templates/flatfiles/download.html
   djangoproject.com/django_website/templates/flatfiles/homepage.html
   djangoproject.com/django_website/templates/flatfiles/legacy_docs.html
Modified:
   djangoproject.com/django_website/apps/aggregator/bin/update_feeds.py
   djangoproject.com/django_website/apps/aggregator/models.py
   djangoproject.com/django_website/templates/base.html
   djangoproject.com/django_website/templates/base_weblog.html
   djangoproject.com/django_website/templates/docs/index.html
   djangoproject.com/django_website/templates/flatpages/default.html
Log:
Checking in template changes from djangoproject.com

Modified: djangoproject.com/django_website/apps/aggregator/bin/update_feeds.py
===================================================================
--- djangoproject.com/django_website/apps/aggregator/bin/update_feeds.py        
2008-07-11 15:08:09 UTC (rev 7891)
+++ djangoproject.com/django_website/apps/aggregator/bin/update_feeds.py        
2008-07-11 15:19:27 UTC (rev 7892)
@@ -4,11 +4,14 @@
 """
 
 import os
+import sys
 import time
 import optparse
 import datetime
 import feedparser
 
+LOCKFILE = "/tmp/update_feeds.lock"
+
 def update_feeds(verbose=False):
     from django_website.apps.aggregator.models import Feed, FeedItem
     for feed in Feed.objects.filter(is_defunct=False):
@@ -51,6 +54,11 @@
                 feed.feeditem_set.create(title=title, link=link, 
summary=content, guid=guid, date_modified=date_modified)
 
 if __name__ == '__main__':
+    try:
+        lockfile = os.open(LOCKFILE, os.O_CREAT | os.O_EXCL)
+    except OSError:
+        sys.exit(0)
+    
     parser = optparse.OptionParser()
     parser.add_option('--settings')
     parser.add_option('-v', '--verbose', action="store_true")
@@ -58,3 +66,6 @@
     if options.settings:
         os.environ["DJANGO_SETTINGS_MODULE"] = options.settings
     update_feeds(options.verbose)
+
+    os.close(lockfile)
+    os.unlink(LOCKFILE)
\ No newline at end of file

Modified: djangoproject.com/django_website/apps/aggregator/models.py
===================================================================
--- djangoproject.com/django_website/apps/aggregator/models.py  2008-07-11 
15:08:09 UTC (rev 7891)
+++ djangoproject.com/django_website/apps/aggregator/models.py  2008-07-11 
15:19:27 UTC (rev 7892)
@@ -10,7 +10,11 @@
         db_table = 'aggregator_feeds'
 
     class Admin:
-        pass
+        list_display = ["title", "public_url", "is_defunct"]
+        list_filter = ["is_defunct"]
+        ordering = ["title"]
+        search_fields = ["title", "public_url"]
+        list_per_page = 500
 
     def __unicode__(self):
         return self.title

Modified: djangoproject.com/django_website/templates/base.html
===================================================================
--- djangoproject.com/django_website/templates/base.html        2008-07-11 
15:08:09 UTC (rev 7891)
+++ djangoproject.com/django_website/templates/base.html        2008-07-11 
15:19:27 UTC (rev 7892)
@@ -46,7 +46,7 @@
                </div>
                <!-- END #content -->
                <div id="footer">
-                       <p>&copy; 2005-{% now "Y" %} <a 
href="http://www.ljworld.com/";>Lawrence Journal-World</a> unless otherwise 
noted. Django is a registered trademark of Lawrence Journal-World. 
+                       <p>&copy; 2005-{% now "Y" %} <a 
href="/foundation/">Django Software Foundation</a> unless otherwise noted. 
Django is a registered trademark of the Django Software Foundation. 
                        Hosting graciously provided by <a 
href="http://mediatemple.net/";>
                        <img style="vertical-align: middle; position: relative; 
top: -1px;" src="http://media.djangoproject.com/img/site/mt.png"; alt="media 
temple" /></a>
                        </p>

Modified: djangoproject.com/django_website/templates/base_weblog.html
===================================================================
--- djangoproject.com/django_website/templates/base_weblog.html 2008-07-11 
15:08:09 UTC (rev 7891)
+++ djangoproject.com/django_website/templates/base_weblog.html 2008-07-11 
15:19:27 UTC (rev 7892)
@@ -13,6 +13,11 @@
 {% block content-related %}
 <h2>Archives</h2>
 <ul class="linklist">
+    <li><a href="/weblog/2008/apr/">April 2008</a></li>
+    <li><a href="/weblog/2008/mar/">March 2008</a></li>
+    <li><a href="/weblog/2008/feb/">Febuary 2008</a></li>
+    <li><a href="/weblog/2008/jan/">January 2008</a></li>
+    <li><a href="/weblog/2007/dec/">December 2007</a></li> 
     <li><a href="/weblog/2007/nov/">November 2007</a></li>
     <li><a href="/weblog/2007/oct/">October 2007</a></li>
     <li><a href="/weblog/2007/sep/">September 2007</a></li>

Modified: djangoproject.com/django_website/templates/docs/index.html
===================================================================
--- djangoproject.com/django_website/templates/docs/index.html  2008-07-11 
15:08:09 UTC (rev 7891)
+++ djangoproject.com/django_website/templates/docs/index.html  2008-07-11 
15:19:27 UTC (rev 7892)
@@ -18,7 +18,7 @@
 
 <h2>The Django Book</h2>
 
-<p>The Django Book is finished. You can read it for free at <a 
href="http://www.djangobook.com/";>djangobook.com</a> or buy the print version. 
We recommend reading the first few chapters as your first introduction to 
Django.</p>
+<p>You can read the entire Django Book for free at <a 
href="http://www.djangobook.com/";>djangobook.com</a> or buy a print version in 
finer bookstores. We recommend reading the first few chapters as your first 
introduction to Django.</p>
 
 <h2>The essential documentation</h2>
 
@@ -48,7 +48,8 @@
 <li>Templates: <a href="templates/">Guide for HTML authors</a> | <a 
href="templates_python/">Guide for Python programmers</a></li>
 
 <li><a href="newforms/">The newforms library</a> | <a href="forms/">The old 
forms and manipulators library</a></li>
-<li><strong>New:</strong> <a href="testing/">Testing Django 
applications</a></li>
+<li><strong>New:</strong> <a href="upload_handling/">File uploads</a></li>
+<li><a href="testing/">Testing Django applications</a></li>
 <li><a href="sessions/">Sessions</a></li>
 <li><a href="cache/">Caching</a></li>
 <li><a href="i18n/">Internationalization</a></li>
@@ -61,6 +62,7 @@
 <li><a href="shortcuts/">Shortcut functions</a></li>
 <li><strong>New:</strong> <a href="unicode/">Unicode data in Django</a></li>
 <li><strong>New:</strong> <a href="pagination/">Pagination</a></li>
+<li><strong>New:</strong> <a href="serialization/">Serialization</a></li>
 
 <li><a href="add_ons/">The django.contrib add-ons</a>
     <ul>

Deleted: djangoproject.com/django_website/templates/flatfiles/code.html
===================================================================
--- djangoproject.com/django_website/templates/flatfiles/code.html      
2008-07-11 15:08:09 UTC (rev 7891)
+++ djangoproject.com/django_website/templates/flatfiles/code.html      
2008-07-11 15:19:27 UTC (rev 7892)
@@ -1,7 +0,0 @@
-{% extends "base_code.html" %}
-
-{% block content %}
-<h1>{{ flatpage.title }}</h1>
-
-{{ flatpage.content }}
-{% endblock %}

Deleted: djangoproject.com/django_website/templates/flatfiles/community.html
===================================================================
--- djangoproject.com/django_website/templates/flatfiles/community.html 
2008-07-11 15:08:09 UTC (rev 7891)
+++ djangoproject.com/django_website/templates/flatfiles/community.html 
2008-07-11 15:19:27 UTC (rev 7892)
@@ -1,7 +0,0 @@
-{% extends "base_community.html" %}
-
-{% block content %}
-<h1>{{ flatpage.title }}</h1>
-
-{{ flatpage.content }}
-{% endblock %}

Deleted: djangoproject.com/django_website/templates/flatfiles/docs.html
===================================================================
--- djangoproject.com/django_website/templates/flatfiles/docs.html      
2008-07-11 15:08:09 UTC (rev 7891)
+++ djangoproject.com/django_website/templates/flatfiles/docs.html      
2008-07-11 15:19:27 UTC (rev 7892)
@@ -1,31 +0,0 @@
-{% extends "base_docs.html" %}
-
-{% block content %}
-<h1>{{ flatpage.title }}</h1>
-
-{% ifequal version "trunk" %}
-  
-{% endifequal %}
-
-{{ flatpage.content }}
-{% endblock %}
-
-{% block content-related %}
-
-<h2>Search docs via Google</h2>
-<form action="http://www.google.com/search"; method="get">
-<p><input type="text" name="as_q" /> <input type="submit" value="Go" /></p>
-<input type="hidden" name="as_sitesearch" value="www.djangoproject.com" />
-</form>
-
-<h2>Getting help</h2>
-<ul class="toc">
-    <li><a href="irc://irc.freenode.net/django">#django IRC channel</a></li>
-    <li><a href="http://oebfare.com/logger/django/";>#django IRC logs</a></li>
-    <li><a 
href="http://groups-beta.google.com/group/django-users";>Django-users mailing 
list</a></li>
-    <li><a 
href="http://groups-beta.google.com/group/django-developers";>Django-developers 
mailing list</a></li>
-    <li><a href="http://code.djangoproject.com/simpleticket";>Report a 
bug</a></li>
-    <li><a href="/comments/">Recent comments posted to 
djangoproject.com</a></li>
-</ul>
-
-{% endblock %}

Deleted: djangoproject.com/django_website/templates/flatfiles/download.html
===================================================================
--- djangoproject.com/django_website/templates/flatfiles/download.html  
2008-07-11 15:08:09 UTC (rev 7891)
+++ djangoproject.com/django_website/templates/flatfiles/download.html  
2008-07-11 15:19:27 UTC (rev 7892)
@@ -1,25 +0,0 @@
-{% extends "base_download.html" %}
-
-{% block content %}
-<h1>{{ flatpage.title }}</h1>
-
-{{ flatpage.content }}
-{% endblock %}
-
-{% block content-related %}
-<h2>For the impatient:</h2>
-<ul>
-  <li>Download the latest release: <a 
href="http://www.djangoproject.com/download/0.96.1/tarball/";>Django-0.96.1.tar.gz</a>.</li>
-</ul>
-
-<h2>Which version is better?</h2>
-<p>We improve Django almost every day and are pretty good about keeping the 
code stable. Thus, using the latest development code is a safe and easy way to 
get access to new features as they're added. If you choose to follow the 
development version, keep in mind that there will occasionally be 
backwards-incompatible changes. You'll want to pay close attention to the <a 
href="http://code.djangoproject.com/timeline";>development timeline</a>.</p>
-
-<p>If you're just looking for a stable deployment target and don't mind 
waiting for the next release, you'll want to stick with the latest official 
release (which will always include detailed notes on any changes you'll need to 
make while upgrading).</p>
-<h2>Previous releases</h2>
-<ul>
-  <li>Django 0.95.2: <a 
href="http://www.djangoproject.com/download/0.95.2/tarball/";>tarball</a></li>
-  <li>Django 0.91.1: <a 
href="http://www.djangoproject.com/download/0.91.1/tarball/";>tarball</a></li>
-  <li>Django 0.90: <a 
href="http://www.djangoproject.com/download/0.90/tarball/";>tarball</a> | <a 
href="http://www.djangoproject.com/download/0.90/egg/";>egg</a></li>
-</ul>
-{% endblock %}

Deleted: djangoproject.com/django_website/templates/flatfiles/homepage.html
===================================================================
--- djangoproject.com/django_website/templates/flatfiles/homepage.html  
2008-07-11 15:08:09 UTC (rev 7891)
+++ djangoproject.com/django_website/templates/flatfiles/homepage.html  
2008-07-11 15:19:27 UTC (rev 7892)
@@ -1,90 +0,0 @@
-{% extends "base_3col.html" %}
-
-{% block cssid %}homepage{% endblock %}
-
-{% block sectionid %}homepage{% endblock %}
-
-{% block billboard %}<h2>The Web framework for perfectionists (with 
deadlines). Django makes it easier to build better Web apps more quickly and 
with less code.</h2>{% endblock %}
-
-{% block content %}
-<h1>Meet Django</h1>
-<h2 class="deck">Django is a high-level Python Web framework that encourages 
rapid development and clean, pragmatic design.</h2>
-<p>Developed and used over two years by a fast-moving online-news operation, 
Django was designed to handle two challenges: the intensive deadlines of a 
newsroom and the stringent requirements of the <a 
href="/documentation/faq/#who-s-behind-this">experienced Web developers who 
wrote it</a>. It lets you build high-performing, elegant Web applications 
quickly.</p>
-<p>Django focuses on automating as much as possible and adhering to the <a 
href="http://c2.com/cgi/wiki?DontRepeatYourself";><abbr title="Don't Repeat 
Yourself">DRY</abbr> principle</a>.</p>
-<p>Dive in by <a href="/documentation/overview/">reading the overview 
&rarr;</a></p>
-<p>When you're ready to code, read the <a 
href="/documentation/install/">installation guide</a> and <a 
href="/documentation/tutorial1/">tutorial</a>.</p>
-<div id="content-secondary">
-       <h2>The Django framework</h2>
-       <h3>Object-relational mapper</h3>
-       <p>Define your <a 
href="http://www.djangoproject.com/documentation/model_api/";>data models</a> 
entirely in Python. You get a rich, <a href="/documentation/db_api/">dynamic 
database-access API</a> for free &mdash; but you can still write SQL if 
needed.</p>
-       <h3>Automatic admin interface</h3>
-       <p>Save yourself the tedious work of creating interfaces for people to 
add and update content. <a 
href="http://www.djangoproject.com/documentation/tutorial2/";>Django does that 
automatically</a>, and it's production-ready.</p>
-       <h3>Elegant URL design</h3>
-       <p>Design pretty, <a 
href="http://www.djangoproject.com/documentation/url_dispatch/";>cruft-free 
URLs</a> with no framework-specific limitations. Be as flexible as you like.</p>
-       <h3>Template system</h3>
-       <p>Use Django's powerful, extensible and designer-friendly <a 
href="http://www.djangoproject.com/documentation/templates/";>template 
language</a> to separate design, content and Python code.</p>
-       <h3>Cache system</h3>
-       <p>Hook into memcached or other cache frameworks for <a 
href="http://www.djangoproject.com/documentation/cache/";>super performance</a> 
&mdash; caching is as granular as you need.</p>
-        <h3>Internationalization</h3>
-        <p>Django has full support for <a 
href="http://www.djangoproject.com/documentation/i18n/";>multi-language 
applications</a>, letting you specify translation strings and providing hooks 
for language-specific functionality.</p>
-</div>
-<!-- END #content-secondary -->
-{% endblock %}
-
-{% block content-related %}
-
-<h2>Download</h2>
-<ul class="linklist">
-    <li class="button-download"><a href="/download/">Latest release: 
<strong>0.96</strong></a></li>
-</ul>
-<p>Open source, <a 
href="http://code.djangoproject.com/browser/django/trunk/LICENSE";>BSD 
license</a></p>
-<h2>Documentation</h2>
-<ul class="linklist">
-       <li><a href="/documentation/install/">Installation guide</a></li>
-       <li><a href="/documentation/tutorial1/">Tutorial</a></li>
-       <li><a href="/documentation/model_api/">Models</a></li>
-       <li><a href="/documentation/templates/">Templates</a></li>
-    <li>New: <a href="http://www.djangobook.com/";>The Django Book</a></li>
-       <li><a href="/documentation/">More...</a></li>
-</ul>
-<h2>Sites that use Django</h2>
-<dl>
-    <dt><a href="http://www.lawrence.com/";>lawrence.com</a></dt>
-    <dd>An internationally renowned local-entertainment site with events, 
stories, bands, drink specials and more.</dd>
-    <dt><a 
href="http://projects.washingtonpost.com/congress/";>washingtonpost.com</a></dt>
-    <dd>The Washington Post's growing selection of innovative Web database 
applications.</dd>
-       <dt><a href="http://www.everyblock.com/";>EveryBlock</a></dt>
-       <dd>A news feed for your block.</dd>
-       <dt><a href="http://www.ljworld.com/";>LJWorld.com</a></dt>
-       <dd>An industry-leading newspaper site.</dd>
-    <dt><a href="http://www.pownce.com/";>Pownce</a></dt>
-    <dd>Send stuff to your friends.</dd>
-    <dt><a href="http://www.tabblo.com/";>Tabblo</a></dt>
-    <dd>An innovative photo-sharing site, with a narrative twist.</dd>
-       <dt><a href="http://www.torontolife.com/";>Toronto Life</a></dt>
-       <dd>Toronto's city magazine.</dd>
-</dl>
-<p><a href="http://code.djangoproject.com/wiki/DjangoPoweredSites";>See more 
sites...</a></p>
-{% endblock %}
-
-{% block content-extra %}
-<h2>Weblog</h2>
-
-{% load comments comment_utils latestblogentry %}
-{% get_latest_blog_entries 4 as latest_entries %}
-
-{% for latest_entry in latest_entries %}
-    <h3><a href="{{ latest_entry.get_absolute_url }}">{{ latest_entry.headline 
}}</a></h3>
-    <p class="date">by <strong>{{ latest_entry.author }}</strong> on {{ 
latest_entry.pub_date|date:"M. j, Y" }}</p>
-    {{ latest_entry.summary }}
-    <p class="more"><a href="{{ latest_entry.get_absolute_url }}">Read 
more</a>{% if comment_count %} / <a href="{{ latest_entry.get_absolute_url 
}}#comments">{{ comment_count }} comment{{ comment_count|pluralize }}</a>{% 
endif %}</p>
-{% endfor %}
-
-{% comment %}
-<blockquote class="fancyquote">
-<p>Django's cool. I should know because I’m British.</p>
-<cite><strong>Simon Willison</strong><br />Mad Genius</cite>
-</blockquote>
-{% endcomment %}
-
-{% endblock %}

Deleted: djangoproject.com/django_website/templates/flatfiles/legacy_docs.html
===================================================================
--- djangoproject.com/django_website/templates/flatfiles/legacy_docs.html       
2008-07-11 15:08:09 UTC (rev 7891)
+++ djangoproject.com/django_website/templates/flatfiles/legacy_docs.html       
2008-07-11 15:19:27 UTC (rev 7892)
@@ -1,9 +0,0 @@
-{% extends "base_docs.html" %}
-
-{% block title %}{{ flatpage.title }}{% endblock %}
-
-{% block content %}
-
-{{ flatpage.content }}
-
-{% endblock %}
\ No newline at end of file

Copied: djangoproject.com/django_website/templates/flatpages/code.html (from 
rev 7368, djangoproject.com/django_website/templates/flatfiles/code.html)
===================================================================
--- djangoproject.com/django_website/templates/flatpages/code.html              
                (rev 0)
+++ djangoproject.com/django_website/templates/flatpages/code.html      
2008-07-11 15:19:27 UTC (rev 7892)
@@ -0,0 +1,7 @@
+{% extends "base_code.html" %}
+
+{% block content %}
+<h1>{{ flatpage.title }}</h1>
+
+{{ flatpage.content }}
+{% endblock %}

Copied: djangoproject.com/django_website/templates/flatpages/community.html 
(from rev 7368, 
djangoproject.com/django_website/templates/flatfiles/community.html)
===================================================================
--- djangoproject.com/django_website/templates/flatpages/community.html         
                (rev 0)
+++ djangoproject.com/django_website/templates/flatpages/community.html 
2008-07-11 15:19:27 UTC (rev 7892)
@@ -0,0 +1,7 @@
+{% extends "base_community.html" %}
+
+{% block content %}
+<h1>{{ flatpage.title }}</h1>
+
+{{ flatpage.content }}
+{% endblock %}

Modified: djangoproject.com/django_website/templates/flatpages/default.html
===================================================================
--- djangoproject.com/django_website/templates/flatpages/default.html   
2008-07-11 15:08:09 UTC (rev 7891)
+++ djangoproject.com/django_website/templates/flatpages/default.html   
2008-07-11 15:19:27 UTC (rev 7892)
@@ -1 +1,7 @@
-{% extends 'flatfiles/default.html' %}
+{% extends "base.html" %}
+
+{% block content %}
+<h1>{{ flatpage.title }}</h1>
+
+{{ flatpage.content }}
+{% endblock %}

Copied: djangoproject.com/django_website/templates/flatpages/docs.html (from 
rev 7368, djangoproject.com/django_website/templates/flatfiles/docs.html)
===================================================================
--- djangoproject.com/django_website/templates/flatpages/docs.html              
                (rev 0)
+++ djangoproject.com/django_website/templates/flatpages/docs.html      
2008-07-11 15:19:27 UTC (rev 7892)
@@ -0,0 +1,31 @@
+{% extends "base_docs.html" %}
+
+{% block content %}
+<h1>{{ flatpage.title }}</h1>
+
+{% ifequal version "trunk" %}
+  
+{% endifequal %}
+
+{{ flatpage.content }}
+{% endblock %}
+
+{% block content-related %}
+
+<h2>Search docs via Google</h2>
+<form action="http://www.google.com/search"; method="get">
+<p><input type="text" name="as_q" /> <input type="submit" value="Go" /></p>
+<input type="hidden" name="as_sitesearch" value="www.djangoproject.com" />
+</form>
+
+<h2>Getting help</h2>
+<ul class="toc">
+    <li><a href="irc://irc.freenode.net/django">#django IRC channel</a></li>
+    <li><a href="http://oebfare.com/logger/django/";>#django IRC logs</a></li>
+    <li><a 
href="http://groups-beta.google.com/group/django-users";>Django-users mailing 
list</a></li>
+    <li><a 
href="http://groups-beta.google.com/group/django-developers";>Django-developers 
mailing list</a></li>
+    <li><a href="http://code.djangoproject.com/simpleticket";>Report a 
bug</a></li>
+    <li><a href="/comments/">Recent comments posted to 
djangoproject.com</a></li>
+</ul>
+
+{% endblock %}

Copied: djangoproject.com/django_website/templates/flatpages/download.html 
(from rev 7368, 
djangoproject.com/django_website/templates/flatfiles/download.html)
===================================================================
--- djangoproject.com/django_website/templates/flatpages/download.html          
                (rev 0)
+++ djangoproject.com/django_website/templates/flatpages/download.html  
2008-07-11 15:19:27 UTC (rev 7892)
@@ -0,0 +1,25 @@
+{% extends "base_download.html" %}
+
+{% block content %}
+<h1>{{ flatpage.title }}</h1>
+
+{{ flatpage.content }}
+{% endblock %}
+
+{% block content-related %}
+<h2>For the impatient:</h2>
+<ul>
+  <li>Download the latest release: <a 
href="http://www.djangoproject.com/download/0.96.2/tarball/";>Django-0.96.2.tar.gz</a>.</li>
+</ul>
+
+<h2>Which version is better?</h2>
+<p>We improve Django almost every day and are pretty good about keeping the 
code stable. Thus, using the latest development code is a safe and easy way to 
get access to new features as they're added. If you choose to follow the 
development version, keep in mind that there will occasionally be 
backwards-incompatible changes. You'll want to pay close attention to the <a 
href="http://code.djangoproject.com/timeline";>development timeline</a>.</p>
+
+<p>If you're just looking for a stable deployment target and don't mind 
waiting for the next release, you'll want to stick with the latest official 
release (which will always include detailed notes on any changes you'll need to 
make while upgrading).</p>
+<h2>Previous releases</h2>
+<ul>
+  <li>Django 0.95.3: <a 
href="http://www.djangoproject.com/download/0.95.3/tarball/";>tarball</a></li>
+  <li>Django 0.91.2: <a 
href="http://www.djangoproject.com/download/0.91.2/tarball/";>tarball</a></li>
+  <li>Django 0.90: <a 
href="http://www.djangoproject.com/download/0.90/tarball/";>tarball</a> | <a 
href="http://www.djangoproject.com/download/0.90/egg/";>egg</a></li>
+</ul>
+{% endblock %}

Added: djangoproject.com/django_website/templates/flatpages/foundation.html
===================================================================
--- djangoproject.com/django_website/templates/flatpages/foundation.html        
                        (rev 0)
+++ djangoproject.com/django_website/templates/flatpages/foundation.html        
2008-07-11 15:19:27 UTC (rev 7892)
@@ -0,0 +1,10 @@
+{% extends "base_community.html" %}
+
+{% block title %}Foundation{% endblock %}
+
+{% block content %}
+<h1>{{ flatpage.title }}</h1>
+{{ flatpage.content }}
+{% endblock %}
+
+{% block content-related %}{% endblock %}

Copied: djangoproject.com/django_website/templates/flatpages/homepage.html 
(from rev 7369, 
djangoproject.com/django_website/templates/flatfiles/homepage.html)
===================================================================
--- djangoproject.com/django_website/templates/flatpages/homepage.html          
                (rev 0)
+++ djangoproject.com/django_website/templates/flatpages/homepage.html  
2008-07-11 15:19:27 UTC (rev 7892)
@@ -0,0 +1,90 @@
+{% extends "base_3col.html" %}
+
+{% block cssid %}homepage{% endblock %}
+
+{% block sectionid %}homepage{% endblock %}
+
+{% block billboard %}<h2>The Web framework for perfectionists (with 
deadlines). Django makes it easier to build better Web apps more quickly and 
with less code.</h2>{% endblock %}
+
+{% block content %}
+<h1>Meet Django</h1>
+<h2 class="deck">Django is a high-level Python Web framework that encourages 
rapid development and clean, pragmatic design.</h2>
+<p>Developed and used over two years by a fast-moving online-news operation, 
Django was designed to handle two challenges: the intensive deadlines of a 
newsroom and the stringent requirements of the <a 
href="/documentation/faq/#who-s-behind-this">experienced Web developers who 
wrote it</a>. It lets you build high-performing, elegant Web applications 
quickly.</p>
+<p>Django focuses on automating as much as possible and adhering to the <a 
href="http://c2.com/cgi/wiki?DontRepeatYourself";><abbr title="Don't Repeat 
Yourself">DRY</abbr> principle</a>.</p>
+<p>Dive in by <a href="/documentation/overview/">reading the overview 
&rarr;</a></p>
+<p>When you're ready to code, read the <a 
href="/documentation/install/">installation guide</a> and <a 
href="/documentation/tutorial1/">tutorial</a>.</p>
+<div id="content-secondary">
+       <h2>The Django framework</h2>
+       <h3>Object-relational mapper</h3>
+       <p>Define your <a 
href="http://www.djangoproject.com/documentation/model_api/";>data models</a> 
entirely in Python. You get a rich, <a href="/documentation/db_api/">dynamic 
database-access API</a> for free &mdash; but you can still write SQL if 
needed.</p>
+       <h3>Automatic admin interface</h3>
+       <p>Save yourself the tedious work of creating interfaces for people to 
add and update content. <a 
href="http://www.djangoproject.com/documentation/tutorial2/";>Django does that 
automatically</a>, and it's production-ready.</p>
+       <h3>Elegant URL design</h3>
+       <p>Design pretty, <a 
href="http://www.djangoproject.com/documentation/url_dispatch/";>cruft-free 
URLs</a> with no framework-specific limitations. Be as flexible as you like.</p>
+       <h3>Template system</h3>
+       <p>Use Django's powerful, extensible and designer-friendly <a 
href="http://www.djangoproject.com/documentation/templates/";>template 
language</a> to separate design, content and Python code.</p>
+       <h3>Cache system</h3>
+       <p>Hook into memcached or other cache frameworks for <a 
href="http://www.djangoproject.com/documentation/cache/";>super performance</a> 
&mdash; caching is as granular as you need.</p>
+        <h3>Internationalization</h3>
+        <p>Django has full support for <a 
href="http://www.djangoproject.com/documentation/i18n/";>multi-language 
applications</a>, letting you specify translation strings and providing hooks 
for language-specific functionality.</p>
+</div>
+<!-- END #content-secondary -->
+{% endblock %}
+
+{% block content-related %}
+
+<h2>Download</h2>
+<ul class="linklist">
+    <li class="button-download"><a href="/download/">Latest release: 
<strong>0.96</strong></a></li>
+</ul>
+<p>Open source, <a 
href="http://code.djangoproject.com/browser/django/trunk/LICENSE";>BSD 
license</a></p>
+<h2>Documentation</h2>
+<ul class="linklist">
+       <li><a href="/documentation/install/">Installation guide</a></li>
+       <li><a href="/documentation/tutorial1/">Tutorial</a></li>
+       <li><a href="/documentation/model_api/">Models</a></li>
+       <li><a href="/documentation/templates/">Templates</a></li>
+    <li>New: <a href="http://www.djangobook.com/";>The Django Book</a></li>
+       <li><a href="/documentation/">More...</a></li>
+</ul>
+<h2>Sites that use Django</h2>
+<dl>
+    <dt><a href="http://www.lawrence.com/";>lawrence.com</a></dt>
+    <dd>An internationally renowned local-entertainment site with events, 
stories, bands, drink specials and more.</dd>
+    <dt><a 
href="http://projects.washingtonpost.com/congress/";>washingtonpost.com</a></dt>
+    <dd>The Washington Post's growing selection of innovative Web database 
applications.</dd>
+       <dt><a href="http://www.everyblock.com/";>EveryBlock</a></dt>
+       <dd>A news feed for your block.</dd>
+       <dt><a href="http://www.ljworld.com/";>LJWorld.com</a></dt>
+       <dd>An industry-leading newspaper site.</dd>
+    <dt><a href="http://www.pownce.com/";>Pownce</a></dt>
+    <dd>Send stuff to your friends.</dd>
+    <dt><a href="http://www.tabblo.com/";>Tabblo</a></dt>
+    <dd>An innovative photo-sharing site, with a narrative twist.</dd>
+       <dt><a href="http://www.torontolife.com/";>Toronto Life</a></dt>
+       <dd>Toronto's city magazine.</dd>
+</dl>
+<p><a href="http://code.djangoproject.com/wiki/DjangoPoweredSites";>See more 
sites...</a></p>
+{% endblock %}
+
+{% block content-extra %}
+<h2>Weblog</h2>
+
+{% load comments comment_utils latestblogentry %}
+{% get_latest_blog_entries 4 as latest_entries %}
+
+{% for latest_entry in latest_entries %}
+    <h3><a href="{{ latest_entry.get_absolute_url }}">{{ latest_entry.headline 
}}</a></h3>
+    <p class="date">by <strong>{{ latest_entry.author }}</strong> on {{ 
latest_entry.pub_date|date:"M. j, Y" }}</p>
+    {{ latest_entry.summary }}
+    <p class="more"><a href="{{ latest_entry.get_absolute_url }}">Read 
more</a>{% if comment_count %} / <a href="{{ latest_entry.get_absolute_url 
}}#comments">{{ comment_count }} comment{{ comment_count|pluralize }}</a>{% 
endif %}</p>
+{% endfor %}
+
+{% comment %}
+<blockquote class="fancyquote">
+<p>Django's cool. I should know because I’m British.</p>
+<cite><strong>Simon Willison</strong><br />Mad Genius</cite>
+</blockquote>
+{% endcomment %}
+
+{% endblock %}

Copied: djangoproject.com/django_website/templates/flatpages/legacy_docs.html 
(from rev 7368, 
djangoproject.com/django_website/templates/flatfiles/legacy_docs.html)
===================================================================
--- djangoproject.com/django_website/templates/flatpages/legacy_docs.html       
                        (rev 0)
+++ djangoproject.com/django_website/templates/flatpages/legacy_docs.html       
2008-07-11 15:19:27 UTC (rev 7892)
@@ -0,0 +1,9 @@
+{% extends "base_docs.html" %}
+
+{% block title %}{{ flatpage.title }}{% endblock %}
+
+{% block content %}
+
+{{ flatpage.content }}
+
+{% endblock %}
\ No newline at end of file


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to