Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[website] checked in some outstanding template changes.

git-svn-id: http://code.djangoproject.com/svn/djangoproject.com@7369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit cf80da15e86206353ae0fc6704be8d4a22981e93 1 parent f09da0a
jacob authored
View
6 django_website/apps/accounts/urls.py
@@ -1,13 +1,13 @@
from django.conf.urls.defaults import *
from django.views.generic.simple import direct_to_template
-from django_website.apps.accounts.forms import RegistrationForm
+from registration.forms import RegistrationFormUniqueEmail
urlpatterns = patterns('',
url(
r'^register/$',
"registration.views.register",
- {'form_class': RegistrationForm},
+ {'form_class': RegistrationFormUniqueEmail},
name='registration_register',
),
(r'', include('registration.urls')),
-)
+)
View
2  django_website/apps/blog/urls.py
@@ -7,7 +7,7 @@
}
urlpatterns = patterns('django.views.generic.date_based',
- (r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/(?P<slug>\w+)/$', 'object_detail', dict(info_dict, slug_field='slug')),
+ (r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/(?P<slug>[\w-]+)/$', 'object_detail', dict(info_dict, slug_field='slug')),
(r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/$', 'archive_day', info_dict),
(r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$', 'archive_month', info_dict),
(r'^(?P<year>\d{4})/$', 'archive_year', info_dict),
View
4 django_website/templates/base_weblog.html
@@ -13,6 +13,10 @@
{% block content-related %}
<h2>Archives</h2>
<ul class="linklist">
+ <li><a href="/weblog/2007/nov/">November 2007</a></li>
+ <li><a href="/weblog/2007/oct/">October 2007</a></li>
+ <li><a href="/weblog/2007/sep/">September 2007</a></li>
+ <li><a href="/weblog/2007/aug/">August 2007</a></li>
<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>
View
7 django_website/templates/docs/index.html
@@ -18,7 +18,7 @@ <h2 class="deck">
<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>
+<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>
<h2>The essential documentation</h2>
@@ -58,15 +58,18 @@ <h2 id="reference">Reference</h2>
<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="shortcuts/">Shortcut functions</a></li>
<li><strong>New:</strong> <a href="unicode/">Unicode data in Django</a></li>
+<li><strong>New:</strong> <a href="pagination/">Pagination</a></li>
<li><a href="add_ons/">The django.contrib add-ons</a>
<ul>
<li><a href="contenttypes/">Contenttypes Framework</a> (<code>django.contrib.contenttypes</code>)</li>
<li><a href="csrf/">Cross Site Request Forgery protection</a> (<code>django.contrib.csrf</code>)</li>
- <li><strong>New:</strong> <a href="databrowse/">Databrowse</a> (<code>django.contrib.databrowse</code>)</li>
+ <li><a href="databrowse/">Databrowse</a> (<code>django.contrib.databrowse</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> (<code>django.contrib.formtools</code>)</li>
+ <li><strong>New:</strong> <a href="form_wizard/">Form wizard</a> (<code>django.contrib.formtools.wizard</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>
View
2  django_website/templates/flatfiles/homepage.html
@@ -51,7 +51,7 @@ <h2 class="deck">Django is a high-level Python Web framework that encourages rap
<dl>
<dt><a href="http://www.lawrence.com/">lawrence.com</a></dt>
<dd>An internationally renowned local-entertainment site with events, stories, bands, drink specials and more.</dd>
- <dt><a href="http://code.djangoproject.com/wiki/DjangoPoweredSites#Sites/featuresatTheWashingtonPost">washingtonpost.com</a></dt>
+ <dt><a href="http://projects.washingtonpost.com/congress/">washingtonpost.com</a></dt>
<dd>The Washington Post's growing selection of innovative Web database applications.</dd>
<dt><a href="http://www.everyblock.com/">EveryBlock</a></dt>
<dd>A news feed for your block.</dd>
View
4 django_website/templates/registration/activation_email.txt
@@ -1,6 +1,6 @@
{% load humanize %}
Someone, hopefully you, signed up for a new account at {{ site_url }} using this email address. If it was you, and you'd like to activate and use your account, click the link below or copy and paste it into your web browser's address bar:
-{{ site_url }}accounts/activate/{{ activation_key }}/
+http://www.djangoproject.com/accounts/activate/{{ activation_key }}/
-If you didn't request this, you don't need to do anything; you won't receive any more email from us, and the account will expire automatically in {{ expiration_days|apnumber }} days.
+If you didn't request this, you don't need to do anything; you won't receive any more email from us, and the account will expire automatically in {{ expiration_days|apnumber }} days.
View
1  django_website/templates/registration/activation_email_subject.txt
@@ -0,0 +1 @@
+Activate your djangoproject.com account
View
2  django_website/templates/registration/registration_form.html
@@ -5,7 +5,7 @@
{% block content %}
{% if form.errors %}
- <p class="error">Please correct the errors below:</p>
+ <p class="error">Please correct the errors below: {{ form.non_field_errors }}</p>
{% endif %}
<h1>Create an account</h1>
View
2  django_website/urls.py
@@ -30,13 +30,13 @@
}
urlpatterns = patterns('',
+ (r'freenode\.9xJY7YIUWtwn\.html', 'django.views.generic.simple.direct_to_template', {'template': 'freenode_tmp.html'}),
(r'^accounts/', include('django_website.apps.accounts.urls')),
(r'^admin/', include('django.contrib.admin.urls')),
(r'^comments/$', 'django.views.generic.list_detail.object_list', comments_info_dict),
(r'^comments/', include('django.contrib.comments.urls.comments')),
(r'^community/$', 'django.views.generic.list_detail.object_list', aggregator_info_dict),
(r'^documentation/', include('django_website.apps.docs.urls')),
- (r'^password_reset/', include('django.conf.urls.admin_password_reset')),
(r'^r/', include('django.conf.urls.shortcut')),
(r'^rss/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
(r'^sitemap.xml$', cache_page(sitemap_views.sitemap, 60 * 60 * 6), {'sitemaps': sitemaps}),
View
BIN  static/favicon.ico
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.