Django

Code

Changeset 7369

Show
Ignore:
Timestamp:
03/27/08 09:23:58 (6 months ago)
Author:
jacob
Message:

[website] checked in some outstanding template changes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • djangoproject.com

    • Property svn:externals changed from
      django -r6063 http://code.djangoproject.com/svn/django/trunk/django/
      registration -r87 http://django-registration.googlecode.com/svn/trunk/registration/
      comment_utils -r78 http://django-comment-utils.googlecode.com/svn/trunk/comment_utils/
       to
      django -r6063 http://code.djangoproject.com/svn/django/trunk/django/
      registration -r139 http://django-registration.googlecode.com/svn/trunk/registration/
      comment_utils -r78 http://django-comment-utils.googlecode.com/svn/trunk/comment_utils/

  • djangoproject.com/django_website/apps/accounts/urls.py

    r6064 r7369  
    11from django.conf.urls.defaults import * 
    22from django.views.generic.simple import direct_to_template 
    3 from django_website.apps.accounts.forms import RegistrationForm 
     3from registration.forms import RegistrationFormUniqueEmail 
    44 
    55urlpatterns = patterns('', 
    …… 
    77        r'^register/$',  
    88        "registration.views.register",  
    9         {'form_class': RegistrationForm}, 
     9        {'form_class': RegistrationFormUniqueEmail}, 
    1010        name='registration_register', 
    1111    ), 

  • djangoproject.com/django_website/apps/blog/urls.py

    r3008 r7369  
    88 
    99urlpatterns = patterns('django.views.generic.date_based', 
    10    (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')), 
     10   (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')), 
    1111   (r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/$', 'archive_day', info_dict), 
    1212   (r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$', 'archive_month', info_dict), 

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

    r6060 r7369  
    1414<h2>Archives</h2> 
    1515<ul class="linklist"> 
     16    <li><a href="/weblog/2007/nov/">November 2007</a></li> 
     17    <li><a href="/weblog/2007/oct/">October 2007</a></li> 
     18    <li><a href="/weblog/2007/sep/">September 2007</a></li> 
     19    <li><a href="/weblog/2007/aug/">August 2007</a></li> 
    1620    <li><a href="/weblog/2007/jul/">July 2007</a></li> 
    1721    <li><a href="/weblog/2007/jun/">June 2007</a></li> 

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

    r6758 r7369  
    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.96.</p> 
     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> 
    2222 
    2323<h2>The essential documentation</h2> 
    …… 
    5959<li><a href="generic_views/">Generic views</a></li> 
    6060<li><a href="authentication/">Authentication</a></li> 
     61<li><a href="shortcuts/">Shortcut functions</a></li> 
    6162<li><strong>New:</strong> <a href="unicode/">Unicode data in Django</a></li> 
     63<li><strong>New:</strong> <a href="pagination/">Pagination</a></li> 
    6264 
    6365<li><a href="add_ons/">The django.contrib add-ons</a> 
    …… 
    6567    <li><a href="contenttypes/">Contenttypes Framework</a> (<code>django.contrib.contenttypes</code>)</li> 
    6668    <li><a href="csrf/">Cross Site Request Forgery protection</a> (<code>django.contrib.csrf</code>)</li> 
    67     <li><strong>New:</strong> <a href="databrowse/">Databrowse</a> (<code>django.contrib.databrowse</code>)</li> 
     69    <li><a href="databrowse/">Databrowse</a> (<code>django.contrib.databrowse</code>)</li> 
    6870    <li><a href="flatpages/">Flatpages</a> (<code>django.contrib.flatpages</code>)</li> 
    6971    <li><strong>New:</strong> <a href="form_preview/">Form preview</a> (<code>django.contrib.formtools</code>)</li> 
     72    <li><strong>New:</strong> <a href="form_wizard/">Form wizard</a> (<code>django.contrib.formtools.wizard</code>)</li> 
    7073    <li><a href="redirects/">Redirects</a> (<code>django.contrib.redirects</code>)</li> 
    7174    <li><a href="sites/">Sites</a> (<code>django.contrib.sites</code>)</li> 

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

    r7319 r7369  
    5252    <dt><a href="http://www.lawrence.com/">lawrence.com</a></dt> 
    5353    <dd>An internationally renowned local-entertainment site with events, stories, bands, drink specials and more.</dd> 
    54     <dt><a href="http://code.djangoproject.com/wiki/DjangoPoweredSites#Sites/featuresatTheWashingtonPost">washingtonpost.com</a></dt> 
     54    <dt><a href="http://projects.washingtonpost.com/congress/">washingtonpost.com</a></dt> 
    5555    <dd>The Washington Post's growing selection of innovative Web database applications.</dd> 
    5656        <dt><a href="http://www.everyblock.com/">EveryBlock</a></dt> 

  • djangoproject.com/django_website/templates/registration/activation_email.txt

    r6064 r7369  
    22Someone, 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: 
    33 
    4 {{ site_url }}accounts/activate/{{ activation_key }}/ 
     4http://www.djangoproject.com/accounts/activate/{{ activation_key }}/ 
    55 
    66If 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. 

  • djangoproject.com/django_website/templates/registration/registration_form.html

    r6759 r7369  
    66 
    77  {% if form.errors %} 
    8   <p class="error">Please correct the errors below:</p> 
     8  <p class="error">Please correct the errors below: {{ form.non_field_errors }}</p> 
    99  {% endif %} 
    1010 

  • djangoproject.com/django_website/urls.py

    r6472 r7369  
    3131 
    3232urlpatterns = patterns('', 
     33    (r'freenode\.9xJY7YIUWtwn\.html', 'django.views.generic.simple.direct_to_template', {'template': 'freenode_tmp.html'}), 
    3334    (r'^accounts/', include('django_website.apps.accounts.urls')), 
    3435    (r'^admin/', include('django.contrib.admin.urls')), 
    …… 
    3738    (r'^community/$', 'django.views.generic.list_detail.object_list', aggregator_info_dict), 
    3839    (r'^documentation/', include('django_website.apps.docs.urls')), 
    39     (r'^password_reset/', include('django.conf.urls.admin_password_reset')), 
    4040    (r'^r/', include('django.conf.urls.shortcut')), 
    4141    (r'^rss/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),