Django

Code

Changeset 6060

Show
Ignore:
Timestamp:
09/07/07 13:33:58 (1 year ago)
Author:
jacob
Message:

[django-website] checking in a few uncommitted changes made recently

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r5429 r6060  
    6363            except pysvn.ClientError: 
    6464                continue 
    65             title, blurb = docstring_re.match(content).group(2).strip().split('\n', 1) 
     65 
     66            try: 
     67                title, blurb = docstring_re.match(content).group(2).strip().split('\n', 1) 
     68            except AttributeError: 
     69                continue # Skip models that don't have docstrings. 
     70 
    6671            try: 
    6772                number, title = title.split(". ", 1) 

  • djangoproject.com/django_website/settings.py

    r4789 r6060  
    2626    DATABASE_PASSWORD = '' 
    2727    DATABASE_HOST = '10.0.0.80' # set to empty string for localhost 
     28    DATABASE_PORT = '5433' 
    2829    CACHE_BACKEND = 'memcached://127.0.0.1:11211/' 
    2930    TEMPLATE_DIRS = ['/home/html/templates/djangoproject.com/'] 

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

    r4783 r6060  
    1515<p class='date'>Posted on {{ item.date_modified|date:"F j, Y" }} at {{ item.date_modified|date:"g:i A" }} by <a href="{{ item.feed.public_url }}">{{ item.feed.title }}</a> <a class="rss" href="{{ item.feed.feed_url }}">RSS</a></p> 
    1616<div> 
    17 {{ item.summary }} 
     17{{ item.summary|striptags|truncatewords:"200" }} 
    1818</div> 
    1919<p class="small"><a href="{{ item.link }}">Read this post in context &raquo;</a></p> 

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

    r4401 r6060  
    3030</form> 
    3131 
    32 <p>Problems subscribing? See this <a href="http://groups.google.com/support/bin/answer.py?answer=12346&amp;topic=251">FAQ answer</a> about non-Gmail addresses.</p> 
     32<p>Problems subscribing? See this <a href="http://groups.google.com/support/bin/answer.py?answer=19870">FAQ answer</a> about non-Gmail addresses.</p> 
    3333 
    3434<h2>Tell the world</h2> 
    35 <ul> 
    36 <li><a href="http://code.djangoproject.com/wiki/DjangoPoweredSites">Django-powered sites</a> &mdash; add your site to the list</li> 
    37 <li><a href="/community/badges/">Django badges</a> -- show your support (or wish longingly)</li> 
    38 <li><a href="/community/logos/">Django logos</a> -- download official logos</li> 
    39 <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> 
    40 </ul> 
    41  
    42 <h2>Improve Django</h2> 
    43  
    4435<ul> 
    4536<li><a href="http://code.djangoproject.com/wiki/DjangoPoweredSites">Django-powered sites</a> &mdash; add your site to the list</li> 
    …… 
    4839<li><a href="/weblog/2005/nov/11/desktops/">Django wallpaper</a> &mdash; cover your desktop</li> 
    4940<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> 
     41</ul> 
     42 
     43<h2>Improve Django</h2> 
     44<ul> 
     45<li><a href="http://groups.google.com/group/django-updates">django-updates mailing list</a> &mdash; get updated for each code and ticket change (for the super-obsessed)</li> 
     46<li>Post comments on any page of this site. <a href="/comments/">View recent comments</a>.</li> 
     47<li><a href="http://code.djangoproject.com/wiki">Django wiki</a> &mdash; contribute tips and documentation</a></li> 
    5048</ul> 
    5149 

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

    r4401 r6060  
    1414<h2>Archives</h2> 
    1515<ul class="linklist"> 
     16    <li><a href="/weblog/2007/jul/">July 2007</a></li> 
     17    <li><a href="/weblog/2007/jun/">June 2007</a></li> 
     18    <li><a href="/weblog/2007/may/">May 2007</a></li> 
     19    <li><a href="/weblog/2007/apr/">April 2007</a></li> 
     20    <li><a href="/weblog/2007/mar/">March 2007</a></li> 
     21    <li><a href="/weblog/2007/feb/">February 2007</a></li> 
    1622    <li><a href="/weblog/2007/jan/">January 2007</a></li> 
    1723    <li><a href="/weblog/2006/dec/">December 2006</a></li> 

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

    r4401 r6060  
    22 
    33{% block extrahead %} 
    4 <link rel="alternate" type="application/rss+xml" title="RSS" href="/rss/comments/" /> 
     4  <link rel="alternate" type="application/rss+xml" title="RSS" href="/rss/comments/" /> 
    55{% endblock %} 
    66 
    …… 
    1111<h1>Recent comments</h1> 
    1212 
    13 <p>{% if has_previous %}<a href="?page={{ previous }}">Previous</a> | {% endif %} 
    14 Page {{ page }} of {{ pages }} 
    15 {% if has_next %} | <a href="?page={{ next }}">Next</a>{% endif %}</p> 
     13<p> 
     14  {% if has_previous %} 
     15    <a href="?page={{ previous }}">Previous</a> | 
     16  {% endif %} 
     17  Page {{ page }} of {{ pages }} 
     18  {% if has_next %} 
     19    | <a href="?page={{ next }}">Next</a> 
     20  {% endif %} 
     21</p> 
    1622 
    1723{% for comment in object_list %} 
    1824<div class="comment" id="c{{ comment.id }}"> 
    19     <h3><a href="{{ comment.get_absolute_url }}">{{ comment.person_name|escape }} <span class="small quiet">{{ comment.submit_date|date:"F j, Y" }} at {{ comment.submit_date|date:"P" }}</span></a></h3> 
    20     {{ comment.comment|escape|urlizetrunc:"40"|linebreaks }} 
     25  <h3> 
     26    <a href="{{ comment.get_absolute_url }}"> 
     27      {{ comment.person_name|escape }} 
     28      <span class="small quiet"> 
     29        {{ comment.submit_date|date:"F j, Y" }} at {{ comment.submit_date|date:"P" }} 
     30      </span> 
     31    </a> 
     32    {% if perms.comments.delete_freecomment %} 
     33      <form style="display: inline" action="/admin/comments/freecomment/{{ comment.id }}/delete/" method="post"> 
     34        <input type="hidden" name="post" value="yes" /> 
     35        <input type="hidden" name="next" value="/comments/"> 
     36        <input type="submit" value="X" style="padding: 0; font-size: 9px; border-width: 1px;"> 
     37      </form> 
     38    {% endif %} 
     39  </h3> 
     40  {{ comment.comment|escape|urlizetrunc:"40"|linebreaks }} 
    2141</div> 
    2242{% endfor %} 

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

    r4963 r6060  
    4040  <h2>Contents</h2> 
    4141  {{ doc.toc }} 
     42  <h3>Last update:</h3> 
     43  <div>{{ update_date|date:"F j, P" }}</div> 
    4244{% endblock %} 

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

    r4798 r6060  
    1919<h2>The Django Book</h2> 
    2020 
    21 <p>We're in the process of writing the official Django book. Follow its progress at <a href="http://www.djangobook.com/">djangobook.com</a>. Note that it assumes you're using the Django development version rather than version 0.95.</p> 
     21<p>We're in the process of writing the official Django book. Follow its progress at <a href="http://www.djangobook.com/">djangobook.com</a>. Note that it assumes you're using the Django development version rather than version 0.96.</p> 
    2222 
    2323<h2>The essential documentation</h2> 
    …… 
    4848<li>Templates: <a href="templates/">Guide for HTML authors</a> | <a href="templates_python/">Guide for Python programmers</a></li> 
    4949 
    50 <li><a href="forms/">Forms and manipulators</a> | <strong>New:</strong> <a href="http://www.djangoproject.com/documentation/newforms/">The <code>newforms</code> library</a></li> 
     50<li><a href="newforms/">The newforms library</a> | <a href="forms/">The old forms and manipulators library</a></li> 
    5151<li><strong>New:</strong> <a href="testing/">Testing Django applications</a></li> 
    5252<li><a href="sessions/">Sessions</a></li> 
    …… 
    5959<li><a href="generic_views/">Generic views</a></li> 
    6060<li><a href="authentication/">Authentication</a></li> 
     61<li><strong>New:</strong> <a href="unicode/">Unicode data in Django</a></li> 
    6162 
    62 <li><a href="add_ons/">Add-on applications (contrib)</a> 
     63<li><a href="add_ons/">The django.contrib add-ons</a> 
    6364    <ul> 
    64     <li><a href="syndication_feeds/">Syndication feeds (RSS and Atom)</a></li> 
    65     <li><a href="flatpages/">Flatpages</a></li> 
    66     <li><a href="redirects/">Redirects</a></li> 
    67     <li><a href="sites/">Sites</a></li> 
    68     <li><a href="sitemaps/">Sitemaps</a></li> 
     65    <li><strong>New:</strong> <a href="databrowse/">Databrowse</a></li> 
     66    <li><a href="syndication_feeds/">Syndication feeds (RSS and Atom)</a> (<code>django.contrib.syndication</code>)</li> 
     67    <li><a href="flatpages/">Flatpages</a> (<code>django.contrib.flatpages</code>)</li> 
     68    <li><a href="redirects/">Redirects</a> (<code>django.contrib.redirects</code>)</li> 
     69    <li><a href="sites/">Sites</a> (<code>django.contrib.sites</code>)</li> 
     70    <li><a href="sitemaps/">Sitemaps</a> (<code>django.contrib.sitemaps</code>)</li> 
     71    <li><strong>New:</strong> <a href="webdesign/">Web design helpers</a> (<code>django.contrib.webdesign</code>)</li> 
    6972    </ul> 
    7073</li> 
    …… 
    7578<ul> 
    7679<li><a href="modpython/">Using Django with mod_python</a></li> 
    77 <li><a href="fastcgi/">Using Django with FastCGI</a></li> 
     80<li><a href="fastcgi/">How to use Django with FastCGI, SCGI or AJP</a></li> 
    7881</ul> 
    7982 
    …… 
    100103<h2>Release notes</h2> 
    101104<ul> 
     105<li><a href="release_notes_0.96/">Version 0.96</a></li> 
    102106<li><a href="release_notes_0.95/">Version 0.95</a></li> 
    103107</ul> 

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

    r4789 r6060  
    99    significantly different than previous releases. Get old examples here:  
    1010    {% for r in all_versions %} 
    11       <a href="{{ r.version }}/models/">{{ r.version }}</a>{% if forloop.last %}.{% else %},{% endif %} 
     11      <a href="../{{ r.version }}/models/">{{ r.version }}</a>{% if forloop.last %}.{% else %},{% endif %} 
    1212    {% endfor %} 
    1313  {% else %} 

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

    r4401 r6060  
    1010<h2>For the impatient:</h2> 
    1111<ul> 
    12   <li>Download the latest release: <a href="http://www.djangoproject.com/download/0.95.1/tarball/">Django-0.95.1.tar.gz</a>.</li> 
     12  <li>Download the latest release: <a href="http://www.djangoproject.com/download/0.96/tarball/">Django-0.96.tar.gz</a>.</li> 
    1313</ul> 
    1414 
    1515<h2>Which version is better?</h2> 
    16 <p>We improve Django almost 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> 
     16<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> 
    1717 
     18<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> 
    1819<h2>Previous releases</h2> 
    1920<ul> 

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

    r4401 r6060  
    3636<h2>Download</h2> 
    3737<ul class="linklist"> 
    38     <li class="button-download"><a href="/download/">Latest release: <strong>0.95.1</strong></a></li> 
     38    <li class="button-download"><a href="/download/">Latest release: <strong>0.96</strong></a></li> 
    3939</ul> 
    4040<p>Open source, <a href="http://code.djangoproject.com/browser/django/trunk/LICENSE">BSD license</a></p>