Merge

admin_tools/dashboard/modules.py

@@ -5,6 +5,7 @@ Module where admin tools dashboard modules classes are defined.
 from django.utils.text import capfirst
 from django.core.urlresolvers import reverse
 from django.contrib.contenttypes.models import ContentType
+from django.forms.util import flatatt
 from django.utils.translation import ugettext_lazy as _
 from django.utils.itercompat import is_iterable
 
@@ -306,7 +307,10 @@ class LinkList(DashboardModule):
         A string describing the link, it will be the ``title`` attribute of
         the html ``a`` tag.
 
-    Children can also be iterables (lists or tuples) of length 2, 3 or 4.
+    ``attrs``
+        Hash comprising attributes of the html ``a`` tag.
+
+    Children can also be iterables (lists or tuples) of length 2, 3, 4 or 5.
 
     Here's a small example of building a link list module::
 
@@ -324,6 +328,7 @@ class LinkList(DashboardModule):
                             'url': 'http://www.python.org',
                             'external': True,
                             'description': 'Python programming language rocks !',
+                            'attrs': {'target': '_blank'},
                         },
                         ['Django website', 'http://www.djangoproject.com', True],
                         ['Some internal link', '/some/internal/link/'],
@@ -350,9 +355,19 @@ class LinkList(DashboardModule):
                     link_dict['external'] = link[2]
                 if len(link) >= 4:
                     link_dict['description'] = link[3]
-                new_children.append(link_dict)
-            else:
-                new_children.append(link)
+                if len(link) >= 5:
+                    link_dict['attrs'] = link[4]
+                link = link_dict
+            if 'attrs' not in link:
+                link['attrs'] = {}
+            link['attrs']['href'] = link['url']
+            if link.get('description', ''):
+                link['attrs']['title'] = link['description']
+            if link.get('external', False):
+                link['attrs']['class'] = ' '.join(['external-link']
+                    + link['attrs'].get('class', '').split(' ')).strip()
+            link['attrs'] = flatatt(link['attrs'])
+            new_children.append(link)
         self.children = new_children
         self._initialized = True
 

admin_tools/dashboard/templates/admin_tools/dashboard/modules/link_list.html

@@ -4,7 +4,7 @@
     {% spaceless %}
     {% for child in module.children %}
     <li class="{% cycle 'odd' 'even' %}">
-    <a{% if child.external %} class="external-link"{% endif %} href="{{ child.url }}" {% if child.description %} title="{{ child.description }}"{% endif %}>{{ child.title }}</a> 
+    <a{{ child.attrs }}>{{ child.title }}</a> 
     </li>
     {% endfor %}
     {% endspaceless %}

admin_tools/menu/utils.py

@@ -5,14 +5,13 @@ Menu utilities.
 import types
 
 from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
 from django.utils.importlib import import_module
 from django.core.urlresolvers import reverse
 
 
 def _get_menu_cls(menu_cls, context):
     if type(menu_cls) is types.DictType:
-        curr_url = context.get('request').META['PATH_INFO']
+        curr_url = context.get('request').path
         for key in menu_cls:
             admin_site_mod, admin_site_inst = key.rsplit('.', 1)
             admin_site_mod = import_module(admin_site_mod)