Semantics change from 'route' to 'link'.

misago/admin.py

@@ -59,14 +59,14 @@ class SortList(object):
 Admin site section
 """
 class AdminSiteItem(object):
-    def __init__(self, id, name, icon, target=None, route=None, help=None, after=None):
+    def __init__(self, id, name, icon, target=None, link=None, help=None, after=None):
         self.id = id
         self.name = name
         self.help = help
         self.after = after
         self.icon = icon
         self.target = target
-        self.route = route
+        self.link = link
         self.sorted = False
 
 
@@ -106,16 +106,16 @@ class AdminSection(AdminSiteItem):
         self.last = None
         super(AdminSection, self).__init__(**kwargs)
 
-    def get_routes(self):
-        routes = []
+    def get_links(self):
+        links = []
         first_action = True
         for action in self.actions:
             if first_action:
-                routes += patterns('', url('^', include(action.urlpatterns)))
+                links += patterns('', url('^', include(action.urlpatterns)))
                 first_action = False
             else:
-                routes += patterns('', url(('^%s/' % action.id), include(action.urlpatterns)))
-        return routes
+                links += patterns('', url(('^%s/' % action.id), include(action.urlpatterns)))
+        return links
 
     def is_active(self, full_path):
         action_path = '/%s%s/' % (ADMIN_PATH, self.id)
@@ -128,7 +128,7 @@ Admin site class that knows ACP structure
 """
 class AdminSite(object):
     actions_index = {}
-    routes = []
+    links = []
     sections = []
     sections_index = {}
 
@@ -136,9 +136,8 @@ class AdminSite(object):
         """
         Build admin site structure
         """
-        # Return discovered admin routes, so we dont repeat ourself
-        if self.routes:
-            return self.routes
+        if self.links:
+            return self.links
 
         # Found actions
         actions = []
@@ -207,12 +206,12 @@ class AdminSite(object):
         first_section = True
         for section in self.sections:
             if first_section:
-                self.routes += patterns('', url('^', include(section.get_routes())))
+                self.links += patterns('', url('^', include(section.get_links())))
                 first_section = False
             else:
-                self.routes += patterns('', url(('^%s/' % section.id), include(section.get_routes())))
+                self.links += patterns('', url(('^%s/' % section.id), include(section.get_links())))
         
-        return self.routes
+        return self.links
 
     def get_action(self, action):
         """
@@ -222,9 +221,9 @@ class AdminSite(object):
 
     def get_admin_index(self):
         """
-        Return admin index route - first action of first section
+        Return admin index link - first action of first section
         """
-        return self.sections[0].actions[0].route
+        return self.sections[0].actions[0].link
 
     def get_admin_navigation(self, request):
         """
@@ -242,7 +241,7 @@ class AdminSite(object):
                              'is_active': is_active,
                              'name': section.name,
                              'icon': section.icon,
-                             'route': section.actions[0].route
+                             'link': section.actions[0].link
                              })
             if is_active:
                 active_section = section
@@ -260,7 +259,7 @@ class AdminSite(object):
                              'name': action.name,
                              'icon': action.icon,
                              'help': action.help,
-                             'route': action.route
+                             'link': action.link
                              })
             if is_active:
                 active_action = action

misago/apps/admin/sections/forums.py

@@ -16,16 +16,16 @@ ADMIN_ACTIONS = (
                           'id': 'list',
                           'name': _("Forums List"),
                           'help': _("All existing forums"),
-                          'route': 'admin_forums'
+                          'link': 'admin_forums'
                           },
                          {
                           'id': 'new',
                           'name': _("New Node"),
                           'help': _("Create new forums tree node"),
-                          'route': 'admin_forums_new'
+                          'link': 'admin_forums_new'
                           },
                          ],
-                route='admin_forums',
+                link='admin_forums',
                 urlpatterns=patterns('misago.apps.admin.forums.views',
                         url(r'^$', 'List', name='admin_forums'),
                         url(r'^sync/$', 'resync_forums', name='admin_forums_resync'),
@@ -43,7 +43,7 @@ ADMIN_ACTIONS = (
                 name=_("Thread Labels"),
                 help=_("Thread Labels allow you to group threads together within forums."),
                 icon='tags',
-                route='admin_forums_labels',
+                link='admin_forums_labels',
                 urlpatterns=patterns('misago.apps.admin.index',
                         url(r'^$', 'todo', name='admin_forums_labels'),
                     ),
@@ -54,7 +54,7 @@ ADMIN_ACTIONS = (
                 name=_("Words Filter"),
                 help=_("Forbid usage of words in messages"),
                 icon='volume-off',
-                route='admin_forums_badwords',
+                link='admin_forums_badwords',
                 urlpatterns=patterns('misago.apps.admin.index',
                         url(r'^$', 'todo', name='admin_forums_badwords'),
                     ),
@@ -65,7 +65,7 @@ ADMIN_ACTIONS = (
                 name=_("Tests"),
                 help=_("Tests that new messages have to pass"),
                 icon='filter',
-                route='admin_forums_tests',
+                link='admin_forums_tests',
                 urlpatterns=patterns('misago.apps.admin.index',
                         url(r'^$', 'todo', name='admin_forums_tests'),
                     ),
@@ -76,7 +76,7 @@ ADMIN_ACTIONS = (
                 name=_("Attachments"),
                 help=_("Manage allowed attachment types."),
                 icon='download-alt',
-                route='admin_forums_attachments',
+                link='admin_forums_attachments',
                 urlpatterns=patterns('misago.apps.admin.index',
                         url(r'^$', 'todo', name='admin_forums_attachments'),
                     ),

misago/apps/admin/sections/overview.py

@@ -10,7 +10,7 @@ ADMIN_ACTIONS = (
                 name=_("Home"),
                 help=_("Your forums right now"),
                 icon='home',
-                route='admin_home',
+                link='admin_home',
                 urlpatterns=patterns('misago.apps.admin.index',
                         url(r'^$', 'index', name='admin_home'),
                     ),
@@ -21,7 +21,7 @@ ADMIN_ACTIONS = (
                 name=_("Stats"),
                 help=_("Create Statistics Reports"),
                 icon='signal',
-                route='admin_stats',
+                link='admin_stats',
                 urlpatterns=patterns('misago.apps.admin.stats.views',
                         url(r'^$', 'form', name='admin_stats'),
                         url(r'^(?P<model>[a-z0-9]+)/(?P<date_start>[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9])/(?P<date_end>[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9])/(?P<precision>\w+)$', 'graph', name='admin_stats_graph'),
@@ -39,10 +39,10 @@ ADMIN_ACTIONS = (
                           'id': 'list',
                           'name': _("Browse Users"),
                           'help': _("Browse all registered user accounts"),
-                          'route': 'admin_online'
+                          'link': 'admin_online'
                           },
                          ],
-                route='admin_online',
+                link='admin_online',
                 urlpatterns=patterns('misago.apps.admin.online.views',
                         url(r'^$', 'List', name='admin_online'),
                         url(r'^(?P<page>[1-9]([0-9]+)?)/$', 'List', name='admin_online'),
@@ -60,10 +60,10 @@ ADMIN_ACTIONS = (
                           'id': 'list',
                           'name': _("Forum Team Members"),
                           'help': _("List of all forum team members"),
-                          'route': 'admin_team'
+                          'link': 'admin_team'
                           },
                          ],
-                route='admin_team',
+                link='admin_team',
                 urlpatterns=patterns('misago.apps.admin.team',
                         url(r'^$', 'List', name='admin_team'),
                     ),

misago/apps/admin/sections/perms.py

@@ -16,16 +16,16 @@ ADMIN_ACTIONS = (
                           'id': 'list',
                           'name': _("Browse Roles"),
                           'help': _("Browse all existing roles"),
-                          'route': 'admin_roles'
+                          'link': 'admin_roles'
                           },
                          {
                           'id': 'new',
                           'name': _("Add Role"),
                           'help': _("Create new role"),
-                          'route': 'admin_roles_new'
+                          'link': 'admin_roles_new'
                           },
                          ],
-                route='admin_roles',
+                link='admin_roles',
                 urlpatterns=patterns('misago.apps.admin.roles.views',
                          url(r'^$', 'List', name='admin_roles'),
                          url(r'^new/$', 'New', name='admin_roles_new'),
@@ -47,16 +47,16 @@ ADMIN_ACTIONS = (
                           'id': 'list',
                           'name': _("Browse Roles"),
                           'help': _("Browse all existing roles"),
-                          'route': 'admin_roles_forums'
+                          'link': 'admin_roles_forums'
                           },
                          {
                           'id': 'new',
                           'name': _("Add Role"),
                           'help': _("Create new role"),
-                          'route': 'admin_roles_forums_new'
+                          'link': 'admin_roles_forums_new'
                           },
                          ],
-                route='admin_roles_forums',
+                link='admin_roles_forums',
                 urlpatterns=patterns('misago.apps.admin.forumroles.views',
                          url(r'^$', 'List', name='admin_roles_forums'),
                          url(r'^new/$', 'New', name='admin_roles_forums_new'),

misago/apps/admin/sections/system.py

@@ -9,7 +9,7 @@ ADMIN_ACTIONS = (
                 name=_("Settings"),
                 help=_("Change your forum configuration"),
                 icon='wrench',
-                route='admin_settings',
+                link='admin_settings',
                 urlpatterns=patterns('misago.apps.admin.settings.views',
                          url(r'^$', 'settings', name='admin_settings'),
                          url(r'^search/$', 'settings_search', name='admin_settings_search'),

misago/apps/admin/sections/users.py

@@ -16,16 +16,16 @@ ADMIN_ACTIONS = (
                           'id': 'list',
                           'name': _("Browse Users"),
                           'help': _("Browse all registered user accounts"),
-                          'route': 'admin_users'
+                          'link': 'admin_users'
                           },
                          {
                           'id': 'new',
                           'name': _("Add User"),
                           'help': _("Create new user account"),
-                          'route': 'admin_users_new'
+                          'link': 'admin_users_new'
                           },
                          ],
-                route='admin_users',
+                link='admin_users',
                 urlpatterns=patterns('misago.apps.admin.users.views',
                          url(r'^$', 'List', name='admin_users'),
                          url(r'^(?P<page>[1-9]([0-9]+)?)/$', 'List', name='admin_users'),
@@ -47,16 +47,16 @@ ADMIN_ACTIONS = (
                           'id': 'list',
                           'name': _("Browse Ranks"),
                           'help': _("Browse all existing ranks"),
-                          'route': 'admin_ranks'
+                          'link': 'admin_ranks'
                           },
                          {
                           'id': 'new',
                           'name': _("Add Rank"),
                           'help': _("Create new rank"),
-                          'route': 'admin_ranks_new'
+                          'link': 'admin_ranks_new'
                           },
                          ],
-                route='admin_ranks',
+                link='admin_ranks',
                 urlpatterns=patterns('misago.apps.admin.ranks.views',
                          url(r'^$', 'List', name='admin_ranks'),
                          url(r'^new/$', 'New', name='admin_ranks_new'),
@@ -76,16 +76,16 @@ ADMIN_ACTIONS = (
                           'id': 'list',
                           'name': _("Browse Bans"),
                           'help': _("Browse all existing bans"),
-                          'route': 'admin_bans'
+                          'link': 'admin_bans'
                           },
                          {
                           'id': 'new',
                           'name': _("Set Ban"),
                           'help': _("Set new Ban"),
-                          'route': 'admin_bans_new'
+                          'link': 'admin_bans_new'
                           },
                          ],
-                route='admin_bans',
+                link='admin_bans',
                 urlpatterns=patterns('misago.apps.admin.bans.views',
                          url(r'^$', 'List', name='admin_bans'),
                          url(r'^(?P<page>[1-9]([0-9]+)?)/$', 'List', name='admin_bans'),
@@ -106,16 +106,16 @@ ADMIN_ACTIONS = (
                           'id': 'list',
                           'name': _("Pruning Policies"),
                           'help': _("Browse all existing pruning policies"),
-                          'route': 'admin_prune_users'
+                          'link': 'admin_prune_users'
                           },
                          {
                           'id': 'new',
                           'name': _("Set New Policy"),
                           'help': _("Set new pruning policy"),
-                          'route': 'admin_prune_users_new'
+                          'link': 'admin_prune_users_new'
                           },
                          ],
-                route='admin_prune_users',
+                link='admin_prune_users',
                 urlpatterns=patterns('misago.apps.admin.pruneusers.views',
                          url(r'^$', 'List', name='admin_prune_users'),
                          url(r'^new/$', 'New', name='admin_prune_users_new'),
@@ -136,16 +136,16 @@ ADMIN_ACTIONS = (
                           'id': 'list',
                           'name': _("Browse Newsletters"),
                           'help': _("Browse all existing Newsletters"),
-                          'route': 'admin_newsletters'
+                          'link': 'admin_newsletters'
                           },
                          {
                           'id': 'new',
                           'name': _("New Newsletter"),
                           'help': _("Create new Newsletter"),
-                          'route': 'admin_newsletters_new'
+                          'link': 'admin_newsletters_new'
                           },
                          ],
-                route='admin_newsletters',
+                link='admin_newsletters',
                 urlpatterns=patterns('misago.apps.admin.newsletters.views',
                          url(r'^$', 'List', name='admin_newsletters'),
                          url(r'^(?P<page>[1-9]([0-9]+)?)/$', 'List', name='admin_newsletters'),

misago/apps/admin/widgets.py

@@ -38,7 +38,7 @@ class BaseWidget(object):
         return '%s_%s_%s' % (self.id, token, str('%s.%s' % (self.admin.id, self.admin.model.__name__)))
 
     def get_link(self):
-        return reverse(self.admin.get_action_attr(self.id, 'route'))
+        return reverse(self.admin.get_action_attr(self.id, 'link'))
 
     def get_name(self):
         return self.admin.get_action_attr(self.id, 'name')
@@ -207,7 +207,7 @@ class ListWidget(BaseWidget):
         return page_items.order_by(sorting_method[2])
 
     def get_pagination_link(self, page):
-        return reverse(self.admin.get_action_attr(self.id, 'route'), kwargs={'page': page})
+        return reverse(self.admin.get_action_attr(self.id, 'link'), kwargs={'page': page})
 
     def get_pagination(self, total, page):
         if not self.pagination or total < 0:
@@ -389,7 +389,7 @@ class FormWidget(BaseWidget):
     submit_fallback = False
 
     def get_link(self, model):
-        return reverse(self.admin.get_action_attr(self.id, 'route'))
+        return reverse(self.admin.get_action_attr(self.id, 'link'))
 
     def get_form(self, target):
         return self.form

templates/admin/admin/layout.html

@@ -12,7 +12,7 @@
 <div class="page-header{% if admin.actions|length > 1 %} tabs-header{% endif %}">
   <h1>{{ admin.name }}{% if admin.help %} <small>{{ admin.help }}</small>{% endif %}</h1>
   {% if admin.actions|length > 1 %}<ul class="nav nav-tabs">{% for item in admin.actions %}
-  	<li{% if action.id == item.id %} class="active"{% endif %}><a href="{{ url(item.route) }}"{% if action.id != item.id and item.help %} class="tooltip-bottom" title="{{ item.help }}"{% endif %}>{{ item.name }}</a></li>{% endfor %}
+  	<li{% if action.id == item.id %} class="active"{% endif %}><a href="{{ url(item.link) }}"{% if action.id != item.id and item.help %} class="tooltip-bottom" title="{{ item.help }}"{% endif %}>{{ item.name }}</a></li>{% endfor %}
   </ul>{% endif %}
 </div>
 {% if admin.actions[0].id != action.id -%}

templates/admin/layout.html

@@ -7,7 +7,7 @@
     <div class="container">
       <a class="brand" href="{{ url(admin_index) }}">Misago <span>{{ version }}</span></a>
       <ul class="nav">{% for section in sections %}
-      	<li{% if section.is_active and not exception_response %} class="active"{% endif %}><a href="{{ url(section.route) }}"><i class="icon-{{ section.icon }}"></i> {{ section.name }}</a></li>{% endfor %}
+      	<li{% if section.is_active and not exception_response %} class="active"{% endif %}><a href="{{ url(section.link) }}"><i class="icon-{{ section.icon }}"></i> {{ section.name }}</a></li>{% endfor %}
       </ul>
       <form class="navbar-form user-signout pull-right" action="{{ url('admin_sign_out') }}" method="post"><input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}"><button type="submit" class="btn btn-link"><i class="icon-off"></i> {% trans %}Sign Out{% endtrans %}</button></form>
       <ul class="nav pull-right">
@@ -23,7 +23,7 @@
   <div class="navbar-inner">
     <div class="container">
       <ul class="nav">{% for action in actions %}
-      	<li{% if action.is_active %} class="active"{% elif action.help %} class="tooltip-bottom" title="{{ action.help }}"{% endif %}><a href="{{ url(action.route) }}"><i class="icon-{{ action.icon }}"></i> {{ action.name }}</a></li>{% endfor %}
+      	<li{% if action.is_active %} class="active"{% elif action.help %} class="tooltip-bottom" title="{{ action.help }}"{% endif %}><a href="{{ url(action.link) }}"><i class="icon-{{ action.icon }}"></i> {{ action.name }}</a></li>{% endfor %}
       </ul>
     </div>
   </div>