diff options
| -rw-r--r-- | django/conf/project_template/urls.py | 5 | ||||
| -rw-r--r-- | django/contrib/admin/urls.py | 12 | ||||
| -rw-r--r-- | django/contrib/admindocs/__init__.py | 0 | ||||
| -rw-r--r-- | django/contrib/admindocs/urls.py | 15 | ||||
| -rw-r--r-- | django/contrib/admindocs/views.py (renamed from django/contrib/admin/views/doc.py) | 0 |
5 files changed, 19 insertions, 13 deletions
diff --git a/django/conf/project_template/urls.py b/django/conf/project_template/urls.py index 402dd6536b..661b3e1f0f 100644 --- a/django/conf/project_template/urls.py +++ b/django/conf/project_template/urls.py @@ -4,6 +4,9 @@ urlpatterns = patterns('', # Example: # (r'^{{ project_name }}/', include('{{ project_name }}.foo.urls')), + # Uncomment this for admin docs: + #(r'^admin/doc/', include('django.contrib.admindocs.urls')), + # Uncomment this for admin: -# (r'^admin/', include('django.contrib.admin.urls')), + #(r'^admin/', include('django.contrib.admin.urls')), ) diff --git a/django/contrib/admin/urls.py b/django/contrib/admin/urls.py index 5f9638c63f..0dcf8f3221 100644 --- a/django/contrib/admin/urls.py +++ b/django/contrib/admin/urls.py @@ -15,18 +15,6 @@ urlpatterns = patterns('', ('^password_change/done/$', 'django.contrib.auth.views.password_change_done'), ('^template_validator/$', 'django.contrib.admin.views.template.template_validator'), - # Documentation - ('^doc/$', 'django.contrib.admin.views.doc.doc_index'), - ('^doc/bookmarklets/$', 'django.contrib.admin.views.doc.bookmarklets'), - ('^doc/tags/$', 'django.contrib.admin.views.doc.template_tag_index'), - ('^doc/filters/$', 'django.contrib.admin.views.doc.template_filter_index'), - ('^doc/views/$', 'django.contrib.admin.views.doc.view_index'), - ('^doc/views/(?P<view>[^/]+)/$', 'django.contrib.admin.views.doc.view_detail'), - ('^doc/models/$', 'django.contrib.admin.views.doc.model_index'), - ('^doc/models/(?P<app_label>[^\.]+)\.(?P<model_name>[^/]+)/$', 'django.contrib.admin.views.doc.model_detail'), -# ('^doc/templates/$', 'django.views.admin.doc.template_index'), - ('^doc/templates/(?P<template>.*)/$', 'django.contrib.admin.views.doc.template_detail'), - # "Add user" -- a special-case view ('^auth/user/add/$', 'django.contrib.admin.views.auth.user_add_stage'), # "Change user password" -- another special-case view diff --git a/django/contrib/admindocs/__init__.py b/django/contrib/admindocs/__init__.py new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/django/contrib/admindocs/__init__.py diff --git a/django/contrib/admindocs/urls.py b/django/contrib/admindocs/urls.py new file mode 100644 index 0000000000..e7baa76fc0 --- /dev/null +++ b/django/contrib/admindocs/urls.py @@ -0,0 +1,15 @@ +from django.conf.urls.defaults import * +from django.contrib.admindocs import views + +urlpatterns = patterns('', + ('^$', views.doc_index), + ('^bookmarklets/$', views.bookmarklets), + ('^tags/$', views.template_tag_index), + ('^filters/$', views.template_filter_index), + ('^views/$', views.view_index), + ('^views/(?P<view>[^/]+)/$', views.view_detail), + ('^models/$', views.model_index), + ('^models/(?P<app_label>[^\.]+)\.(?P<model_name>[^/]+)/$', views.model_detail), +# ('^templates/$', views.template_index), + ('^templates/(?P<template>.*)/$', views.template_detail), +) diff --git a/django/contrib/admin/views/doc.py b/django/contrib/admindocs/views.py index 4b592acebd..4b592acebd 100644 --- a/django/contrib/admin/views/doc.py +++ b/django/contrib/admindocs/views.py |