Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Checking in template changes from djangoproject.com

git-svn-id: http://code.djangoproject.com/svn/djangoproject.com@7892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 6e6842ea65a3c2d655d18d2ac8042347c160198e 1 parent 8f1d0f8
jacob authored
View
11 django_website/apps/aggregator/bin/update_feeds.py
@@ -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 @@ def update_feeds(verbose=False):
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 @@ def update_feeds(verbose=False):
if options.settings:
os.environ["DJANGO_SETTINGS_MODULE"] = options.settings
update_feeds(options.verbose)
+
+ os.close(lockfile)
+ os.unlink(LOCKFILE)
View
6 django_website/apps/aggregator/models.py
@@ -10,7 +10,11 @@ class Meta:
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
View
2  django_website/templates/base.html
@@ -46,7 +46,7 @@ <h1 id="logo"><a href="/"><img src="http://media.djangoproject.com/img/site/hdr_
</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>
View
5 django_website/templates/base_weblog.html
@@ -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>
View
6 django_website/templates/docs/index.html
@@ -18,7 +18,7 @@ <h2 class="deck">
<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 @@ <h2 id="reference">Reference</h2>
<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 @@ <h2 id="reference">Reference</h2>
<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>
View
0  django_website/templates/flatfiles/code.html → django_website/templates/flatpages/code.html
File renamed without changes
View
0  django_website/templates/flatfiles/community.html → django_website/templates/flatpages/community.html
File renamed without changes
View
8 django_website/templates/flatpages/default.html
@@ -1 +1,7 @@
-{% extends 'flatfiles/default.html' %}
+{% extends "base.html" %}
+
+{% block content %}
+<h1>{{ flatpage.title }}</h1>
+
+{{ flatpage.content }}
+{% endblock %}
View
0  django_website/templates/flatfiles/docs.html → django_website/templates/flatpages/docs.html
File renamed without changes
View
6 django_website/templates/flatfiles/download.html → django_website/templates/flatpages/download.html
@@ -9,7 +9,7 @@
{% 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>
+ <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>
@@ -18,8 +18,8 @@
<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.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 %}
View
10 django_website/templates/flatpages/foundation.html
@@ -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 %}
View
0  django_website/templates/flatfiles/homepage.html → django_website/templates/flatpages/homepage.html
File renamed without changes
View
0  django_website/templates/flatfiles/legacy_docs.html → django_website/templates/flatpages/legacy_docs.html
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.