Django

Code

Changeset 1833

Show
Ignore:
Timestamp:
01/06/06 13:53:55 (3 years ago)
Author:
jacob
Message:

Removed ellington cruft from admin urlconf.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/magic-removal/django/contrib/admin/urls/admin.py

    r1736 r1833  
    11from django.conf.urls.defaults import * 
    2 from django.conf.settings import INSTALLED_APPS 
    32 
    4 urlpatterns = ( 
     3urlpatterns = patterns('', 
    54    ('^$', 'django.contrib.admin.views.main.index'), 
    65    ('^jsi18n/$', 'django.views.i18n.javascript_catalog', {'packages': 'django.conf'}), 
     
    2221#    ('^doc/templates/$', 'django.views.admin.doc.template_index'), 
    2322    ('^doc/templates/(?P<template>.*)/$', 'django.contrib.admin.views.doc.template_detail'), 
    24 ) 
    25  
    26 if 'ellington.events' in INSTALLED_APPS: 
    27     urlpatterns += ( 
    28         ("^events/usersubmittedevents/(?P<object_id>\d+)/$", 'ellington.events.views.admin.user_submitted_event_change_stage'), 
    29         ("^events/usersubmittedevents/(?P<object_id>\d+)/delete/$", 'ellington.events.views.admin.user_submitted_event_delete_stage'), 
    30     ) 
    31  
    32 if 'ellington.news' in INSTALLED_APPS: 
    33     urlpatterns += ( 
    34         ("^stories/preview/$", 'ellington.news.views.admin.story_preview'), 
    35         ("^stories/js/inlinecontrols/$", 'ellington.news.views.admin.inlinecontrols_js'), 
    36         ("^stories/js/inlinecontrols/(?P<label>[-\w]+)/$", 'ellington.news.views.admin.inlinecontrols_js_specific'), 
    37     ) 
    38  
    39 if 'ellington.alerts' in INSTALLED_APPS: 
    40     urlpatterns += ( 
    41         ("^alerts/send/$", 'ellington.alerts.views.admin.send_alert_form'), 
    42         ("^alerts/send/do/$", 'ellington.alerts.views.admin.send_alert_action'), 
    43     ) 
    44  
    45 if 'ellington.media' in INSTALLED_APPS: 
    46     urlpatterns += ( 
    47         ('^media/photos/caption/(?P<photo_id>\d+)/$', 'ellington.media.views.admin.get_exif_caption'), 
    48     ) 
    49  
    50 urlpatterns += ( 
    5123    ('^((?:[^/]+/)+?)add/$', 'django.contrib.admin.views.stages.add.add_stage'), 
    5224    ('^((?:[^/]+/)+?)([^/]+)/history/$', 'django.contrib.admin.views.main.history'), 
     
    5527    ('^((?:[^/]+/)+?)$', 'django.contrib.admin.views.changelist.change_list' ), 
    5628) 
    57 urlpatterns = patterns('', *urlpatterns)