Django

Code

Changeset 3008

Show
Ignore:
Timestamp:
05/30/06 11:48:23 (3 years ago)
Author:
adrian
Message:

Upgraded djangoproject.com to magic-removal

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • djangoproject.com/django_website/apps/aggregator/bin/update_feeds.py

    r431 r3008  
    11""" 
    2 Update feeds for Django community page.  Requires Mark Pilgrim's excellent  
     2Update feeds for Django community page.  Requires Mark Pilgrim's excellent 
    33Universal Feed Parser (http://feedparser.org) 
    44""" 
    …… 
    1111 
    1212def update_feeds(): 
    13     from django.models.aggregator import feeds, feeditems 
    14     for feed in feeds.get_iterator(is_defunct__exact=False): 
     13    from django_website.apps.aggregator.models import Feed, FeedItem 
     14    for feed in Feed.objects.filter(is_defunct=False): 
    1515        parsed_feed = feedparser.parse(feed.feed_url) 
    1616        for entry in parsed_feed.entries: 
    …… 
    1818            guid = entry.get("id", entry.link).encode(parsed_feed.encoding, "xmlcharrefreplace") 
    1919            link = entry.link.encode(parsed_feed.encoding, "xmlcharrefreplace") 
    20              
     20 
    2121            if hasattr(entry, "summary"): 
    2222                content = entry.summary 
    …… 
    2828                content = u"" 
    2929            content = content.encode(parsed_feed.encoding, "xmlcharrefreplace") 
    30              
     30 
    3131            if entry.has_key('modified_parsed'): 
    3232                date_modified = datetime.datetime.fromtimestamp(time.mktime(entry.modified_parsed)) 
    …… 
    3737            else: 
    3838                date_modified = datetime.datetime.now() 
    39              
     39 
    4040            try: 
    41                 feed.get_feeditem(guid__exact=guid) 
    42             except feeditems.FeedItemDoesNotExist: 
    43                 feed.add_feeditem(title=title, link=link, summary=content, guid=guid, date_modified=date_modified) 
    44                  
     41                feed.feeditem_set.filter(guid=guid) 
     42            except FeedItem.DoesNotExist: 
     43                feed.feeditem_set.create(title=title, link=link, summary=content, guid=guid, date_modified=date_modified) 
     44 
    4545if __name__ == '__main__': 
    4646    parser = optparse.OptionParser() 

  • djangoproject.com/django_website/apps/aggregator/feeds.py

    r1336 r3008  
    11from django.contrib.syndication.feeds import Feed 
    2 from django.models.aggregator import feeditems 
     2from django_website.apps.aggregator.models import FeedItem 
    33 
    44class CommunityAggregatorFeed(Feed): 
    …… 
    66    link = "http://www.djangoproject.com/community/" 
    77    description = "Aggregated feeds from the Django community." 
    8      
     8 
    99    def items(self): 
    10         return feeditems.get_list(limit=10) 
     10        return FeedItem.objects.all()[:10] 

  • djangoproject.com/django_website/apps/aggregator/models.py

    r549 r3008  
    1 from django.core import meta 
     1from django.db import models 
    22 
    3 class Feed(meta.Model): 
    4     title = meta.CharField(maxlength=200) 
    5     feed_url = meta.URLField(unique=True) 
    6     public_url = meta.URLField() 
    7     is_defunct = meta.BooleanField() 
    8     class META: 
    9         admin = meta.Admin() 
     3class Feed(models.Model): 
     4    title = models.CharField(maxlength=200) 
     5    feed_url = models.URLField(unique=True) 
     6    public_url = models.URLField() 
     7    is_defunct = models.BooleanField() 
    108 
    11     def __repr__(self): 
     9    class Meta: 
     10        db_table = 'aggregator_feeds' 
     11 
     12    class Admin: 
     13        pass 
     14 
     15    def __str__(self): 
    1216        return self.title 
    1317 
    14 class FeedItem(meta.Model): 
    15     feed = meta.ForeignKey(Feed) 
    16     title = meta.CharField(maxlength=200) 
    17     link = meta.URLField() 
    18     summary = meta.TextField(blank=True) 
    19     date_modified = meta.DateTimeField() 
    20     guid = meta.CharField(maxlength=200, unique=True, db_index=True) 
    21     class META: 
     18class FeedItem(models.Model): 
     19    feed = models.ForeignKey(Feed) 
     20    title = models.CharField(maxlength=200) 
     21    link = models.URLField() 
     22    summary = models.TextField(blank=True) 
     23    date_modified = models.DateTimeField() 
     24    guid = models.CharField(maxlength=200, unique=True, db_index=True) 
     25 
     26    class Meta: 
     27        db_table = 'aggregator_feeditems' 
    2228        ordering = ("-date_modified",) 
    2329 
    24     def __repr__(self): 
     30    def __str__(self): 
    2531        return self.title 
    2632 

  • djangoproject.com/django_website/apps/aggregator/templatetags/aggregator.py

    r482 r3008  
    1 from django.core import template 
    2 from django.models.aggregator import feeds 
     1from django import template 
     2from django_website.apps.aggregator.models import Feed 
    33 
    44class FeedListNode(template.Node): 
    55    def __init__(self, varname): 
    66        self.varname = varname 
    7          
     7 
    88    def render(self, context): 
    9         context[self.varname] = feeds.get_list(is_defunct__exact=False) 
     9        context[self.varname] = Feed.objects.filter(is_defunct=False) 
    1010        return '' 
    11          
     11 
    1212def do_get_feed_list(parser, token): 
    1313    """ 
    …… 
    2020        raise template.TemplateSyntaxError, "First argument to '%s' tag must be 'as'" % bits[0] 
    2121    return FeedListNode(bits[2]) 
    22      
    23 template.register_tag('get_feed_list', do_get_feed_list) 
     22 
     23register = template.Library() 
     24register.tag('get_feed_list', do_get_feed_list) 

  • djangoproject.com/django_website/apps/blog/feeds.py

    r1336 r3008  
    11from django.contrib.syndication.feeds import Feed 
    2 from django.models.blog import entries 
     2from django_website.apps.blog.models import Entry 
    33 
    44class WeblogEntryFeed(Feed): 
    …… 
    66    link = "http://www.djangoproject.com/weblog/" 
    77    description = "Latest news about Django, the Python Web framework." 
    8      
     8 
    99    def items(self): 
    10         return entries.get_list(limit=10) 
    11  
     10        return Entry.objects.all()[:10] 

  • djangoproject.com/django_website/apps/blog/models.py

    r554 r3008  
    1 from django.core import meta 
     1from django.db import models 
    22 
    3 class Entry(meta.Model): 
    4     pub_date = meta.DateTimeField() 
    5     slug = meta.SlugField(unique_for_date='pub_date') 
    6     headline = meta.CharField(maxlength=200) 
    7     summary = meta.TextField(help_text="Use raw HTML.") 
    8     body = meta.TextField(help_text="Use raw HTML.") 
    9     author = meta.CharField(maxlength=100) 
    10     class META: 
     3class Entry(models.Model): 
     4    pub_date = models.DateTimeField() 
     5    slug = models.SlugField(unique_for_date='pub_date') 
     6    headline = models.CharField(maxlength=200) 
     7    summary = models.TextField(help_text="Use raw HTML.") 
     8    body = models.TextField(help_text="Use raw HTML.") 
     9    author = models.CharField(maxlength=100) 
     10 
     11    class Meta: 
     12        db_table = 'blog_entries' 
    1113        verbose_name_plural = 'entries' 
    12         module_name = 'entries' 
    1314        ordering = ('-pub_date',) 
    1415        get_latest_by = 'pub_date' 
    15         admin = meta.Admin( 
    16             list_display = ('pub_date', 'headline', 'author'), 
    17         ) 
    1816 
    19     def __repr__(self): 
     17    class Admin: 
     18        list_display = ('pub_date', 'headline', 'author') 
     19 
     20    def __str__(self): 
    2021        return self.headline 
    2122 

  • djangoproject.com/django_website/apps/blog/templatetags/latestblogentry.py

    r53 r3008  
    1 from django.core import template 
    2 from django.models.blog import entries 
     1from django import template 
     2from django_website.apps.blog.models import Entry 
    33 
    44class LatestBlogEntriesNode(template.Node): 
    …… 
    77 
    88    def render(self, context): 
    9         context[self.varname] = entries.get_list(limit=self.num) 
     9        context[self.varname] = list(Entry.objects.all()[:self.num]) 
    1010        return '' 
    1111 
    …… 
    2121    return LatestBlogEntriesNode(bits[1], bits[3]) 
    2222 
    23 template.register_tag('get_latest_blog_entries', do_get_latest_blog_entries) 
     23register = template.Library() 
     24register.tag('get_latest_blog_entries', do_get_latest_blog_entries) 

  • djangoproject.com/django_website/apps/blog/urls.py

    r19 r3008  
    11from django.conf.urls.defaults import * 
     2from models import Entry # relative import 
    23 
    34info_dict = { 
    4     'app_label': 'blog', 
    5     'module_name': 'entries', 
     5    'queryset': Entry.objects.all(), 
    66    'date_field': 'pub_date', 
    77} 

  • djangoproject.com/django_website/apps/docs/models.py

    r549 r3008  
    1 from django.core import meta 
     1from django.db import models 
    22 
    3 class Document(meta.Model): 
    4     title = meta.CharField(maxlength=200) 
    5     slug = meta.CharField(maxlength=50, unique=True, prepopulate_from=('title',)) 
    6     doc_path = meta.CharField(maxlength=200, 
     3class Document(models.Model): 
     4    title = models.CharField(maxlength=200) 
     5    slug = models.CharField(maxlength=50, unique=True, prepopulate_from=('title',)) 
     6    doc_path = models.CharField(maxlength=200, 
    77        help_text="Relative to the docs directory in django SVN. Leave off the file extension.") 
    8     last_updated = meta.DateTimeField(auto_now=True) 
    9     class META: 
     8    last_updated = models.DateTimeField(auto_now=True) 
     9 
     10    class Meta: 
     11        db_table = 'docs_documents' 
    1012        ordering = ('title',) 
    11         admin = meta.Admin( 
    12             fields = ( 
    13                 (None, {'fields': ('title', 'slug', 'doc_path')}), 
    14             ), 
    15             list_display = ('title', 'doc_path'), 
     13 
     14    class Admin: 
     15        fields = ( 
     16            (None, {'fields': ('title', 'slug', 'doc_path')}), 
    1617        ) 
     18        list_display = ('title', 'doc_path') 
    1719 
    18     def __repr__(self): 
     20    def __str__(self): 
    1921        return self.title 
    2022 
    …… 
    2729        except AttributeError: 
    2830            import os 
    29             from django.conf.settings import DJANGO_DOCUMENT_ROOT_PATH 
    30             doc_path = os.path.join(DJANGO_DOCUMENT_ROOT_PATH, "%s.html" % self.doc_path) 
     31            from django.conf import settings 
     32            doc_path = os.path.join(settings.DJANGO_DOCUMENT_ROOT_PATH, "%s.html" % self.doc_path) 
    3133            if os.path.exists(doc_path): 
    3234                self._doc_content = open(doc_path).read() 
    …… 
    4042        except AttributeError: 
    4143            import os 
    42             from django.conf.settings import DJANGO_DOCUMENT_ROOT_PATH 
    43             toc_path = os.path.join(DJANGO_DOCUMENT_ROOT_PATH, "%s_toc.html" % self.doc_path) 
     44            from django.conf import settings 
     45            toc_path = os.path.join(settings.DJANGO_DOCUMENT_ROOT_PATH, "%s_toc.html" % self.doc_path) 
    4446            if os.path.exists(toc_path): 
    4547                self._toc_content = open(toc_path).read() 

  • djangoproject.com/django_website/apps/docs/parts/flatten_docs.py

    r2806 r3008  
    66""" 
    77 
    8 from django.models.flatpages import flatpages 
    9 from django.models.docs import documents 
     8from django_website.apps.docs.models import Document 
     9from django.contrib.flatpages.models import FlatPage 
    1010 
    11 for doc in documents.get_list(): 
    12     f = flatpages.FlatPage( 
     11for doc in Document.objects.all(): 
     12    f = FlatPage( 
    1313        url='/documentation/0_91/%s/' % doc.slug, 
    1414        title='Documentation (version 0.91) | %s' % doc.title, 
    …… 
    1818        registration_required=False) 
    1919    f.save() 
    20     f.set_sites([1]) 
     20    f.site_set = [1] 

  • djangoproject.com/django_website/apps/docs/urls.py

    r349 r3008  
    11from django.conf.urls.defaults import * 
     2from models import Document # relative import 
    23 
    3 # infodict for generic view 
    4 info = { 
    5     'app_label'     : 'docs', 
    6     'module_name'   : 'documents', 
    7     'slug_field'    : 'slug', 
     4info_dict = { 
     5    'queryset': Document.objects.all(), 
     6    'slug_field': 'slug', 
    87} 
    98 
    109urlpatterns = patterns('django.views.generic.list_detail', 
    11     (r'^(?P<slug>[\w\/]+)/$', 'object_detail', info), 
     10    (r'^(?P<slug>[\w\/]+)/$', 'object_detail', info_dict), 
    1211) 

  • djangoproject.com/django_website/settings/main.py

    r1501 r3008  
    1 from worldonline.settings.default import * 
     1# from worldonline.settings.default import * 
    22 
    3 ADMINS = (('Adrian Holovaty','aholovaty@ljworld.com'), ('Jacob Kaplan-Moss', 'jacob@lawrence.com')) 
     3ADMINS = (('Adrian Holovaty','holovaty@gmail.com'), ('Jacob Kaplan-Moss', 'jacob@lawrence.com')) 
    44TIME_ZONE = 'America/Chicago' 
    55 
    …… 
    2323ROOT_URLCONF = 'django_website.settings.urls.main' 
    2424INSTALLED_APPS = ( 
    25     'django.contrib.*', 
     25    'django.contrib.sites', 
     26    'django.contrib.auth', 
     27    'django.contrib.comments', 
     28    'django.contrib.contenttypes', 
     29    'django.contrib.flatpages', 
     30    'django.contrib.redirects', 
     31    'django.contrib.sessions', 
    2632    'django_website.apps.blog', 
    2733    'django_website.apps.docs', 
    …… 
    4248 
    4349MIDDLEWARE_CLASSES = ( 
    44     'django.middleware.sessions.SessionMiddleware', 
     50    'django.contrib.sessions.middleware.SessionMiddleware', 
     51    'django.contrib.auth.middleware.AuthenticationMiddleware', 
    4552    'django.middleware.common.CommonMiddleware', 
    4653    'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware', 
    4754    'django.contrib.redirects.middleware.RedirectFallbackMiddleware', 
    4855) 
     56TEMPLATE_LOADERS = ( 
     57    'django.template.loaders.filesystem.load_template_source', 
     58) 

  • djangoproject.com/django_website/settings/urls/main.py

    r1336 r3008  
    11from django.conf.urls.defaults import * 
    22from django.contrib.comments.feeds import LatestFreeCommentsFeed 
     3from django.contrib.comments.models import FreeComment 
    34from django_website.apps.aggregator.feeds import CommunityAggregatorFeed 
     5from django_website.apps.aggregator.models import FeedItem 
    46from django_website.apps.blog.feeds import WeblogEntryFeed 
    57 
    68comments_info_dict = { 
    7     'app_label': 'comments', 
    8     'module_name': 'freecomments', 
     9    'queryset': FreeComment.objects.all(), 
    910    'paginate_by': 15, 
    1011} 
    1112 
    1213aggregator_info_dict = { 
    13     'app_label' : 'aggregator', 
    14     'module_name' : 'feeditems', 
    15     'paginate_by' : 15, 
    16     'extra_lookup_kwargs': {'select_related' : True}, 
     14    'queryset': FeedItem.objects.select_related(), 
     15    'paginate_by': 15, 
    1716} 
    1817 
    1918feeds = { 
    20     'weblog' : WeblogEntryFeed, 
    21     'comments' : LatestFreeCommentsFeed, 
    22     'community' : CommunityAggregatorFeed, 
     19    'weblog': WeblogEntryFeed, 
     20    'comments': LatestFreeCommentsFeed, 
     21    'community': CommunityAggregatorFeed, 
    2322} 
    2423 
    2524urlpatterns = patterns('', 
    26     (r'^weblog/', include('django_website.apps.blog.urls.blog')), 
    27     (r'^documentation/', include('django_website.apps.docs.urls.docs')), 
     25    (r'^weblog/', include('django_website.apps.blog.urls')), 
     26    (r'^documentation/', include('django_website.apps.docs.urls')), 
    2827    (r'^comments/$', 'django.views.generic.list_detail.object_list', comments_info_dict), 
    2928    (r'^comments/', include('django.contrib.comments.urls.comments')), 

  • djangoproject.com/django_website/templates/404.html

    r708 r3008  
    1 {% extends "base_2col" %} 
     1{% extends "base_2col.html" %} 
    22 
    33{% block title %}Page not found{% endblock %} 

  • djangoproject.com/django_website/templates/500.html

    r189 r3008  
    1 {% extends "base_2col" %} 
     1{% extends "base_2col.html" %} 
    22 
    33{% block title %}Page unavailable{% endblock %} 

  • djangoproject.com/django_website/templates/aggregator/feeditem_list.html

    r1932 r3008  
    1 {% extends "base_community" %} 
     1{% extends "base_community.html" %} 
    22 
    33{% block extrahead %} 

  • djangoproject.com/django_website/templates/base_2col.html

    r189 r3008  
    1 {% extends "base" %} 
     1{% extends "base.html" %} 
    22 
    33{% block columnwrap %} 

  • djangoproject.com/django_website/templates/base_3col.html

    r189 r3008  
    1 {% extends "base" %} 
     1{% extends "base.html" %} 
    22 
    33{% block columnwrap %} 

  • djangoproject.com/django_website/templates/base_code.html

    r189 r3008  
    1 {% extends "base_2col" %} 
     1{% extends "base_2col.html" %} 
    22 
    33{% block sectionid %}code{% endblock %} 

  • djangoproject.com/django_website/templates/base_community.html

    r1932 r3008  
    1 {% extends "base_2col" %} 
     1{% extends "base_2col.html" %} 
    22 
    33{% block sectionid %}community{% endblock %} 
    …… 
    1212 
    1313<ul> 
    14 <li><a href="http://groups-beta.google.com/group/django-users">django-users mailing list</a> -- the main place to go for help</li> 
    1514<li><a href="irc://irc.freenode.net/django">#django IRC channel</a> -- chat with other Django users</li> 
    1615<li><a href="http://code.djangoproject.com/newticket">Ticket system</a> -- report bugs and make feature requests</li> 
    1716</ul> 
     17 
     18<h2>Mailing lists</h2> 
     19 
     20<p><strong><a href="http://groups.google.com/group/django-users">django-users</a></strong>: The main list for help and announcements.</p> 
     21 
     22<form action="http://groups.google.com/group/django-users/boxsubscribe"> 
     23<p>Subscribe: <input type="text" name="email" size="15" /> <input type="submit" value="Go" /></p> 
     24</form> 
     25 
     26<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> 
     27 
     28<form action="http://groups.google.com/group/django-developers/boxsubscribe"> 
     29<p>Subscribe: <input type="text" name="email" size="15" /> <input type="submit" value="Go" /></p> 
     30</form> 
    1831 
    1932<h2>Tell the world</h2> 
    …… 
    2134<li><a href="http://code.djangoproject.com/wiki/DjangoPoweredSites">Django-powered sites</a> -- add your site to the list</li> 
    2235<li><a href="/community/badges/">Django badges</a> -- show your support (or wish longingly)</li> 
     36<li><a href="/community/logos/">Django logos</a> -- download official logos</li> 
    2337<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> 
    2438</ul> 

  • djangoproject.com/django_website/templates/base_docs.html

    r1334 r3008  
    1 {% extends "base_2col" %} 
     1{% extends "base_2col.html" %} 
    22 
    33{% block sectionid %}documentation{% endblock %} 

  • djangoproject.com/django_website/templates/base_download.html

    r1334 r3008  
    1 {% extends "base_2col" %} 
     1{% extends "base_2col.html" %} 
    22 
    33{% block sectionid %}download{% endblock %} 

  • djangoproject.com/django_website/templates/base_weblog.html

    r1932 r3008  
    1 {% extends "base_2col" %} 
     1{% extends "base_2col.html" %} 
    22 
    33{% block extrahead %} 
    …… 
    1414<h2>Archives</h2> 
    1515<ul class="linklist"> 
     16        <li><a href="/weblog/2006/may/">May 2006</a></li> 
     17        <li><a href="/weblog/2006/apr/">April 2006</a></li> 
     18        <li><a href="/weblog/2006/mar/">March 2006</a></li> 
     19        <li><a href="/weblog/2006/feb/">February 2006</a></li> 
    1620        <li><a href="/weblog/2006/jan/">January 2006</a></li> 
    1721        <li><a href="/weblog/2005/dec/">December 2005</a></li> 

  • djangoproject.com/django_website/templates/blog/entry_archive_day.html

    r189 r3008  
    1 {% extends "base_weblog" %} 
     1{% extends "base_weblog.html" %} 
    22 
    33{% block title %}Weblog | {{ day|date:"F j" }}{% endblock %} 

  • djangoproject.com/django_website/templates/blog/entry_archive.html

    r235 r3008  
    1 {% extends "base_weblog" %} 
     1{% extends "base_weblog.html" %} 
    22 
    33{% block content %} 
    …… 
    88 
    99{% for object in latest %} 
    10     {% get_free_comment_count for blog.entries object.id as comment_count %} 
     10    {% get_free_comment_count for blog.entry object.id as comment_count %} 
    1111    <h2><a href="{{ object.get_absolute_url }}">{{ object.headline }}</a></h2> 
    1212    {{ object.body }} 

  • djangoproject.com/django_website/templates/blog/entry_archive_month.html

    r189 r3008  
    1 {% extends "base_weblog" %} 
     1{% extends "base_weblog.html" %} 
    22 
    33{% block title %}Weblog | {{ month|date:"F" }}{% endblock %} 

  • djangoproject.com/django_website/templates/blog/entry_archive_year.html

    r189 r3008  
    1 {% extends "base_weblog" %} 
     1{% extends "base_weblog.html" %} 
    22 
    33{% block title %}Weblog | {{ year }}{% endblock %} 

  • djangoproject.com/django_website/templates/blog/entry_detail.html

    r189 r3008  
    1 {% extends "base_weblog" %} 
     1{% extends "base_weblog.html" %} 
    22 
    33{% block title %}Weblog | {{ object.headline|escape }}{% endblock %} 
    …… 
    1010 
    1111{% load comments %} 
    12 {% get_free_comment_list for blog.entries object.id as comment_list %} 
     12{% get_free_comment_list for blog.entry object.id as comment_list %} 
    1313 
    1414<div id="content-secondary"> 
    …… 
    1717{% for comment in comment_list %} 
    1818<div class="comment" id="c{{ comment.id }}"> 
    19        <h3>{{ comment.person_name }} <span class="small quiet">{{ comment.submit_date|date:"F j, Y" }} at {{ comment.submit_date|date:"P" }}</span></h3> 
     19    <h3>{{ comment.person_name }} <span class="small quiet">{{ comment.submit_date|date:"F j, Y" }} at {{ comment.submit_date|date:"P" }}</span></h3> 
    2020    {{ comment.comment|escape|urlizetrunc:"40"|linebreaks }} 
    2121</div> 
    …… 
    2424<h2>Post a comment</h2> 
    2525 
    26 {% free_comment_form for blog.entries object.id %} 
     26{% free_comment_form for blog.entry object.id %} 
    2727</div> 
    2828{% endblock %} 

  • djangoproject.com/django_website/templates/comments/freecomments_list.html

    r369 r3008  
    1 {% extends "base_weblog" %} 
     1{% extends "base_weblog.html" %} 
    22 
    33{% block extrahead %} 

  • djangoproject.com/django_website/templates/comments/free_preview.html

    r243 r3008  
    1 {% extends "base" %} 
     1{% extends "base.html" %} 
    22 
    33{% block title %}Preview comment{% endblock %} 

  • djangoproject.com/django_website/templates/comments/posted.html

    r205 r3008  
    1 {% extends "base" %} 
     1{% extends "base.html" %} 
    22 
    33{% block title %}Comment posted{% endblock %} 

  • djangoproject.com/django_website/templates/docs/document_detail.html

    r1334 r3008  
    1 {% extends "base_docs" %} 
     1{% extends "base_docs.html" %} 
    22 
    33{% block title %}Documentation | {{ object.title }}{% endblock %} 
    …… 
    77 
    88{% load comments %} 
    9 {% get_free_comment_list for docs.documents object.id as comment_list %} 
     9{% get_free_comment_list for docs.document object.id as comment_list %} 
    1010 
    1111<div id="content-secondary"> 
    …… 
    2828the documentation proper, and removed.</p> 
    2929 
    30 {% free_comment_form for docs.documents object.id %} 
     30{% free_comment_form for docs.document object.id %} 
    3131</div> 
    3232{% endblock %} 

  • djangoproject.com/django_website/templates/flatfiles/code.html

    r1335 r3008  
    1 {% extends "base_code" %} 
     1{% extends "base_code.html" %} 
    22 
    33{% block content %} 

  • djangoproject.com/django_website/templates/flatfiles/community.html

    r1335 r3008  
    1 {% extends "base_community" %} 
     1{% extends "base_community.html" %} 
    22 
    33{% block content %} 

  • djangoproject.com/django_website/templates/flatfiles/default.html

    r1335 r3008  
    1 {% extends "base" %} 
     1{% extends "base.html" %} 
    22 
    33{% block content %} 

  • djangoproject.com/django_website/templates/flatfiles/docs.html

    r2519 r3008  
    1 {% extends "base_docs" %} 
     1{% extends "base_docs.html" %} 
    22 
    33{% block content %} 

  • djangoproject.com/django_website/templates/flatfiles/download.html

    r1932 r3008  
    1 {% extends "base_download" %} 
     1{% extends "base_download.html" %} 
    22 
    33{% block content %} 
    …… 
    1515 
    1616<h2>Which version is better?</h2> 
    17 <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> 
     17<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> 
    1818 
    1919<h2>Previous releases</h2> 
    2020<ul> 
    21   <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> 
     21  <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> 
    2222</ul> 
    2323{% endblock %} 

  • djangoproject.com/django_website/templates/flatfiles/homepage.html

    r1932 r3008  
    1 {% extends "base_3col" %} 
     1{% extends "base_3col.html" %} 
    22 
    33{% block cssid %}homepage{% endblock %} 
    …… 
    1010<h1>Meet Django</h1> 
    1111<h2 class="deck">Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design.</h2> 
    12 <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> 
     12<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> 
    1313<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> 
    1414<p>Dive in by <a href="/documentation/overview/">reading the overview &rarr;</a></p> 

  • djangoproject.com/django_website/templates/flatfiles/legacy_docs.html

    r1896 r3008  
    1 {% extends "base_docs" %} 
     1{% extends "base_docs.html" %} 
    22 
    33{% block title %}{{ flatpage.title }}{% endblock %} 

  • djangoproject.com/django_website/templates/flatfiles/overview.html

    r1335 r3008  
    1 {% extends "base_overview" %} 
     1{% extends "base_overview.html" %} 
    22 
    33{% block content %} 

  • djangoproject.com/django_website/templates/flatpages/default.html

    r1334 r3008  
    1 {% extends 'flatfiles/default' %} 
     1{% extends 'flatfiles/default.html' %} 

  • djangoproject.com/django_website/templates/flatpages/snakesandrubies.html

    r1932 r3008  
    1 {% extends "base" %} 
     1{% extends "base.html" %} 
    22 
    33{% block title %}{{ flatpage.title }}{% endblock %}