Author: jacob
Date: 2007-10-18 15:06:31 -0500 (Thu, 18 Oct 2007)
New Revision: 6526
Added:
djangoproject.com/django_website/crontab
djangoproject.com/static/
Modified:
djangoproject.com/
djangoproject.com/django_website/apps/docs/views.py
djangoproject.com/django_website/settings.py
djangoproject.com/django_website/templates/base.html
djangoproject.com/django_website/templates/blog/entry_archive.html
djangoproject.com/django_website/templates/blog/entry_detail.html
djangoproject.com/django_website/templates/comments/freecomment_list.html
djangoproject.com/django_website/templates/docs/0.96_index.html
djangoproject.com/django_website/templates/docs/detail.html
djangoproject.com/django_website/templates/docs/index.html
djangoproject.com/django_website/templates/docs/model_detail.html
djangoproject.com/django_website/templates/docs/model_index.html
djangoproject.com/django_website/templates/flatfiles/homepage.html
Log:
[django-website] checked in changes to django website since, um, last time.
Property changes on: djangoproject.com
___________________________________________________________________
Name: svn:ignore
+ *.pyc
Modified: djangoproject.com/django_website/apps/docs/views.py
===================================================================
--- djangoproject.com/django_website/apps/docs/views.py 2007-10-16 16:54:23 UTC
(rev 6525)
+++ djangoproject.com/django_website/apps/docs/views.py 2007-10-18 20:06:31 UTC
(rev 6526)
@@ -65,7 +65,7 @@
try:
title, blurb =
docstring_re.match(content).group(2).strip().split('\n', 1)
- except AttributeError:
+ except (AttributeError, ValueError):
continue # Skip models that don't have docstrings.
try:
Added: djangoproject.com/django_website/crontab
===================================================================
--- djangoproject.com/django_website/crontab (rev 0)
+++ djangoproject.com/django_website/crontab 2007-10-18 20:06:31 UTC (rev
6526)
@@ -0,0 +1,6 @@
+# Crontab for djangoproject.com.
+# Symlink into /etc/cron.d/
+
+PYTHONPATH=/home/djangoproject.com/
+DJANGO_SETTINGS_MODULE=django_website.settings
+15,45 * * * * root python
/home/djangoproject.com/django_website/apps/aggregator/bin/update_feeds.py
Modified: djangoproject.com/django_website/settings.py
===================================================================
--- djangoproject.com/django_website/settings.py 2007-10-16 16:54:23 UTC
(rev 6525)
+++ djangoproject.com/django_website/settings.py 2007-10-18 20:06:31 UTC
(rev 6526)
@@ -1,7 +1,7 @@
import os, platform
# Far too clever trick to know if we're running on the deployment server.
-DEVELOPMENT_MODE = ("servers.ljworld.com" not in platform.node())
+DEVELOPMENT_MODE = (platform.node() != "djangoproject")
ADMINS = (('Adrian Holovaty','[EMAIL PROTECTED]'), ('Jacob Kaplan-Moss',
'[EMAIL PROTECTED]'))
TIME_ZONE = 'America/Chicago'
@@ -9,25 +9,21 @@
SERVER_EMAIL = '[EMAIL PROTECTED]'
MANAGERS = (('Wilson Miner','[EMAIL PROTECTED]'),)
+DATABASE_ENGINE = 'postgresql_psycopg2'
+DATABASE_NAME = 'djangoproject'
+TEMPLATE_DIRS = [os.path.join(os.path.dirname(__file__), "templates")]
+
if DEVELOPMENT_MODE:
DEBUG = True
PREPEND_WWW = False
- DATABASE_ENGINE = 'postgresql_psycopg2'
- DATABASE_NAME = 'djangoproject'
CACHE_BACKEND = "file:///tmp/djangoprojectcache/"
- TEMPLATE_DIRS = [os.path.join(os.path.dirname(__file__), "templates")]
DJANGO_SVN_ROOT = "http://code.djangoproject.com/svn/django/";
else:
DEBUG = False
PREPEND_WWW = True
- DATABASE_ENGINE = 'postgresql'
- DATABASE_NAME = 'djangoproject'
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/']
+ TEMPLATE_DIRS = ['/home/djangoproject.com/django_website/templates']
DJANGO_SVN_ROOT = "file:///home/svn/django/django/"
SITE_ID = 1
@@ -57,14 +53,17 @@
DJANGO_DOCUMENT_ROOT_PATH = "/home/html/djangoproject.com/docs/"
DJANGO_TESTS_PATH = "/home/html/djangoproject.com/tests/"
-CACHE_MIDDLEWARE_SECONDS = 60 * 60 * 1 # 1 hour
+CACHE_MIDDLEWARE_SECONDS = 60 * 5 # 5 minutes
CACHE_MIDDLEWARE_KEY_PREFIX = 'djangoproject'
CACHE_MIDDLEWARE_GZIP = True
+CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True
MIDDLEWARE_CLASSES = (
+ 'django.middleware.http.SetRemoteAddrFromForwardedFor',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.middleware.common.CommonMiddleware',
+ 'django.middleware.cache.CacheMiddleware',
'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
'django.contrib.redirects.middleware.RedirectFallbackMiddleware',
)
@@ -74,8 +73,10 @@
)
USE_I18N = False
+DEFAULT_FROM_EMAIL = "[EMAIL PROTECTED]"
+
# django-registration settings
ACCOUNT_ACTIVATION_DAYS = 3
# comment_utils settings
-AKISMET_API_KEY = "c892e4962244"
\ No newline at end of file
+AKISMET_API_KEY = "c892e4962244"
Modified: djangoproject.com/django_website/templates/base.html
===================================================================
--- djangoproject.com/django_website/templates/base.html 2007-10-16
16:54:23 UTC (rev 6525)
+++ djangoproject.com/django_website/templates/base.html 2007-10-18
20:06:31 UTC (rev 6526)
@@ -46,8 +46,10 @@
</div>
<!-- END #content -->
<div id="footer">
- <p>© 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.</p>
- </div>
+ <p>© 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.
+ Hosting graciously provided by <a href="http://mediatemple.net/";>
+ <img style="vertical-align: middle; position: relative; top:
-1px;" src="http://media.djangoproject.com/img/site/mt.png"; alt="media
temple"></a>
+ </p>
</div>
<!-- END #container -->
</body>
Modified: djangoproject.com/django_website/templates/blog/entry_archive.html
===================================================================
--- djangoproject.com/django_website/templates/blog/entry_archive.html
2007-10-16 16:54:23 UTC (rev 6525)
+++ djangoproject.com/django_website/templates/blog/entry_archive.html
2007-10-18 20:06:31 UTC (rev 6526)
@@ -7,10 +7,9 @@
<h1>Latest entries</h1>
{% for object in latest %}
- {% get_public_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>
+ <p class="date small">Posted by <strong>{{ object.author }}</strong> on {{
object.pub_date|date:"F j, Y" }}</p>
{% endfor %}
{% endblock %}
Modified: djangoproject.com/django_website/templates/blog/entry_detail.html
===================================================================
--- djangoproject.com/django_website/templates/blog/entry_detail.html
2007-10-16 16:54:23 UTC (rev 6525)
+++ djangoproject.com/django_website/templates/blog/entry_detail.html
2007-10-18 20:06:31 UTC (rev 6526)
@@ -21,11 +21,11 @@
</div>
{% endfor %}
-<h2>Comments are closed</h2>
-
{% if object.comments_enabled %}
+<h2>Post a comment</h2>
{% free_comment_form for blog.entry object.id %}
{% else %}
+<h2>Comments are closed</h2>
<p>To prevent spam, comments are no longer allowed after sixty days.</p>
{% endif %}
</div>
Modified:
djangoproject.com/django_website/templates/comments/freecomment_list.html
===================================================================
--- djangoproject.com/django_website/templates/comments/freecomment_list.html
2007-10-16 16:54:23 UTC (rev 6525)
+++ djangoproject.com/django_website/templates/comments/freecomment_list.html
2007-10-18 20:06:31 UTC (rev 6526)
@@ -29,7 +29,7 @@
{{ comment.submit_date|date:"F j, Y" }} at {{
comment.submit_date|date:"P" }}
</span>
</a>
- {% if perms.comments.delete_freecomment %}
+ {% if perms.comments %}
<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/">
Modified: djangoproject.com/django_website/templates/docs/0.96_index.html
===================================================================
--- djangoproject.com/django_website/templates/docs/0.96_index.html
2007-10-16 16:54:23 UTC (rev 6525)
+++ djangoproject.com/django_website/templates/docs/0.96_index.html
2007-10-18 20:06:31 UTC (rev 6526)
@@ -6,7 +6,7 @@
<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:
+ significantly different from previous releases. Get old docs here:
{% for r in all_versions %}
<a href="{{ r.version }}/">{{ r.version }}</a>{% if forloop.last %}.{%
else %},{% endif %}
{% endfor %}
Modified: djangoproject.com/django_website/templates/docs/detail.html
===================================================================
--- djangoproject.com/django_website/templates/docs/detail.html 2007-10-16
16:54:23 UTC (rev 6525)
+++ djangoproject.com/django_website/templates/docs/detail.html 2007-10-18
20:06:31 UTC (rev 6526)
@@ -8,7 +8,7 @@
<h2 class="deck">
{% ifequal version "trunk" %}
This document is for Django's SVN release, which can be
- significantly different than previous releases. Get old docs here:
+ significantly different from previous releases. Get old docs here:
{% for r in all_versions %}
<a href="../{{ r.version }}/{{ slug }}/">{{ r.version }}</a>{% if
forloop.last %}.{% else %},{% endif %}
{% endfor %}
Modified: djangoproject.com/django_website/templates/docs/index.html
===================================================================
--- djangoproject.com/django_website/templates/docs/index.html 2007-10-16
16:54:23 UTC (rev 6525)
+++ djangoproject.com/django_website/templates/docs/index.html 2007-10-18
20:06:31 UTC (rev 6526)
@@ -6,7 +6,7 @@
<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:
+ significantly different from previous releases. Get old docs here:
{% for r in all_versions %}
<a href="{{ r.version }}/">{{ r.version }}</a>{% if forloop.last %}.{%
else %},{% endif %}
{% endfor %}
@@ -65,6 +65,7 @@
<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><strong>New:</strong> <a href="form_preview/">Form preview</a></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>
Modified: djangoproject.com/django_website/templates/docs/model_detail.html
===================================================================
--- djangoproject.com/django_website/templates/docs/model_detail.html
2007-10-16 16:54:23 UTC (rev 6525)
+++ djangoproject.com/django_website/templates/docs/model_detail.html
2007-10-18 20:06:31 UTC (rev 6526)
@@ -8,7 +8,7 @@
<h2 class="deck">
{% ifequal version "trunk" %}
This example is for Django's SVN release, which can be
- significantly different than previous releases. Get old examples here:
+ significantly different from previous releases. Get old examples here:
{% for r in all_versions %}
<a href="/documentation/{{ r.version }}/models/{{ slug }}/">{{ r.version
}}</a>{% if forloop.last %}.{% else %},{% endif %}
{% endfor %}
Modified: djangoproject.com/django_website/templates/docs/model_index.html
===================================================================
--- djangoproject.com/django_website/templates/docs/model_index.html
2007-10-16 16:54:23 UTC (rev 6525)
+++ djangoproject.com/django_website/templates/docs/model_index.html
2007-10-18 20:06:31 UTC (rev 6526)
@@ -6,7 +6,7 @@
<h2 class="deck">
{% ifequal version "trunk" %}
These examples are from Django's SVN release, which can be
- significantly different than previous releases. Get old examples here:
+ significantly different from previous releases. Get old examples here:
{% for r in all_versions %}
<a href="../{{ r.version }}/models/">{{ r.version }}</a>{% if
forloop.last %}.{% else %},{% endif %}
{% endfor %}
Modified: djangoproject.com/django_website/templates/flatfiles/homepage.html
===================================================================
--- djangoproject.com/django_website/templates/flatfiles/homepage.html
2007-10-16 16:54:23 UTC (rev 6525)
+++ djangoproject.com/django_website/templates/flatfiles/homepage.html
2007-10-18 20:06:31 UTC (rev 6526)
@@ -74,7 +74,6 @@
{% get_latest_blog_entries 4 as latest_entries %}
{% for latest_entry in latest_entries %}
- {% get_public_free_comment_count for blog.entry latest_entry.id as
comment_count %}
<h3><a href="{{ latest_entry.get_absolute_url }}">{{ latest_entry.headline
}}</a></h3>
<p class="date">by <strong>{{ latest_entry.author }}</strong> on {{
latest_entry.pub_date|date:"M. j, Y" }}</p>
{{ latest_entry.summary }}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
![http://media.djangoproject.com/img/site/mt.png"](https://media.djangoproject.com/img/site/mt.png"){kind=link}