Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Upgraded djangoproject.com to magic-removal

git-svn-id: http://code.djangoproject.com/svn/djangoproject.com@3008 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 46709289d52f348eb91d28c215655a417a89189f 1 parent 69a440f
adrian authored
Showing with 215 additions and 172 deletions.
  1. +10 −10 django_website/apps/aggregator/bin/update_feeds.py
  2. +3 −3 django_website/apps/aggregator/feeds.py
  3. +34 −0 django_website/apps/aggregator/models.py
  4. +0 −1  django_website/apps/aggregator/models/__init__.py
  5. +0 −28 django_website/apps/aggregator/models/aggregator.py
  6. +8 −7 django_website/apps/aggregator/templatetags/aggregator.py
  7. +3 −4 django_website/apps/blog/feeds.py
  8. +24 −0 django_website/apps/blog/models.py
  9. +0 −1  django_website/apps/blog/models/__init__.py
  10. +0 −23 django_website/apps/blog/models/blog.py
  11. +5 −4 django_website/apps/blog/templatetags/latestblogentry.py
  12. +2 −2 django_website/apps/blog/{urls/blog.py → urls.py}
  13. 0  django_website/apps/blog/urls/__init__.py
  14. +19 −17 django_website/apps/docs/{models/docs.py → models.py}
  15. +0 −1  django_website/apps/docs/models/__init__.py
  16. +5 −5 django_website/apps/docs/parts/flatten_docs.py
  17. +11 −0 django_website/apps/docs/urls.py
  18. 0  django_website/apps/docs/urls/__init__.py
  19. +0 −12 django_website/apps/docs/urls/docs.py
  20. +14 −4 django_website/settings/main.py
  21. +10 −11 django_website/settings/urls/main.py
  22. +1 −1  django_website/templates/404.html
  23. +1 −1  django_website/templates/500.html
  24. +1 −1  django_website/templates/aggregator/{feeditems_list.html → feeditem_list.html}
  25. +1 −1  django_website/templates/base_2col.html
  26. +1 −1  django_website/templates/base_3col.html
  27. +1 −1  django_website/templates/base_code.html
  28. +16 −2 django_website/templates/base_community.html
  29. +1 −1  django_website/templates/base_docs.html
  30. +1 −1  django_website/templates/base_download.html
  31. +5 −1 django_website/templates/base_weblog.html
  32. +2 −2 django_website/templates/blog/{entries_archive.html → entry_archive.html}
  33. +1 −1  django_website/templates/blog/{entries_archive_day.html → entry_archive_day.html}
  34. +1 −1  django_website/templates/blog/{entries_archive_month.html → entry_archive_month.html}
  35. +1 −1  django_website/templates/blog/{entries_archive_year.html → entry_archive_year.html}
  36. +4 −4 django_website/templates/blog/{entries_detail.html → entry_detail.html}
  37. +1 −1  django_website/templates/comments/free_preview.html
  38. +1 −1  django_website/templates/comments/freecomments_list.html
  39. +10 −0 django_website/templates/comments/freeform.html
  40. +1 −1  django_website/templates/comments/posted.html
  41. +3 −3 django_website/templates/docs/{documents_detail.html → document_detail.html}
  42. +1 −1  django_website/templates/flatfiles/code.html
  43. +1 −1  django_website/templates/flatfiles/community.html
  44. +1 −1  django_website/templates/flatfiles/default.html
  45. +1 −1  django_website/templates/flatfiles/docs.html
  46. +3 −3 django_website/templates/flatfiles/download.html
  47. +2 −2 django_website/templates/flatfiles/homepage.html
  48. +1 −1  django_website/templates/flatfiles/legacy_docs.html
  49. +1 −1  django_website/templates/flatfiles/overview.html
  50. +1 −1  django_website/templates/flatpages/default.html
  51. +1 −1  django_website/templates/flatpages/snakesandrubies.html
20 django_website/apps/aggregator/bin/update_feeds.py
View
@@ -1,5 +1,5 @@
"""
-Update feeds for Django community page. Requires Mark Pilgrim's excellent
+Update feeds for Django community page. Requires Mark Pilgrim's excellent
Universal Feed Parser (http://feedparser.org)
"""
@@ -10,14 +10,14 @@
import feedparser
def update_feeds():
- from django.models.aggregator import feeds, feeditems
- for feed in feeds.get_iterator(is_defunct__exact=False):
+ from django_website.apps.aggregator.models import Feed, FeedItem
+ for feed in Feed.objects.filter(is_defunct=False):
parsed_feed = feedparser.parse(feed.feed_url)
for entry in parsed_feed.entries:
title = entry.title.encode(parsed_feed.encoding, "xmlcharrefreplace")
guid = entry.get("id", entry.link).encode(parsed_feed.encoding, "xmlcharrefreplace")
link = entry.link.encode(parsed_feed.encoding, "xmlcharrefreplace")
-
+
if hasattr(entry, "summary"):
content = entry.summary
elif hasattr(entry, "content"):
@@ -27,7 +27,7 @@ def update_feeds():
else:
content = u""
content = content.encode(parsed_feed.encoding, "xmlcharrefreplace")
-
+
if entry.has_key('modified_parsed'):
date_modified = datetime.datetime.fromtimestamp(time.mktime(entry.modified_parsed))
elif parsed_feed.feed.has_key('modified_parsed'):
@@ -36,12 +36,12 @@ def update_feeds():
date_modified = datetime.datetime.fromtimestamp(time.mktime(parsed_feed.modified))
else:
date_modified = datetime.datetime.now()
-
+
try:
- feed.get_feeditem(guid__exact=guid)
- except feeditems.FeedItemDoesNotExist:
- feed.add_feeditem(title=title, link=link, summary=content, guid=guid, date_modified=date_modified)
-
+ feed.feeditem_set.filter(guid=guid)
+ except FeedItem.DoesNotExist:
+ feed.feeditem_set.create(title=title, link=link, summary=content, guid=guid, date_modified=date_modified)
+
if __name__ == '__main__':
parser = optparse.OptionParser()
parser.add_option('--settings')
6 django_website/apps/aggregator/feeds.py
View
@@ -1,10 +1,10 @@
from django.contrib.syndication.feeds import Feed
-from django.models.aggregator import feeditems
+from django_website.apps.aggregator.models import FeedItem
class CommunityAggregatorFeed(Feed):
title = "The Django community aggregator"
link = "http://www.djangoproject.com/community/"
description = "Aggregated feeds from the Django community."
-
+
def items(self):
- return feeditems.get_list(limit=10)
+ return FeedItem.objects.all()[:10]
34 django_website/apps/aggregator/models.py
View
@@ -0,0 +1,34 @@
+from django.db import models
+
+class Feed(models.Model):
+ title = models.CharField(maxlength=200)
+ feed_url = models.URLField(unique=True)
+ public_url = models.URLField()
+ is_defunct = models.BooleanField()
+
+ class Meta:
+ db_table = 'aggregator_feeds'
+
+ class Admin:
+ pass
+
+ def __str__(self):
+ return self.title
+
+class FeedItem(models.Model):
+ feed = models.ForeignKey(Feed)
+ title = models.CharField(maxlength=200)
+ link = models.URLField()
+ summary = models.TextField(blank=True)
+ date_modified = models.DateTimeField()
+ guid = models.CharField(maxlength=200, unique=True, db_index=True)
+
+ class Meta:
+ db_table = 'aggregator_feeditems'
+ ordering = ("-date_modified",)
+
+ def __str__(self):
+ return self.title
+
+ def get_absolute_url(self):
+ return self.link
1  django_website/apps/aggregator/models/__init__.py
View
@@ -1 +0,0 @@
-__all__ = ['aggregator']
28 django_website/apps/aggregator/models/aggregator.py
View
@@ -1,28 +0,0 @@
-from django.core import meta
-
-class Feed(meta.Model):
- title = meta.CharField(maxlength=200)
- feed_url = meta.URLField(unique=True)
- public_url = meta.URLField()
- is_defunct = meta.BooleanField()
- class META:
- admin = meta.Admin()
-
- def __repr__(self):
- return self.title
-
-class FeedItem(meta.Model):
- feed = meta.ForeignKey(Feed)
- title = meta.CharField(maxlength=200)
- link = meta.URLField()
- summary = meta.TextField(blank=True)
- date_modified = meta.DateTimeField()
- guid = meta.CharField(maxlength=200, unique=True, db_index=True)
- class META:
- ordering = ("-date_modified",)
-
- def __repr__(self):
- return self.title
-
- def get_absolute_url(self):
- return self.link
15 django_website/apps/aggregator/templatetags/aggregator.py
View
@@ -1,14 +1,14 @@
-from django.core import template
-from django.models.aggregator import feeds
+from django import template
+from django_website.apps.aggregator.models import Feed
class FeedListNode(template.Node):
def __init__(self, varname):
self.varname = varname
-
+
def render(self, context):
- context[self.varname] = feeds.get_list(is_defunct__exact=False)
+ context[self.varname] = Feed.objects.filter(is_defunct=False)
return ''
-
+
def do_get_feed_list(parser, token):
"""
{% get_feed_list as feed_list %}
@@ -19,5 +19,6 @@ def do_get_feed_list(parser, token):
if bits[1] != "as":
raise template.TemplateSyntaxError, "First argument to '%s' tag must be 'as'" % bits[0]
return FeedListNode(bits[2])
-
-template.register_tag('get_feed_list', do_get_feed_list)
+
+register = template.Library()
+register.tag('get_feed_list', do_get_feed_list)
7 django_website/apps/blog/feeds.py
View
@@ -1,11 +1,10 @@
from django.contrib.syndication.feeds import Feed
-from django.models.blog import entries
+from django_website.apps.blog.models import Entry
class WeblogEntryFeed(Feed):
title = "The Django weblog"
link = "http://www.djangoproject.com/weblog/"
description = "Latest news about Django, the Python Web framework."
-
- def items(self):
- return entries.get_list(limit=10)
+ def items(self):
+ return Entry.objects.all()[:10]
24 django_website/apps/blog/models.py
View
@@ -0,0 +1,24 @@
+from django.db import models
+
+class Entry(models.Model):
+ pub_date = models.DateTimeField()
+ slug = models.SlugField(unique_for_date='pub_date')
+ headline = models.CharField(maxlength=200)
+ summary = models.TextField(help_text="Use raw HTML.")
+ body = models.TextField(help_text="Use raw HTML.")
+ author = models.CharField(maxlength=100)
+
+ class Meta:
+ db_table = 'blog_entries'
+ verbose_name_plural = 'entries'
+ ordering = ('-pub_date',)
+ get_latest_by = 'pub_date'
+
+ class Admin:
+ list_display = ('pub_date', 'headline', 'author')
+
+ def __str__(self):
+ return self.headline
+
+ def get_absolute_url(self):
+ return "/weblog/%s/%s/" % (self.pub_date.strftime("%Y/%b/%d").lower(), self.slug)
1  django_website/apps/blog/models/__init__.py
View
@@ -1 +0,0 @@
-__all__ = ['blog']
23 django_website/apps/blog/models/blog.py
View
@@ -1,23 +0,0 @@
-from django.core import meta
-
-class Entry(meta.Model):
- pub_date = meta.DateTimeField()
- slug = meta.SlugField(unique_for_date='pub_date')
- headline = meta.CharField(maxlength=200)
- summary = meta.TextField(help_text="Use raw HTML.")
- body = meta.TextField(help_text="Use raw HTML.")
- author = meta.CharField(maxlength=100)
- class META:
- verbose_name_plural = 'entries'
- module_name = 'entries'
- ordering = ('-pub_date',)
- get_latest_by = 'pub_date'
- admin = meta.Admin(
- list_display = ('pub_date', 'headline', 'author'),
- )
-
- def __repr__(self):
- return self.headline
-
- def get_absolute_url(self):
- return "/weblog/%s/%s/" % (self.pub_date.strftime("%Y/%b/%d").lower(), self.slug)
9 django_website/apps/blog/templatetags/latestblogentry.py
View
@@ -1,12 +1,12 @@
-from django.core import template
-from django.models.blog import entries
+from django import template
+from django_website.apps.blog.models import Entry
class LatestBlogEntriesNode(template.Node):
def __init__(self, num, varname):
self.num, self.varname = num, varname
def render(self, context):
- context[self.varname] = entries.get_list(limit=self.num)
+ context[self.varname] = list(Entry.objects.all()[:self.num])
return ''
def do_get_latest_blog_entries(parser, token):
@@ -20,4 +20,5 @@ def do_get_latest_blog_entries(parser, token):
raise template.TemplateSyntaxError, "First argument to '%s' tag must be 'as'" % bits[0]
return LatestBlogEntriesNode(bits[1], bits[3])
-template.register_tag('get_latest_blog_entries', do_get_latest_blog_entries)
+register = template.Library()
+register.tag('get_latest_blog_entries', do_get_latest_blog_entries)
4 django_website/apps/blog/urls/blog.py → django_website/apps/blog/urls.py
View
@@ -1,8 +1,8 @@
from django.conf.urls.defaults import *
+from models import Entry # relative import
info_dict = {
- 'app_label': 'blog',
- 'module_name': 'entries',
+ 'queryset': Entry.objects.all(),
'date_field': 'pub_date',
}
0  django_website/apps/blog/urls/__init__.py
View
No changes.
36 django_website/apps/docs/models/docs.py → django_website/apps/docs/models.py
View
@@ -1,21 +1,23 @@
-from django.core import meta
+from django.db import models
-class Document(meta.Model):
- title = meta.CharField(maxlength=200)
- slug = meta.CharField(maxlength=50, unique=True, prepopulate_from=('title',))
- doc_path = meta.CharField(maxlength=200,
+class Document(models.Model):
+ title = models.CharField(maxlength=200)
+ slug = models.CharField(maxlength=50, unique=True, prepopulate_from=('title',))
+ doc_path = models.CharField(maxlength=200,
help_text="Relative to the docs directory in django SVN. Leave off the file extension.")
- last_updated = meta.DateTimeField(auto_now=True)
- class META:
+ last_updated = models.DateTimeField(auto_now=True)
+
+ class Meta:
+ db_table = 'docs_documents'
ordering = ('title',)
- admin = meta.Admin(
- fields = (
- (None, {'fields': ('title', 'slug', 'doc_path')}),
- ),
- list_display = ('title', 'doc_path'),
+
+ class Admin:
+ fields = (
+ (None, {'fields': ('title', 'slug', 'doc_path')}),
)
+ list_display = ('title', 'doc_path')
- def __repr__(self):
+ def __str__(self):
return self.title
def get_absolute_url(self):
@@ -26,8 +28,8 @@ def get_content(self):
return self._doc_content
except AttributeError:
import os
- from django.conf.settings import DJANGO_DOCUMENT_ROOT_PATH
- doc_path = os.path.join(DJANGO_DOCUMENT_ROOT_PATH, "%s.html" % self.doc_path)
+ from django.conf import settings
+ doc_path = os.path.join(settings.DJANGO_DOCUMENT_ROOT_PATH, "%s.html" % self.doc_path)
if os.path.exists(doc_path):
self._doc_content = open(doc_path).read()
else:
@@ -39,8 +41,8 @@ def get_toc(self):
return self._toc_content
except AttributeError:
import os
- from django.conf.settings import DJANGO_DOCUMENT_ROOT_PATH
- toc_path = os.path.join(DJANGO_DOCUMENT_ROOT_PATH, "%s_toc.html" % self.doc_path)
+ from django.conf import settings
+ toc_path = os.path.join(settings.DJANGO_DOCUMENT_ROOT_PATH, "%s_toc.html" % self.doc_path)
if os.path.exists(toc_path):
self._toc_content = open(toc_path).read()
else:
1  django_website/apps/docs/models/__init__.py
View
@@ -1 +0,0 @@
-__all__ = ['docs']
10 django_website/apps/docs/parts/flatten_docs.py
View
@@ -5,11 +5,11 @@
a particular version.
"""
-from django.models.flatpages import flatpages
-from django.models.docs import documents
+from django_website.apps.docs.models import Document
+from django.contrib.flatpages.models import FlatPage
-for doc in documents.get_list():
- f = flatpages.FlatPage(
+for doc in Document.objects.all():
+ f = FlatPage(
url='/documentation/0_91/%s/' % doc.slug,
title='Documentation (version 0.91) | %s' % doc.title,
content='%s</div><div id="content-related" class="sidebar"><h2>Contents</h2>%s' % (doc.get_content(), doc.get_toc()),
@@ -17,4 +17,4 @@
template_name='flatfiles/legacy_docs',
registration_required=False)
f.save()
- f.set_sites([1])
+ f.site_set = [1]
11 django_website/apps/docs/urls.py
View
@@ -0,0 +1,11 @@
+from django.conf.urls.defaults import *
+from models import Document # relative import
+
+info_dict = {
+ 'queryset': Document.objects.all(),
+ 'slug_field': 'slug',
+}
+
+urlpatterns = patterns('django.views.generic.list_detail',
+ (r'^(?P<slug>[\w\/]+)/$', 'object_detail', info_dict),
+)
0  django_website/apps/docs/urls/__init__.py
View
No changes.
12 django_website/apps/docs/urls/docs.py
View
@@ -1,12 +0,0 @@
-from django.conf.urls.defaults import *
-
-# infodict for generic view
-info = {
- 'app_label' : 'docs',
- 'module_name' : 'documents',
- 'slug_field' : 'slug',
-}
-
-urlpatterns = patterns('django.views.generic.list_detail',
- (r'^(?P<slug>[\w\/]+)/$', 'object_detail', info),
-)
18 django_website/settings/main.py
View
@@ -1,6 +1,6 @@
-from worldonline.settings.default import *
+# from worldonline.settings.default import *
-ADMINS = (('Adrian Holovaty','aholovaty@ljworld.com'), ('Jacob Kaplan-Moss', 'jacob@lawrence.com'))
+ADMINS = (('Adrian Holovaty','holovaty@gmail.com'), ('Jacob Kaplan-Moss', 'jacob@lawrence.com'))
TIME_ZONE = 'America/Chicago'
SERVER_EMAIL = 'root@pam.servers.ljworld.com'
@@ -22,7 +22,13 @@
)
ROOT_URLCONF = 'django_website.settings.urls.main'
INSTALLED_APPS = (
- 'django.contrib.*',
+ 'django.contrib.sites',
+ 'django.contrib.auth',
+ 'django.contrib.comments',
+ 'django.contrib.contenttypes',
+ 'django.contrib.flatpages',
+ 'django.contrib.redirects',
+ 'django.contrib.sessions',
'django_website.apps.blog',
'django_website.apps.docs',
'django_website.apps.aggregator',
@@ -41,8 +47,12 @@
CACHE_MIDDLEWARE_GZIP = True
MIDDLEWARE_CLASSES = (
- 'django.middleware.sessions.SessionMiddleware',
+ 'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
'django.contrib.redirects.middleware.RedirectFallbackMiddleware',
)
+TEMPLATE_LOADERS = (
+ 'django.template.loaders.filesystem.load_template_source',
+)
21 django_website/settings/urls/main.py
View
@@ -1,30 +1,29 @@
from django.conf.urls.defaults import *
from django.contrib.comments.feeds import LatestFreeCommentsFeed
+from django.contrib.comments.models import FreeComment
from django_website.apps.aggregator.feeds import CommunityAggregatorFeed
+from django_website.apps.aggregator.models import FeedItem
from django_website.apps.blog.feeds import WeblogEntryFeed
comments_info_dict = {
- 'app_label': 'comments',
- 'module_name': 'freecomments',
+ 'queryset': FreeComment.objects.all(),
'paginate_by': 15,
}
aggregator_info_dict = {
- 'app_label' : 'aggregator',
- 'module_name' : 'feeditems',
- 'paginate_by' : 15,
- 'extra_lookup_kwargs': {'select_related' : True},
+ 'queryset': FeedItem.objects.select_related(),
+ 'paginate_by': 15,
}
feeds = {
- 'weblog' : WeblogEntryFeed,
- 'comments' : LatestFreeCommentsFeed,
- 'community' : CommunityAggregatorFeed,
+ 'weblog': WeblogEntryFeed,
+ 'comments': LatestFreeCommentsFeed,
+ 'community': CommunityAggregatorFeed,
}
urlpatterns = patterns('',
- (r'^weblog/', include('django_website.apps.blog.urls.blog')),
- (r'^documentation/', include('django_website.apps.docs.urls.docs')),
+ (r'^weblog/', include('django_website.apps.blog.urls')),
+ (r'^documentation/', include('django_website.apps.docs.urls')),
(r'^comments/$', 'django.views.generic.list_detail.object_list', comments_info_dict),
(r'^comments/', include('django.contrib.comments.urls.comments')),
(r'^community/$', 'django.views.generic.list_detail.object_list', aggregator_info_dict),
2  django_website/templates/404.html
View
@@ -1,4 +1,4 @@
-{% extends "base_2col" %}
+{% extends "base_2col.html" %}
{% block title %}Page not found{% endblock %}
2  django_website/templates/500.html
View
@@ -1,4 +1,4 @@
-{% extends "base_2col" %}
+{% extends "base_2col.html" %}
{% block title %}Page unavailable{% endblock %}
2  ..._website/templates/aggregator/feeditems_list.html → ...o_website/templates/aggregator/feeditem_list.html
View
@@ -1,4 +1,4 @@
-{% extends "base_community" %}
+{% extends "base_community.html" %}
{% block extrahead %}
<link rel="alternate" type="application/rss+xml" title="RSS" href="/rss/community/" />
2  django_website/templates/base_2col.html
View
@@ -1,4 +1,4 @@
-{% extends "base" %}
+{% extends "base.html" %}
{% block columnwrap %}
<div id="content-main">
2  django_website/templates/base_3col.html
View
@@ -1,4 +1,4 @@
-{% extends "base" %}
+{% extends "base.html" %}
{% block columnwrap %}
<div id="subwrap">
2  django_website/templates/base_code.html
View
@@ -1,4 +1,4 @@
-{% extends "base_2col" %}
+{% extends "base_2col.html" %}
{% block sectionid %}code{% endblock %}
18 django_website/templates/base_community.html
View
@@ -1,4 +1,4 @@
-{% extends "base_2col" %}
+{% extends "base_2col.html" %}
{% block sectionid %}community{% endblock %}
@@ -11,15 +11,29 @@
<h2>Get involved</h2>
<ul>
-<li><a href="http://groups-beta.google.com/group/django-users">django-users mailing list</a> -- the main place to go for help</li>
<li><a href="irc://irc.freenode.net/django">#django IRC channel</a> -- chat with other Django users</li>
<li><a href="http://code.djangoproject.com/newticket">Ticket system</a> -- report bugs and make feature requests</li>
</ul>
+<h2>Mailing lists</h2>
+
+<p><strong><a href="http://groups.google.com/group/django-users">django-users</a></strong>: The main list for help and announcements.</p>
+
+<form action="http://groups.google.com/group/django-users/boxsubscribe">
+<p>Subscribe: <input type="text" name="email" size="15" /> <input type="submit" value="Go" /></p>
+</form>
+
+<p><strong><a href="http://groups.google.com/group/django-developers">django-developers</a></strong>: Where the developers of Django itself discuss new features.</p>
+
+<form action="http://groups.google.com/group/django-developers/boxsubscribe">
+<p>Subscribe: <input type="text" name="email" size="15" /> <input type="submit" value="Go" /></p>
+</form>
+
<h2>Tell the world</h2>
<ul>
<li><a href="http://code.djangoproject.com/wiki/DjangoPoweredSites">Django-powered sites</a> -- add your site to the list</li>
<li><a href="/community/badges/">Django badges</a> -- show your support (or wish longingly)</li>
+<li><a href="/community/logos/">Django logos</a> -- download official logos</li>
<li>Write about Django, and <a href="mailto:jacob@jacobian.org">let us know</a>, and we'll add your feed to this page.</li>
</ul>
2  django_website/templates/base_docs.html
View
@@ -1,4 +1,4 @@
-{% extends "base_2col" %}
+{% extends "base_2col.html" %}
{% block sectionid %}documentation{% endblock %}
2  django_website/templates/base_download.html
View
@@ -1,4 +1,4 @@
-{% extends "base_2col" %}
+{% extends "base_2col.html" %}
{% block sectionid %}download{% endblock %}
6 django_website/templates/base_weblog.html
View
@@ -1,4 +1,4 @@
-{% extends "base_2col" %}
+{% extends "base_2col.html" %}
{% block extrahead %}
<link rel="alternate" type="application/rss+xml" title="RSS" href="/rss/weblog/" />
@@ -13,6 +13,10 @@
{% block content-related %}
<h2>Archives</h2>
<ul class="linklist">
+ <li><a href="/weblog/2006/may/">May 2006</a></li>
+ <li><a href="/weblog/2006/apr/">April 2006</a></li>
+ <li><a href="/weblog/2006/mar/">March 2006</a></li>
+ <li><a href="/weblog/2006/feb/">February 2006</a></li>
<li><a href="/weblog/2006/jan/">January 2006</a></li>
<li><a href="/weblog/2005/dec/">December 2005</a></li>
<li><a href="/weblog/2005/nov/">November 2005</a></li>
4 django_website/templates/blog/entries_archive.html → django_website/templates/blog/entry_archive.html
View
@@ -1,4 +1,4 @@
-{% extends "base_weblog" %}
+{% extends "base_weblog.html" %}
{% block content %}
@@ -7,7 +7,7 @@
<h1>Latest entries</h1>
{% for object in latest %}
- {% get_free_comment_count for blog.entries object.id as comment_count %}
+ {% get_free_comment_count for blog.entry object.id as comment_count %}
<h2><a href="{{ object.get_absolute_url }}">{{ object.headline }}</a></h2>
{{ object.body }}
<p class="date small">Posted by <strong>{{ object.author }}</strong> on {{ object.pub_date|date:"F j, Y" }} | <a href="{{ object.get_absolute_url }}#comments">{{ comment_count }} comment{{ comment_count|pluralize }}</a></p>
2  ...o_website/templates/blog/entries_archive_day.html → django_website/templates/blog/entry_archive_day.html
View
@@ -1,4 +1,4 @@
-{% extends "base_weblog" %}
+{% extends "base_weblog.html" %}
{% block title %}Weblog | {{ day|date:"F j" }}{% endblock %}
2  ...website/templates/blog/entries_archive_month.html → ...o_website/templates/blog/entry_archive_month.html
View
@@ -1,4 +1,4 @@
-{% extends "base_weblog" %}
+{% extends "base_weblog.html" %}
{% block title %}Weblog | {{ month|date:"F" }}{% endblock %}
2  ..._website/templates/blog/entries_archive_year.html → ...go_website/templates/blog/entry_archive_year.html
View
@@ -1,4 +1,4 @@
-{% extends "base_weblog" %}
+{% extends "base_weblog.html" %}
{% block title %}Weblog | {{ year }}{% endblock %}
8 django_website/templates/blog/entries_detail.html → django_website/templates/blog/entry_detail.html
View
@@ -1,4 +1,4 @@
-{% extends "base_weblog" %}
+{% extends "base_weblog.html" %}
{% block title %}Weblog | {{ object.headline|escape }}{% endblock %}
@@ -9,20 +9,20 @@
<p class="date small">Posted by <strong>{{ object.author }}</strong> on {{ object.pub_date|date:"F j, Y" }}</p>
{% load comments %}
-{% get_free_comment_list for blog.entries object.id as comment_list %}
+{% get_free_comment_list for blog.entry object.id as comment_list %}
<div id="content-secondary">
<h2 id="comments">Comments</h2>
{% for comment in comment_list %}
<div class="comment" id="c{{ comment.id }}">
- <h3>{{ comment.person_name }} <span class="small quiet">{{ comment.submit_date|date:"F j, Y" }} at {{ comment.submit_date|date:"P" }}</span></h3>
+ <h3>{{ comment.person_name }} <span class="small quiet">{{ comment.submit_date|date:"F j, Y" }} at {{ comment.submit_date|date:"P" }}</span></h3>
{{ comment.comment|escape|urlizetrunc:"40"|linebreaks }}
</div>
{% endfor %}
<h2>Post a comment</h2>
-{% free_comment_form for blog.entries object.id %}
+{% free_comment_form for blog.entry object.id %}
</div>
{% endblock %}
2  django_website/templates/comments/free_preview.html
View
@@ -1,4 +1,4 @@
-{% extends "base" %}
+{% extends "base.html" %}
{% block title %}Preview comment{% endblock %}
2  django_website/templates/comments/freecomments_list.html
View
@@ -1,4 +1,4 @@
-{% extends "base_weblog" %}
+{% extends "base_weblog.html" %}
{% block extrahead %}
<link rel="alternate" type="application/rss+xml" title="RSS" href="/rss/comments/" />
10 django_website/templates/comments/freeform.html
View
@@ -0,0 +1,10 @@
+{% if display_form %}
+<form action="/comments/postfree/" method="post">
+<p>Your name: <input type="text" id="id_person_name" name="person_name" /></p>
+<p>Comment:<br /><textarea name="comment" id="id_comment" rows="10" cols="60"></textarea></p>
+<input type="hidden" name="options" value="{{ options }}" />
+<input type="hidden" name="target" value="{{ target }}" />
+<input type="hidden" name="gonzo" value="{{ hash }}" />
+<p><input type="submit" name="preview" value="Preview comment" /></p>
+</form>
+{% endif %}
2  django_website/templates/comments/posted.html
View
@@ -1,4 +1,4 @@
-{% extends "base" %}
+{% extends "base.html" %}
{% block title %}Comment posted{% endblock %}
6 django_website/templates/docs/documents_detail.html → django_website/templates/docs/document_detail.html
View
@@ -1,4 +1,4 @@
-{% extends "base_docs" %}
+{% extends "base_docs.html" %}
{% block title %}Documentation | {{ object.title }}{% endblock %}
@@ -6,7 +6,7 @@
{{ object.get_content }}
{% load comments %}
-{% get_free_comment_list for docs.documents object.id as comment_list %}
+{% get_free_comment_list for docs.document object.id as comment_list %}
<div id="content-secondary">
<h2 id="comments">Comments</h2>
@@ -27,7 +27,7 @@ <h2 id="comments">Comments</h2>
django-users list</a>. Comments will be periodically reviewed, integrated into
the documentation proper, and removed.</p>
-{% free_comment_form for docs.documents object.id %}
+{% free_comment_form for docs.document object.id %}
</div>
{% endblock %}
2  django_website/templates/flatfiles/code.html
View
@@ -1,4 +1,4 @@
-{% extends "base_code" %}
+{% extends "base_code.html" %}
{% block content %}
<h1>{{ flatpage.title }}</h1>
2  django_website/templates/flatfiles/community.html
View
@@ -1,4 +1,4 @@
-{% extends "base_community" %}
+{% extends "base_community.html" %}
{% block content %}
<h1>{{ flatpage.title }}</h1>
2  django_website/templates/flatfiles/default.html
View
@@ -1,4 +1,4 @@
-{% extends "base" %}
+{% extends "base.html" %}
{% block content %}
<h1>{{ flatpage.title }}</h1>
2  django_website/templates/flatfiles/docs.html
View
@@ -1,4 +1,4 @@
-{% extends "base_docs" %}
+{% extends "base_docs.html" %}
{% block content %}
<h1>{{ flatpage.title }}</h1>
6 django_website/templates/flatfiles/download.html
View
@@ -1,4 +1,4 @@
-{% extends "base_download" %}
+{% extends "base_download.html" %}
{% block content %}
<h1>{{ flatpage.title }}</h1>
@@ -14,10 +14,10 @@
</ul>
<h2>Which version is better?</h2>
-<p>We (<a href="http://code.djangoproject.com/wiki/WorldOnline">World Online</a>, Django developers) improve Django every day and are pretty good about not checking in broken code. We use the development code directly on our servers, so we consider it stable. With that in mind, we <strong>recommend that you use the latest development code</strong>, because it generally contains more features and fewer bugs than the "official" releases.</p>
+<p>We (<a href="http://code.djangoproject.com/wiki/WorldOnline">World Online</a>, Django developers) improve Django every day and are pretty good about not checking in broken code. With that in mind, we <strong>recommend that you use the latest development code</strong>, because it generally contains more features and fewer bugs than the "official" releases.</p>
<h2>Previous releases</h2>
<ul>
- <li>Django 0.90: <a href="http://www.djangoproject.com/download/0.90/egg/">tarball</a> | <a href="http://www.djangoproject.com/download/0.90/tarball/">egg</a>
+ <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>
</ul>
{% endblock %}
4 django_website/templates/flatfiles/homepage.html
View
@@ -1,4 +1,4 @@
-{% extends "base_3col" %}
+{% extends "base_3col.html" %}
{% block cssid %}homepage{% endblock %}
@@ -9,7 +9,7 @@
{% 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="http://www.djangoproject.com/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>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>
2  django_website/templates/flatfiles/legacy_docs.html
View
@@ -1,4 +1,4 @@
-{% extends "base_docs" %}
+{% extends "base_docs.html" %}
{% block title %}{{ flatpage.title }}{% endblock %}
2  django_website/templates/flatfiles/overview.html
View
@@ -1,4 +1,4 @@
-{% extends "base_overview" %}
+{% extends "base_overview.html" %}
{% block content %}
<h1>{{ flatpage.title }}</h1>
2  django_website/templates/flatpages/default.html
View
@@ -1 +1 @@
-{% extends 'flatfiles/default' %}
+{% extends 'flatfiles/default.html' %}
2  django_website/templates/flatpages/snakesandrubies.html
View
@@ -1,4 +1,4 @@
-{% extends "base" %}
+{% extends "base.html" %}
{% block title %}{{ flatpage.title }}{% endblock %}
Please sign in to comment.
Something went wrong with that request. Please try again.