Django

Code

Changeset 7895

Show
Ignore:
Timestamp:
07/11/08 13:06:48 (4 months ago)
Author:
jacob
Message:

[djangoproject.com] Added a foundation contact form.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r6526 r7895  
    1212import pysvn 
    1313 
     14REVISION = pysvn.Revision(pysvn.opt_revision_kind.head) 
     15 
    1416def doc_index(request, version=None): 
    1517    client, version, docroot = _get_svnroot(version, "docs/") 
    16     doclist = client.ls(docroot, recurse=False) 
     18    doclist = client.ls(docroot, recurse=False, revision=REVISION) 
    1719     
    1820    # Convert list of URLs to list of document slugs. 
    …… 
    3133    docpath = urlparse.urljoin(docroot, slug+".txt") 
    3234    try: 
    33         name, info = client.info2(docpath)[0] 
     35        name, info = client.info2(docpath, revision=REVISION)[0] 
    3436    except pysvn.ClientError: 
    3537        raise Http404("Invalid doc: %r (version %r)" % (slug, version)) 
    …… 
    3840    parts = cache.get(cache_key) 
    3941    if parts is None: 
    40         parts = builder.build_document(client.cat(docpath)) 
     42        parts = builder.build_document(client.cat(docpath, revision=REVISION)) 
    4143        cache.set(cache_key, parts, 60*60) 
    4244     
    …… 
    5860    model_docs = cache.get(cache_key, []) 
    5961    if not model_docs: 
    60         for testdir in client.ls(testroot): 
     62        for testdir in client.ls(testroot, revision=REVISION): 
    6163            try: 
    62                 content = client.cat(os.path.join(testdir.name, "models.py")) 
     64                content = client.cat(os.path.join(testdir.name, "models.py"), revision=REVISION) 
    6365            except pysvn.ClientError: 
    6466                continue 
    …… 
    8890def model_detail(request, slug, version=None): 
    8991    client, version, modelfile = _get_svnroot(version, "tests/modeltests/%s/models.py" % slug) 
    90     name, info = client.info2(modelfile)[0] 
     92    name, info = client.info2(modelfile, revision=REVISION)[0] 
    9193     
    9294    cache_key = "djangowebsite:docs:model:%s:%s:%s" % (version, slug, info.rev.number) 
    9395    parts = cache.get(cache_key) 
    9496    if parts is None: 
    95         parts = builder.build_model_document(client.cat(modelfile)) 
     97        parts = builder.build_model_document(client.cat(modelfile, revision=REVISION)) 
    9698        cache.set(cache_key, parts, 60*60) 
    9799         
    …… 
    113115 
    114116    try: 
    115         client.info2(docroot, recurse=False) 
     117        client.info2(docroot, recurse=False, revision=REVISION) 
    116118    except pysvn.ClientError: 
    117119        raise Http404("Bad SVN path: %s" % docroot) 

  • djangoproject.com/django_website/settings.py

    r6526 r7895  
    44DEVELOPMENT_MODE = (platform.node() != "djangoproject") 
    55 
    6 ADMINS = (('Adrian Holovaty','holovaty@gmail.com'), ('Jacob Kaplan-Moss', 'jacob@lawrence.com')) 
     6ADMINS = (('Adrian Holovaty','holovaty@gmail.com'), ('Jacob Kaplan-Moss', 'jacob@jacobian.org')) 
    77TIME_ZONE = 'America/Chicago' 
    88 
    …… 
    1717    DEBUG = True 
    1818    PREPEND_WWW = False 
    19     CACHE_BACKEND = "file:///tmp/djangoprojectcache/" 
     19    CACHE_BACKEND = "dummy:///" 
    2020    DJANGO_SVN_ROOT = "http://code.djangoproject.com/svn/django/" 
    2121else: 

  • djangoproject.com/django_website/templates/flatpages/foundation.html

    r7892 r7895  
    1 {% extends "base_community.html" %} 
     1{% extends "base_foundation.html" %} 
    22 
    3 {% block title %}Foundation{% endblock %} 
     3{% block extrahead %} 
     4<style type="text/css" media="screen"> 
     5  form #submit {  
     6      border: 0px none;  
     7      background-color: transparent; 
     8      color: transparent; 
     9      background-image: url(https://checkout.google.com/buttons/donateNow.gif?merchant_id=404630304217012&w=115&h=50&style=trans&variant=text&loc=en_US); 
     10      background-position: 0px 3px; 
     11      width: 115px; 
     12      height: 35px; 
     13  } 
     14</style> 
     15{% endblock %} 
     16 
     17{% block title %}{{ flatpage.title }}{% endblock %} 
    418 
    519{% block content %} 
    …… 
    721{{ flatpage.content }} 
    822{% endblock %} 
    9  
    10 {% block content-related %}{% endblock %} 

  • djangoproject.com/django_website/urls.py

    r7369 r7895  
    3737    (r'^comments/', include('django.contrib.comments.urls.comments')), 
    3838    (r'^community/$', 'django.views.generic.list_detail.object_list', aggregator_info_dict), 
     39    (r'^contact/', include('django_website.apps.contact.urls')), 
    3940    (r'^documentation/', include('django_website.apps.docs.urls')), 
    4041    (r'^r/', include('django.conf.urls.shortcut')),