Cleaned up admin links.

misago/acl/admin.py

@@ -18,17 +18,15 @@ class MisagoAdminExtension(object):
         )
 
     def register_navigation_nodes(self, site):
-        site.add_node(
-            parent='misago:admin',
-            after='misago:admin:users:accounts:index',
-            namespace='misago:admin:permissions',
-            link='misago:admin:permissions:users:index',
-            name=_("Permissions"),
-            icon='fa fa-adjust')
+        site.add_node(name=_("Permissions"),
+                      icon='fa fa-adjust',
+                      parent='misago:admin',
+                      after='misago:admin:users:accounts:index',
+                      namespace='misago:admin:permissions',
+                      link='misago:admin:permissions:users:index')
 
-        site.add_node(
-            parent='misago:admin:permissions',
-            namespace='misago:admin:permissions:users',
-            link='misago:admin:permissions:users:index',
-            name=_("User roles"),
-            icon='fa fa-th-large')
+        site.add_node(name=_("User roles"),
+                      icon='fa fa-th-large',
+                      parent='misago:admin:permissions',
+                      namespace='misago:admin:permissions:users',
+                      link='misago:admin:permissions:users:index')

misago/admin/admin.py

@@ -8,8 +8,7 @@ class MisagoAdminExtension(object):
         pass
 
     def register_navigation_nodes(self, site):
-        site.add_node(
-            parent='misago:admin',
-            link='misago:admin:index',
-            name=_("Home"),
-            icon='fa fa-home')
+        site.add_node(name=_("Home"),
+                      icon='fa fa-home',
+                      parent='misago:admin',
+                      link='misago:admin:index')

misago/admin/hierarchy.py

@@ -2,11 +2,11 @@ from django.core.urlresolvers import reverse
 
 
 class Node(object):
-    def __init__(self, link=None, name=None, icon=None):
+    def __init__(self, name=None, icon=None, link=None):
         self.parent = None
-        self.link = link
         self.name = name
         self.icon = icon
+        self.link = link
         self._children = []
         self._children_dict = {}
 
@@ -28,10 +28,10 @@ class Node(object):
         for children in self._children:
             childrens.append(
                 {
-                    'link': reverse(children.link),
-                    'namespace': children.namespace,
                     'name': children.name,
                     'icon': children.icon,
+                    'link': reverse(children.link),
+                    'namespace': children.namespace,
                 })
         return childrens
 
@@ -132,8 +132,8 @@ class AdminHierarchyBuilder(object):
 
         return nodes_dict
 
-    def add_node(self, parent='misago:admin', after=None, before=None,
-                 namespace=None, link=None, name=None, icon=None):
+    def add_node(self, name=None, icon=None, parent='misago:admin', after=None,
+                 before=None, namespace=None, link=None):
         if self.nodes_dict:
             raise ValueError("Misago admin site has already been "
                              "initialized. You can't add new nodes to it.")
@@ -143,13 +143,13 @@ class AdminHierarchyBuilder(object):
 
         self.nodes_record.append(
             {
+                'name': name,
+                'icon': icon,
                 'parent': parent,
                 'namespace': namespace,
                 'after': after,
                 'before': before,
                 'link': link,
-                'name': name,
-                'icon': icon,
             })
 
     def visible_branches(self, request):

misago/conf/admin.py

@@ -12,8 +12,7 @@ class MisagoAdminExtension(object):
         )
 
     def register_navigation_nodes(self, site):
-        site.add_node(
-            parent='misago:admin',
-            link='misago:admin:settings:index',
-            name=_("Settings"),
-            icon='fa fa-gears')
+        site.add_node(name=_("Settings"),
+                      icon='fa fa-gears',
+                      parent='misago:admin',
+                      link='misago:admin:settings:index')

misago/forums/admin.py

@@ -39,26 +39,22 @@ class MisagoAdminExtension(object):
         )
 
     def register_navigation_nodes(self, site):
-        site.add_node(
-            parent='misago:admin',
-            before='misago:admin:permissions:users:index',
-            namespace='misago:admin:forums',
-            link='misago:admin:forums:nodes:index',
-            name=_("Forums"),
-            icon='fa fa-comments')
-
-        site.add_node(
-            parent='misago:admin:forums',
-            namespace='misago:admin:forums:nodes',
-            link='misago:admin:forums:nodes:index',
-            name=_("Forums Hierarchy"),
-            icon='fa fa-sitemap')
-
-        site.add_node(
-            parent='misago:admin:permissions',
-            namespace='misago:admin:permissions:forums',
-            after='misago:admin:permissions:users:index',
-            link='misago:admin:permissions:forums:index',
-            name=_("Forum roles"),
-            icon='fa fa-comments-o')
-
+        site.add_node(name=_("Forums"),
+                      icon='fa fa-comments',
+                      parent='misago:admin',
+                      before='misago:admin:permissions:users:index',
+                      namespace='misago:admin:forums',
+                      link='misago:admin:forums:nodes:index')
+
+        site.add_node(name=_("Forums Hierarchy"),
+                      icon='fa fa-sitemap',
+                      parent='misago:admin:forums',
+                      namespace='misago:admin:forums:nodes',
+                      link='misago:admin:forums:nodes:index')
+
+        site.add_node(name=_("Forum roles"),
+                      icon='fa fa-comments-o',
+                      parent='misago:admin:permissions',
+                      after='misago:admin:permissions:users:index',
+                      namespace='misago:admin:permissions:forums',
+                      link='misago:admin:permissions:forums:index')

misago/users/admin.py

@@ -33,25 +33,22 @@ class MisagoAdminExtension(object):
         )
 
     def register_navigation_nodes(self, site):
-        site.add_node(
-            parent='misago:admin',
-            after='misago:admin:index',
-            namespace='misago:admin:users',
-            link='misago:admin:users:accounts:index',
-            name=_("Users"),
-            icon='fa fa-users')
+        site.add_node(name=_("Users"),
+                      icon='fa fa-users',
+                      parent='misago:admin',
+                      after='misago:admin:index',
+                      namespace='misago:admin:users',
+                      link='misago:admin:users:accounts:index')
 
-        site.add_node(
-            parent='misago:admin:users',
-            namespace='misago:admin:users:accounts',
-            link='misago:admin:users:accounts:index',
-            name=_("User Accounts"),
-            icon='fa fa-users')
+        site.add_node(name=_("User Accounts"),
+                      icon='fa fa-users',
+                      parent='misago:admin:users',
+                      namespace='misago:admin:users:accounts',
+                      link='misago:admin:users:accounts:index')
 
-        site.add_node(
-            parent='misago:admin:users',
-            namespace='misago:admin:users:ranks',
-            link='misago:admin:users:ranks:index',
-            name=_("Ranks"),
-            after='misago:admin:users:accounts:index',
-            icon='fa fa-graduation-cap')
+        site.add_node(name=_("Ranks"),
+                      icon='fa fa-graduation-cap',
+                      parent='misago:admin:users',
+                      after='misago:admin:users:accounts:index',
+                      namespace='misago:admin:users:ranks',
+                      link='misago:admin:users:ranks:index')