Moved django.views.admin.template and django.views.admin.doc to django.contrib.admin.views. Refs #627

git-svn-id: http://code.djangoproject.com/svn/django/trunk@923 bcc190cf-cafb-0310-a4f2-bffc1f526a37

3 files changed, 11 insertions, 11 deletions

diff --git a/django/conf/urls/admin.py b/django/conf/urls/admin.py
index 841d50523e..b31f4de2c9 100644
--- a/django/conf/urls/admin.py
+++ b/django/conf/urls/admin.py
@@ -6,20 +6,20 @@ urlpatterns = (
     ('^logout/$', 'django.views.auth.login.logout'),
     ('^password_change/$', 'django.views.registration.passwords.password_change'),
     ('^password_change/done/$', 'django.views.registration.passwords.password_change_done'),
-    ('^template_validator/$', 'django.views.admin.template.template_validator'),
+    ('^template_validator/$', 'django.contrib.admin.views.template.template_validator'),
 
     # Documentation
-    ('^doc/$', 'django.views.admin.doc.doc_index'),
-    ('^doc/bookmarklets/$', 'django.views.admin.doc.bookmarklets'),
-    ('^doc/tags/$', 'django.views.admin.doc.template_tag_index'),
-    ('^doc/filters/$', 'django.views.admin.doc.template_filter_index'),
-    ('^doc/views/$', 'django.views.admin.doc.view_index'),
-    ('^doc/views/jump/$', 'django.views.admin.doc.jump_to_view'),
-    ('^doc/views/(?P<view>[^/]+)/$', 'django.views.admin.doc.view_detail'),
-    ('^doc/models/$', 'django.views.admin.doc.model_index'),
-    ('^doc/models/(?P<model>[^/]+)/$', 'django.views.admin.doc.model_detail'),
+    ('^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/jump/$', 'django.contrib.admin.views.doc.jump_to_view'),
+    ('^doc/views/(?P<view>[^/]+)/$', 'django.contrib.admin.views.doc.view_detail'),
+    ('^doc/models/$', 'django.contrib.admin.views.doc.model_index'),
+    ('^doc/models/(?P<model>[^/]+)/$', 'django.contrib.admin.views.doc.model_detail'),
 #    ('^doc/templates/$', 'django.views.admin.doc.template_index'),
-    ('^doc/templates/(?P<template>.*)/$', 'django.views.admin.doc.template_detail'),
+    ('^doc/templates/(?P<template>.*)/$', 'django.contrib.admin.views.doc.template_detail'),
 )
 
 if 'ellington.events' in INSTALLED_APPS:
diff --git a/django/views/admin/doc.py b/django/contrib/admin/views/doc.py
index e7e791b2e4..e7e791b2e4 100644
--- a/django/views/admin/doc.py
+++ b/django/contrib/admin/views/doc.py
diff --git a/django/views/admin/template.py b/django/contrib/admin/views/template.py
index c35770178e..c35770178e 100644
--- a/django/views/admin/template.py
+++ b/django/contrib/admin/views/template.py