diff --git a/menu.py b/menu.py index bcda4fd73..7972dc17e 100644 --- a/menu.py +++ b/menu.py @@ -69,7 +69,7 @@ class Menu(object): return request_path.startswith(self.url) def active_item(self, request): - """Return the first active item that is found""" + """Return the first active item (e.g. submenu) that is found""" for item in self.items: if request.path.startswith(item.url): return item diff --git a/modules/help/help.py b/modules/help/help.py index 30ca646d4..7c2e55f53 100644 --- a/modules/help/help.py +++ b/modules/help/help.py @@ -8,9 +8,9 @@ import cfg def init(): """Initialize the Help module""" - menu = cfg.main_menu.add_item(_('Documentation'), 'icon-book', '/help', - 101) - menu.add_item(_("Where to Get Help"), "icon-search", "/help/index/", 5) + menu = cfg.main_menu.add_item(_('Documentation'), 'icon-book', + '/help/index', 101) + menu.add_item(_("Where to Get Help"), "icon-search", "/help/index", 5) menu.add_item(_('Developer\'s Manual'), 'icon-info-sign', '/help/page/plinth', 10) menu.add_item(_('FAQ'), 'icon-question-sign', '/help/page/faq', 20) diff --git a/views.py b/views.py index 055fa5838..776758c55 100644 --- a/views.py +++ b/views.py @@ -19,12 +19,12 @@ Main Plinth views """ +from django.core.urlresolvers import reverse +from django.http.response import HttpResponseRedirect import logging -import cfg from withsqlite.withsqlite import sqlite_db -from django.http.response import HttpResponseRedirect -from django.core.urlresolvers import reverse +import cfg LOGGER = logging.getLogger(__name__)