Ticket #7810: named-urls-admindocs-7810.diff

django/contrib/admin/templates/admin/base.html

@@ -22 +22 @@
         {% block branding %}{% endblock %}
         </div>
         {% if user.is_authenticated and user.is_staff %}
-        <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name|escape }}{% else %}{{ user.username }}{% endif %}</strong>. {% block userlinks %}<a href="{{ root_path }}doc/">{% trans 'Documentation' %}</a> / <a href="{{ root_path }}password_change/">{% trans 'Change password' %}</a> / <a href="{{ root_path }}logout/">{% trans 'Log out' %}</a>{% endblock %}</div>
+        <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name|escape }}{% else %}{{ user.username }}{% endif %}</strong>. {% block userlinks %}<a href="{% url django-admindocs-docroot %}">{% trans 'Documentation' %}</a> / <a href="{{ root_path }}password_change/">{% trans 'Change password' %}</a> / <a href="{{ root_path }}logout/">{% trans 'Log out' %}</a>{% endblock %}</div>
         {% endif %}
         {% block nav-global %}{% endblock %}
     </div>

django/contrib/admindocs/urls.py

@@ -2 +2 @@
 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),
+    url('^$', views.doc_index, name='django-admindocs-docroot'),
+    url('^bookmarklets/$', views.bookmarklets, name='django-admindocs-bookmarklets'),
+    url('^tags/$', views.template_tag_index, name='django-admindocs-tags'),
+    url('^filters/$', views.template_filter_index, name='django-admindocs-filters'),
+    url('^views/$', views.view_index, name='django-admindocs-views-index'),
+    url('^views/(?P<view>[^/]+)/$', views.view_detail, name='django-admindocs-views-detail'),
+    url('^models/$', views.model_index, name='django-admindocs-models-index'),
+    url('^models/(?P<app_label>[^\.]+)\.(?P<model_name>[^/]+)/$', views.model_detail, name='django-admindocs-models-detail'),
 #    ('^templates/$', views.template_index),
-    ('^templates/(?P<template>.*)/$', views.template_detail),
+    url('^templates/(?P<template>.*)/$', views.template_detail, name='django-admindocs-templates'),
 )