Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

newforms-admin: Backwards-incompatible change: Moved admin doc views …

…into django.contrib.admindocs

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4585 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 77bdc858451dda6e513272dcebdd49e676efc76f 1 parent d353537
@adrianholovaty adrianholovaty authored
View
5 django/conf/project_template/urls.py
@@ -4,6 +4,9 @@
# 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')),
)
View
12 django/contrib/admin/urls.py
@@ -15,18 +15,6 @@
('^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
View
0  django/contrib/admindocs/__init__.py
No changes.
View
15 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),
+)
View
0  django/contrib/admin/views/doc.py → django/contrib/admindocs/views.py
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.