Ticket #1390: updated_app_name_link.diff

contrib/admin/media/css/global.css

@@ -5 +5 @@
 a:hover { color: #036; }
 a img { border:none; }
 
+a.section:link, a.section:visited { color: white; text-decoration:none; }
+
 /* GLOBAL DEFAULTS */
 p, ol, ul, dl { margin:.2em 0 .8em 0; }
 p { padding:0; line-height:140%; }

contrib/admin/options.py

@@ -546 +546 @@
             'inline_admin_formsets': inline_admin_formsets,
             'errors': AdminErrorList(form, inline_formsets),
             'root_path': self.admin_site.root_path,
+            'app_label': app_label,
         }
         context.update(extra_context or {})
         return self.render_change_form(request, context, add=True)
@@ -609 +610 @@
             'inline_admin_formsets': inline_admin_formsets,
             'errors': AdminErrorList(form, inline_formsets),
             'root_path': self.admin_site.root_path,
+            'app_label': app_label,
         }
         context.update(extra_context or {})
         return self.render_change_form(request, context, change=True, obj=obj)
@@ -639 +641 @@
             'cl': cl,
             'has_add_permission': self.has_add_permission(request),
             'root_path': self.admin_site.root_path,
+            'app_label': app_label,
         }
         context.update(extra_context or {})
         return render_to_response(self.change_list_template or [
@@ -685 +688 @@
             return HttpResponseRedirect("../../")
 
         context = {
-            "title": _("Are you sure?"),
-            "object_name": force_unicode(opts.verbose_name),
-            "object": obj,
-            "deleted_objects": deleted_objects,
-            "perms_lacking": perms_needed,
-            "opts": opts,
-            "root_path": self.admin_site.root_path,
+            'title': _('Are you sure?'),
+            'object_name': opts.verbose_name,
+            'object': obj,
+            'deleted_objects': deleted_objects,
+            'perms_lacking': perms_needed,
+            'opts': opts,
+            'root_path': self.admin_site.root_path,
+            'app_label': app_label,
         }
         context.update(extra_context or {})
         return render_to_response(self.delete_confirmation_template or [
-            "admin/%s/%s/delete_confirmation.html" % (app_label, opts.object_name.lower()),
-            "admin/%s/delete_confirmation.html" % app_label,
-            "admin/delete_confirmation.html"
+            'admin/%s/%s/delete_confirmation.html' % (app_label, opts.object_name.lower()),
+            'admin/%s/delete_confirmation.html' % app_label,
+            'admin/delete_confirmation.html'
         ], context, context_instance=template.RequestContext(request))
 
     def history_view(self, request, object_id, extra_context=None):
@@ -720 +724 @@
         }
         context.update(extra_context or {})
         return render_to_response(self.object_history_template or [
-            "admin/%s/%s/object_history.html" % (opts.app_label, opts.object_name.lower()),
-            "admin/%s/object_history.html" % opts.app_label,
-            "admin/object_history.html"
+            'admin/%s/%s/object_history.html' % (opts.app_label, opts.object_name.lower()),
+            'admin/%s/object_history.html' % opts.app_label,
+            'admin/object_history.html'
         ], context, context_instance=template.RequestContext(request))
 
 class InlineModelAdmin(BaseModelAdmin):

contrib/admin/templates/admin/change_list.html

@@ -5 +5 @@
 
 {% block bodyclass %}change-list{% endblock %}
 
-{% if not is_popup %}{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</a> &rsaquo; {{ cl.opts.verbose_name_plural|capfirst|escape }}</div>{% endblock %}{% endif %}
+{% if not is_popup %}{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</a> &rsaquo; <a href="../">{{ app_label|capfirst|escape }}</a> &rsaquo; {{ cl.opts.verbose_name_plural|capfirst|escape }}</div>{% endblock %}{% endif %}
 
 {% block coltype %}flex{% endblock %}
 

contrib/admin/templates/admin/index.html

@@ -16 +16 @@
     {% for app in app_list %}
         <div class="module">
         <table summary="{% blocktrans with app.name as name %}Models available in the {{ name }} application.{% endblocktrans %}">
-        <caption>{% blocktrans with app.name as name %}{{ name }}{% endblocktrans %}</caption>
+        <caption><a href="{{ app.app.url }}" class="section">{% blocktrans with app.name as name %}{{ name }}{% endblocktrans %}</a></caption>
         {% for model in app.models %}
             <tr>
             {% if model.perms.change %}

contrib/admin/templates/admin/change_form.html

@@ -15 +15 @@
 {% block breadcrumbs %}{% if not is_popup %}
 <div class="breadcrumbs">
      <a href="../../../">{% trans "Home" %}</a> &rsaquo;
+     <a href="../../">{{ app_label|capfirst|escape }}</a> &rsaquo; 
      <a href="../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
      {% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %}
 </div>

contrib/admin/templates/admin/delete_confirmation.html

@@ -4 +4 @@
 {% block breadcrumbs %}
 <div class="breadcrumbs">
      <a href="../../../../">{% trans "Home" %}</a> &rsaquo;
+     <a href="../../../">{{ app_label|capfirst|escape }}</a> &rsaquo; 
      <a href="../../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
      <a href="../">{{ object|escape|truncatewords:"18" }}</a> &rsaquo;
      {% trans 'Delete' %}

contrib/admin/sites.py

@@ -154 +154 @@
 
             if '/' in url:
                 return self.model_page(request, *url.split('/', 2))
+            else:
+                    return self.app_index(request,url)
 
         raise http.Http404('The requested admin page does not exist.')
 
@@ -305 +307 @@
                     else:
                         app_dict[app_label] = {
                             'name': app_label.title(),
+                            'app_url': app_label,
                             'has_module_perms': has_module_perms,
                             'models': [model_dict],
                         }
@@ -350 +353 @@
         return render_to_response(self.login_template or 'admin/login.html', context,
             context_instance=template.RequestContext(request)
         )
+    
+    def app_index(self, request, app_label):
 
+        # Displays the application's index page, which lists all of the application's models
 
+        user = request.user
+        has_module_perms = user.has_module_perms(app_label) 
+        app_dict = {}
+        for model, model_admin in self._registry.items():
+            if app_label == model._meta.app_label:
+               if has_module_perms:
+                   perms = {
+                        'add': user.has_perm("%s.%s" % (app_label, model._meta.get_add_permission())),
+                        'change': user.has_perm("%s.%s" % (app_label, model._meta.get_change_permission())),
+                        'delete': user.has_perm("%s.%s" % (app_label, model._meta.get_delete_permission())), }
+                        # Check whether user has any perm for this module.
+                        # If so, add the module to the model_list.
+                   if True in perms.values():
+                            model_dict = {
+                                'name': capfirst(model._meta.verbose_name_plural),
+                                'admin_url': '%s/' % model.__name__.lower(),
+                                'perms': perms,
+                          }
+                   if app_dict:
+                      app_dict['models'].append(model_dict)
+                   else:
+                      app_dict = { 
+                                  'name': app_label.title(), 
+                                  'app_url': '',
+                                  'has_module_perms': has_module_perms,
+                                  'models': [model_dict],}
+                   if not app_dict:
+                      raise http.Http404('The requested admin page does not exist.')
+           # Sort the models alphabetically within each app. 
+                   app_dict['models'].sort(lambda x, y: cmp(x['name'], y['name'])) 
+        
+                   return render_to_response('admin/app_index.html', {
+                          'title': _('%s administration' % capfirst(app_label)),
+                          'app_list': [app_dict,],
+                   }, context_instance=template.RequestContext(request))
+
 # This global object represents the default admin site, for the common case.
 # You can instantiate AdminSite in your own code to create a custom admin site.
 site = AdminSite()

contrib/auth/models.py

@@ -70 +70 @@
 
     Three basic permissions -- add, change and delete -- are automatically created for each Django model.
     """
-    name = models.CharField(_('name'), max_length=50)
+    name = models.CharField(_('name'), max_length=100)
     content_type = models.ForeignKey(ContentType)
     codename = models.CharField(_('codename'), max_length=100)