Django

Code

Changeset 7892

Show
Ignore:
Timestamp:
07/11/08 10:19:27 (4 months ago)
Author:
jacob
Message:

Checking in template changes from djangoproject.com

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r7296 r7892  
    55 
    66import os 
     7import sys 
    78import time 
    89import optparse 
    910import datetime 
    1011import feedparser 
     12 
     13LOCKFILE = "/tmp/update_feeds.lock" 
    1114 
    1215def update_feeds(verbose=False): 
    …… 
    5255 
    5356if __name__ == '__main__': 
     57    try: 
     58        lockfile = os.open(LOCKFILE, os.O_CREAT | os.O_EXCL) 
     59    except OSError: 
     60        sys.exit(0) 
     61     
    5462    parser = optparse.OptionParser() 
    5563    parser.add_option('--settings') 
    …… 
    5967        os.environ["DJANGO_SETTINGS_MODULE"] = options.settings 
    6068    update_feeds(options.verbose) 
     69 
     70    os.close(lockfile) 
     71    os.unlink(LOCKFILE) 

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

    r7296 r7892  
    1111 
    1212    class Admin: 
    13         pass 
     13        list_display = ["title", "public_url", "is_defunct"] 
     14        list_filter = ["is_defunct"] 
     15        ordering = ["title"] 
     16        search_fields = ["title", "public_url"] 
     17        list_per_page = 500 
    1418 
    1519    def __unicode__(self): 

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

    r6757 r7892  
    4747                <!-- END #content --> 
    4848                <div id="footer"> 
    49                         <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.  
     49                        <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.  
    5050                        Hosting graciously provided by <a href="http://mediatemple.net/"> 
    5151                        <img style="vertical-align: middle; position: relative; top: -1px;" src="http://media.djangoproject.com/img/site/mt.png" alt="media temple" /></a> 

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

    r7369 r7892  
    1414<h2>Archives</h2> 
    1515<ul class="linklist"> 
     16    <li><a href="/weblog/2008/apr/">April 2008</a></li> 
     17    <li><a href="/weblog/2008/mar/">March 2008</a></li> 
     18    <li><a href="/weblog/2008/feb/">Febuary 2008</a></li> 
     19    <li><a href="/weblog/2008/jan/">January 2008</a></li> 
     20    <li><a href="/weblog/2007/dec/">December 2007</a></li>  
    1621    <li><a href="/weblog/2007/nov/">November 2007</a></li> 
    1722    <li><a href="/weblog/2007/oct/">October 2007</a></li> 

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

    r7703 r7892  
    1919<h2>The Django Book</h2> 
    2020 
    21 <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> 
     21<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> 
    2222 
    2323<h2>The essential documentation</h2> 
    …… 
    4949 
    5050<li><a href="newforms/">The newforms library</a> | <a href="forms/">The old forms and manipulators library</a></li> 
    51 <li><strong>New:</strong> <a href="testing/">Testing Django applications</a></li> 
     51<li><strong>New:</strong> <a href="upload_handling/">File uploads</a></li> 
     52<li><a href="testing/">Testing Django applications</a></li> 
    5253<li><a href="sessions/">Sessions</a></li> 
    5354<li><a href="cache/">Caching</a></li> 
    …… 
    6263<li><strong>New:</strong> <a href="unicode/">Unicode data in Django</a></li> 
    6364<li><strong>New:</strong> <a href="pagination/">Pagination</a></li> 
     65<li><strong>New:</strong> <a href="serialization/">Serialization</a></li> 
    6466 
    6567<li><a href="add_ons/">The django.contrib add-ons</a> 

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

    r3008 r7892  
    1 {% extends 'flatfiles/default.html' %} 
     1{% extends "base.html" %} 
     2 
     3{% block content %} 
     4<h1>{{ flatpage.title }}</h1> 
     5 
     6{{ flatpage.content }} 
     7{% endblock %} 

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

    r6757 r7892  
    1010<h2>For the impatient:</h2> 
    1111<ul> 
    12   <li>Download the latest release: <a href="http://www.djangoproject.com/download/0.96.1/tarball/">Django-0.96.1.tar.gz</a>.</li> 
     12  <li>Download the latest release: <a href="http://www.djangoproject.com/download/0.96.2/tarball/">Django-0.96.2.tar.gz</a>.</li> 
    1313</ul> 
    1414 
    …… 
    1919<h2>Previous releases</h2> 
    2020<ul> 
    21   <li>Django 0.95.2: <a href="http://www.djangoproject.com/download/0.95.2/tarball/">tarball</a></li> 
    22   <li>Django 0.91.1: <a href="http://www.djangoproject.com/download/0.91.1/tarball/">tarball</a></li> 
     21  <li>Django 0.95.3: <a href="http://www.djangoproject.com/download/0.95.3/tarball/">tarball</a></li> 
     22  <li>Django 0.91.2: <a href="http://www.djangoproject.com/download/0.91.2/tarball/">tarball</a></li> 
    2323  <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> 
    2424</ul>