Author: jacob
Date: 2007-09-07 13:33:58 -0500 (Fri, 07 Sep 2007)
New Revision: 6060
Added:
djangoproject.com/django_website/templates/docs/0.96_index.html
Modified:
djangoproject.com/django_website/apps/docs/views.py
djangoproject.com/django_website/settings.py
djangoproject.com/django_website/templates/aggregator/feeditem_list.html
djangoproject.com/django_website/templates/base_community.html
djangoproject.com/django_website/templates/base_weblog.html
djangoproject.com/django_website/templates/comments/freecomment_list.html
djangoproject.com/django_website/templates/docs/detail.html
djangoproject.com/django_website/templates/docs/index.html
djangoproject.com/django_website/templates/docs/model_index.html
djangoproject.com/django_website/templates/flatfiles/download.html
djangoproject.com/django_website/templates/flatfiles/homepage.html
Log:
[django-website] checking in a few uncommitted changes made recently
Modified: djangoproject.com/django_website/apps/docs/views.py
===================================================================
--- djangoproject.com/django_website/apps/docs/views.py 2007-09-07 04:52:02 UTC
(rev 6059)
+++ djangoproject.com/django_website/apps/docs/views.py 2007-09-07 18:33:58 UTC
(rev 6060)
@@ -62,8 +62,13 @@
content = client.cat(os.path.join(testdir.name, "models.py"))
except pysvn.ClientError:
continue
- title, blurb =
docstring_re.match(content).group(2).strip().split('\n', 1)
+
try:
+ title, blurb =
docstring_re.match(content).group(2).strip().split('\n', 1)
+ except AttributeError:
+ continue # Skip models that don't have docstrings.
+
+ try:
number, title = title.split(". ", 1)
number = int(number)
except ValueError:
@@ -111,4 +116,4 @@
except pysvn.ClientError:
raise Http404("Bad SVN path: %s" % docroot)
- return client, version, docroot
\ No newline at end of file
+ return client, version, docroot
Modified: djangoproject.com/django_website/settings.py
===================================================================
--- djangoproject.com/django_website/settings.py 2007-09-07 04:52:02 UTC
(rev 6059)
+++ djangoproject.com/django_website/settings.py 2007-09-07 18:33:58 UTC
(rev 6060)
@@ -25,6 +25,7 @@
DATABASE_USER = 'apache'
DATABASE_PASSWORD = ''
DATABASE_HOST = '10.0.0.80' # set to empty string for localhost
+ DATABASE_PORT = '5433'
CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
TEMPLATE_DIRS = ['/home/html/templates/djangoproject.com/']
DJANGO_SVN_ROOT = "file:///home/svn/django/django/"
Modified:
djangoproject.com/django_website/templates/aggregator/feeditem_list.html
===================================================================
--- djangoproject.com/django_website/templates/aggregator/feeditem_list.html
2007-09-07 04:52:02 UTC (rev 6059)
+++ djangoproject.com/django_website/templates/aggregator/feeditem_list.html
2007-09-07 18:33:58 UTC (rev 6060)
@@ -14,7 +14,7 @@
<h2><a href="{{ item.link }}">{{ item.title }}</a></h2>
<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>
<div>
-{{ item.summary }}
+{{ item.summary|striptags|truncatewords:"200" }}
</div>
<p class="small"><a href="{{ item.link }}">Read this post in context
»</a></p>
{% endfor %}
Modified: djangoproject.com/django_website/templates/base_community.html
===================================================================
--- djangoproject.com/django_website/templates/base_community.html
2007-09-07 04:52:02 UTC (rev 6059)
+++ djangoproject.com/django_website/templates/base_community.html
2007-09-07 18:33:58 UTC (rev 6060)
@@ -29,24 +29,22 @@
<p>Subscribe: <input type="text" name="email" size="15" /> <input
type="submit" value="Go" /></p>
</form>
-<p>Problems subscribing? See this <a
href="http://groups.google.com/support/bin/answer.py?answer=12346&topic=251";>FAQ
answer</a> about non-Gmail addresses.</p>
+<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>
<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><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><a href="/weblog/2005/nov/11/desktops/">Django wallpaper</a> — cover
your desktop</li>
<li>Write about Django, and <a href="mailto:[EMAIL PROTECTED]">let us
know</a>, and we'll add your feed to this page.</li>
</ul>
<h2>Improve Django</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><a href="/weblog/2005/nov/11/desktops/">Django wallpaper</a> — cover
your desktop</li>
-<li>Write about Django, and <a href="mailto:[EMAIL PROTECTED]">let us
know</a>, and we'll add your feed to this page.</li>
+<li><a href="http://groups.google.com/group/django-updates";>django-updates
mailing list</a> — get updated for each code and ticket change (for the
super-obsessed)</li>
+<li>Post comments on any page of this site. <a href="/comments/">View recent
comments</a>.</li>
+<li><a href="http://code.djangoproject.com/wiki";>Django wiki</a> —
contribute tips and documentation</a></li>
</ul>
<h2>Get help</h2>
Modified: djangoproject.com/django_website/templates/base_weblog.html
===================================================================
--- djangoproject.com/django_website/templates/base_weblog.html 2007-09-07
04:52:02 UTC (rev 6059)
+++ djangoproject.com/django_website/templates/base_weblog.html 2007-09-07
18:33:58 UTC (rev 6060)
@@ -13,6 +13,12 @@
{% block content-related %}
<h2>Archives</h2>
<ul class="linklist">
+ <li><a href="/weblog/2007/jul/">July 2007</a></li>
+ <li><a href="/weblog/2007/jun/">June 2007</a></li>
+ <li><a href="/weblog/2007/may/">May 2007</a></li>
+ <li><a href="/weblog/2007/apr/">April 2007</a></li>
+ <li><a href="/weblog/2007/mar/">March 2007</a></li>
+ <li><a href="/weblog/2007/feb/">February 2007</a></li>
<li><a href="/weblog/2007/jan/">January 2007</a></li>
<li><a href="/weblog/2006/dec/">December 2006</a></li>
<li><a href="/weblog/2006/nov/">November 2006</a></li>
Modified:
djangoproject.com/django_website/templates/comments/freecomment_list.html
===================================================================
--- djangoproject.com/django_website/templates/comments/freecomment_list.html
2007-09-07 04:52:02 UTC (rev 6059)
+++ djangoproject.com/django_website/templates/comments/freecomment_list.html
2007-09-07 18:33:58 UTC (rev 6060)
@@ -1,7 +1,7 @@
{% extends "base_weblog.html" %}
{% block extrahead %}
-<link rel="alternate" type="application/rss+xml" title="RSS"
href="/rss/comments/" />
+ <link rel="alternate" type="application/rss+xml" title="RSS"
href="/rss/comments/" />
{% endblock %}
{% block title %}Recent comments{% endblock %}
@@ -10,14 +10,34 @@
<h1>Recent comments</h1>
-<p>{% if has_previous %}<a href="?page={{ previous }}">Previous</a> | {% endif
%}
-Page {{ page }} of {{ pages }}
-{% if has_next %} | <a href="?page={{ next }}">Next</a>{% endif %}</p>
+<p>
+ {% if has_previous %}
+ <a href="?page={{ previous }}">Previous</a> |
+ {% endif %}
+ Page {{ page }} of {{ pages }}
+ {% if has_next %}
+ | <a href="?page={{ next }}">Next</a>
+ {% endif %}
+</p>
{% for comment in object_list %}
<div class="comment" id="c{{ comment.id }}">
- <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>
- {{ comment.comment|escape|urlizetrunc:"40"|linebreaks }}
+ <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>
+ {% if perms.comments.delete_freecomment %}
+ <form style="display: inline" action="/admin/comments/freecomment/{{
comment.id }}/delete/" method="post">
+ <input type="hidden" name="post" value="yes" />
+ <input type="hidden" name="next" value="/comments/">
+ <input type="submit" value="X" style="padding: 0; font-size: 9px;
border-width: 1px;">
+ </form>
+ {% endif %}
+ </h3>
+ {{ comment.comment|escape|urlizetrunc:"40"|linebreaks }}
</div>
{% endfor %}
Added: djangoproject.com/django_website/templates/docs/0.96_index.html
===================================================================
--- djangoproject.com/django_website/templates/docs/0.96_index.html
(rev 0)
+++ djangoproject.com/django_website/templates/docs/0.96_index.html
2007-09-07 18:33:58 UTC (rev 6060)
@@ -0,0 +1,126 @@
+{% extends "base_docs.html" %}
+
+{% block content %}
+<h1>Documentation</h1>
+
+<h2 class="deck">
+{% ifequal version "trunk" %}
+ These docs are for Django's SVN release, which can be
+ significantly different than previous releases. Get old docs here:
+ {% for r in all_versions %}
+ <a href="{{ r.version }}/">{{ r.version }}</a>{% if forloop.last %}.{%
else %},{% endif %}
+ {% endfor %}
+{% else %}
+ These docs are for Django version {{ version }}. For current documentation,
+ <a href="/documentation/">go here</a>.
+{% endifequal %}
+</h2>
+
+<h2>The Django Book</h2>
+
+<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>
+
+<h2>The essential documentation</h2>
+
+<p>Make sure to read the following documentation. The rest (in the "Reference"
section below) can be read in any particular order, as you need the various
functionality.</p>
+
+<ul>
+<li><a href="overview/">Django overview</a></li>
+<li><a href="install/">Installation guide</a></li>
+<li>Tutorial: Writing your first Django app
+ <ul>
+ <li><a href="tutorial01/">Part 1: Initialization, creating models, the
database API</a></li>
+ <li><a href="tutorial02/">Part 2: Exploring the automatically-generated
admin site</a></li>
+ <li><a href="tutorial03/">Part 3: Creating the public interface
views</a></li>
+ <li><a href="tutorial04/">Part 4: Simple form processing and generic
views</a></li>
+ </ul>
+</li>
+<li><a href="faq/">Frequently asked questions (FAQ)</a></li>
+<li><a href="documentation/">How to read this documentation</a></li>
+</ul>
+
+<h2 id="reference">Reference</h2>
+
+<ul>
+<li><a href="django-admin/">The django-admin.py and manage.py
utilities</a></li>
+<li>Models: <a href="model-api/">Creating models</a> | <a
href="models/">Examples</a> | <a href="db-api/">The database API</a> | <a
href="transactions/">Transactions</a></li>
+
+<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><a href="sessions/">Sessions</a></li>
+<li><a href="cache/">Caching</a></li>
+<li><a href="i18n/">Internationalization</a></li>
+<li><a href="middleware/">Middleware</a></li>
+<li><a href="settings/">Settings files</a></li>
+<li><a href="url_dispatch/">URL configuration</a></li>
+<li><a href="request_response/">Request and response objects</a></li>
+<li><a href="generic_views/">Generic views</a></li>
+<li><a href="authentication/">Authentication</a></li>
+
+<li><a href="add_ons/">The django.contrib add-ons</a>
+ <ul>
+ <li><strong>New:</strong> <a href="databrowse/">Databrowse</a></li>
+ <li><a href="syndication_feeds/">Syndication feeds (RSS and Atom)</a>
(<code>django.contrib.syndication</code>)</li>
+ <li><a href="flatpages/">Flatpages</a>
(<code>django.contrib.flatpages</code>)</li>
+ <li><a href="redirects/">Redirects</a>
(<code>django.contrib.redirects</code>)</li>
+ <li><a href="sites/">Sites</a> (<code>django.contrib.sites</code>)</li>
+ <li><a href="sitemaps/">Sitemaps</a>
(<code>django.contrib.sitemaps</code>)</li>
+ </ul>
+</li>
+</ul>
+
+<h2>Deployment</h2>
+
+<ul>
+<li><a href="modpython/">Using Django with mod_python</a></li>
+<li><a href="fastcgi/">How to use Django with FastCGI, SCGI or AJP</a></li>
+</ul>
+
+<h2>Solving specific problems</h2>
+
+<ul>
+<li><a href="apache_auth/">Authenticating against Django's user database from
Apache</a></li>
+<li><a href="static_files/">Serving static/media files</a></li>
+<li><a href="email/">Sending e-mail</a></li>
+<li><a href="legacy_databases/">Integrating with (introspecting) a legacy
database</a></li>
+<li><a href="outputting_pdf/">Outputting PDFs dynamically</a></li>
+<li><a href="outputting_csv/">Outputting CSV dynamically</a></li>
+</ul>
+
+<h2>Et cetera</h2>
+<ul>
+<li><a href="design_philosophies/">Design philosophies</a></li>
+<li><a href="contributing/">How to contribute to Django</a></li>
+<li><a href="admin_css/">Django admin CSS guide</a></li>
+<li><a href="api_stability/">API stability</a></li>
+<li><a
href="http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges";>Backwards-incompatible
changes</a></li>
+</ul>
+
+<h2>Release notes</h2>
+<ul>
+<li><a href="release_notes_0.96/">Version 0.96</a></li>
+<li><a href="release_notes_0.95/">Version 0.95</a></li>
+</ul>
+{% endblock %}
+
+{% block content-related %}
+
+<h2>Search docs via Google</h2>
+<form action="http://www.google.com/search"; method="get">
+<p><input type="text" name="as_q" /> <input type="submit" value="Go" /></p>
+<input type="hidden" name="as_sitesearch" value="www.djangoproject.com" />
+</form>
+
+<h2>Getting help</h2>
+<ul class="toc">
+ <li><a href="irc://irc.freenode.net/django">#django IRC channel</a></li>
+ <li><a href="http://simon.bofh.ms/logger/django/";>#django IRC logs</a></li>
+ <li><a
href="http://groups-beta.google.com/group/django-users";>Django-users mailing
list</a></li>
+ <li><a
href="http://groups-beta.google.com/group/django-developers";>Django-developers
mailing list</a></li>
+ <li><a href="http://code.djangoproject.com/simpleticket";>Report a
bug</a></li>
+ <li><a href="/comments/">Recent comments posted to
djangoproject.com</a></li>
+</ul>
+
+{% endblock %}
Modified: djangoproject.com/django_website/templates/docs/detail.html
===================================================================
--- djangoproject.com/django_website/templates/docs/detail.html 2007-09-07
04:52:02 UTC (rev 6059)
+++ djangoproject.com/django_website/templates/docs/detail.html 2007-09-07
18:33:58 UTC (rev 6060)
@@ -39,4 +39,6 @@
{% block content-related %}
<h2>Contents</h2>
{{ doc.toc }}
+ <h3>Last update:</h3>
+ <div>{{ update_date|date:"F j, P" }}</div>
{% endblock %}
Modified: djangoproject.com/django_website/templates/docs/index.html
===================================================================
--- djangoproject.com/django_website/templates/docs/index.html 2007-09-07
04:52:02 UTC (rev 6059)
+++ djangoproject.com/django_website/templates/docs/index.html 2007-09-07
18:33:58 UTC (rev 6060)
@@ -18,7 +18,7 @@
<h2>The Django Book</h2>
-<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>
+<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>
<h2>The essential documentation</h2>
@@ -47,7 +47,7 @@
<li>Templates: <a href="templates/">Guide for HTML authors</a> | <a
href="templates_python/">Guide for Python programmers</a></li>
-<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>
+<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><a href="sessions/">Sessions</a></li>
<li><a href="cache/">Caching</a></li>
@@ -58,14 +58,17 @@
<li><a href="request_response/">Request and response objects</a></li>
<li><a href="generic_views/">Generic views</a></li>
<li><a href="authentication/">Authentication</a></li>
+<li><strong>New:</strong> <a href="unicode/">Unicode data in Django</a></li>
-<li><a href="add_ons/">Add-on applications (contrib)</a>
+<li><a href="add_ons/">The django.contrib add-ons</a>
<ul>
- <li><a href="syndication_feeds/">Syndication feeds (RSS and Atom)</a></li>
- <li><a href="flatpages/">Flatpages</a></li>
- <li><a href="redirects/">Redirects</a></li>
- <li><a href="sites/">Sites</a></li>
- <li><a href="sitemaps/">Sitemaps</a></li>
+ <li><strong>New:</strong> <a href="databrowse/">Databrowse</a></li>
+ <li><a href="syndication_feeds/">Syndication feeds (RSS and Atom)</a>
(<code>django.contrib.syndication</code>)</li>
+ <li><a href="flatpages/">Flatpages</a>
(<code>django.contrib.flatpages</code>)</li>
+ <li><a href="redirects/">Redirects</a>
(<code>django.contrib.redirects</code>)</li>
+ <li><a href="sites/">Sites</a> (<code>django.contrib.sites</code>)</li>
+ <li><a href="sitemaps/">Sitemaps</a>
(<code>django.contrib.sitemaps</code>)</li>
+ <li><strong>New:</strong> <a href="webdesign/">Web design helpers</a>
(<code>django.contrib.webdesign</code>)</li>
</ul>
</li>
</ul>
@@ -74,7 +77,7 @@
<ul>
<li><a href="modpython/">Using Django with mod_python</a></li>
-<li><a href="fastcgi/">Using Django with FastCGI</a></li>
+<li><a href="fastcgi/">How to use Django with FastCGI, SCGI or AJP</a></li>
</ul>
<h2>Solving specific problems</h2>
@@ -99,6 +102,7 @@
<h2>Release notes</h2>
<ul>
+<li><a href="release_notes_0.96/">Version 0.96</a></li>
<li><a href="release_notes_0.95/">Version 0.95</a></li>
</ul>
{% endblock %}
Modified: djangoproject.com/django_website/templates/docs/model_index.html
===================================================================
--- djangoproject.com/django_website/templates/docs/model_index.html
2007-09-07 04:52:02 UTC (rev 6059)
+++ djangoproject.com/django_website/templates/docs/model_index.html
2007-09-07 18:33:58 UTC (rev 6060)
@@ -8,7 +8,7 @@
These examples are from Django's SVN release, which can be
significantly different than previous releases. Get old examples here:
{% for r in all_versions %}
- <a href="{{ r.version }}/models/">{{ r.version }}</a>{% if forloop.last
%}.{% else %},{% endif %}
+ <a href="../{{ r.version }}/models/">{{ r.version }}</a>{% if
forloop.last %}.{% else %},{% endif %}
{% endfor %}
{% else %}
These examples are from Django version {{ version }}. For current
documentation,
@@ -23,4 +23,4 @@
<li><a href="{{ ex.link }}/">{{ ex.title }}</a></li>
{% endfor %}
</ol>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
Modified: djangoproject.com/django_website/templates/flatfiles/download.html
===================================================================
--- djangoproject.com/django_website/templates/flatfiles/download.html
2007-09-07 04:52:02 UTC (rev 6059)
+++ djangoproject.com/django_website/templates/flatfiles/download.html
2007-09-07 18:33:58 UTC (rev 6060)
@@ -9,12 +9,13 @@
{% block content-related %}
<h2>For the impatient:</h2>
<ul>
- <li>Download the latest release: <a
href="http://www.djangoproject.com/download/0.95.1/tarball/";>Django-0.95.1.tar.gz</a>.</li>
+ <li>Download the latest release: <a
href="http://www.djangoproject.com/download/0.96/tarball/";>Django-0.96.tar.gz</a>.</li>
</ul>
<h2>Which version is better?</h2>
-<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>
+<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>
+<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.1: <a
href="http://www.djangoproject.com/download/0.95.1/tarball/";>tarball</a></li>
Modified: djangoproject.com/django_website/templates/flatfiles/homepage.html
===================================================================
--- djangoproject.com/django_website/templates/flatfiles/homepage.html
2007-09-07 04:52:02 UTC (rev 6059)
+++ djangoproject.com/django_website/templates/flatfiles/homepage.html
2007-09-07 18:33:58 UTC (rev 6060)
@@ -35,7 +35,7 @@
<h2>Download</h2>
<ul class="linklist">
- <li class="button-download"><a href="/download/">Latest release:
<strong>0.95.1</strong></a></li>
+ <li class="button-download"><a href="/download/">Latest release:
<strong>0.96</strong></a></li>
</ul>
<p>Open source, <a
href="http://code.djangoproject.com/browser/django/trunk/LICENSE";>BSD
license</a></p>
<h2>Documentation</h2>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
