Converted apps to the new main menu navigation method and improved navigation links in some apps

This commit is contained in:
Roberto Rosario
2011-06-08 01:26:50 -04:00
parent 2a2c67de4e
commit 8fa4f641e4
11 changed files with 63 additions and 65 deletions

View File

@@ -1,8 +1,8 @@
from django.utils.translation import ugettext_lazy as _
from navigation.api import register_menu
from permissions import role_list
from user_management import user_list, group_list
from navigation.api import register_top_menu
from permissions import role_list, permission_views
from user_management import user_list, group_list, user_management_views
from navigation.api import register_links
from history import history_list
@@ -15,7 +15,7 @@ def is_superuser(context):
check_settings = {'text': _(u'settings'), 'view': 'setting_list', 'famfam': 'cog'}
statistics = {'text': _(u'statistics'), 'view': 'statistics', 'famfam': 'table'}
diagnostics = {'text': _(u'diagnostics'), 'view': 'diagnostics', 'famfam': 'pill'}
tools = {'text': _(u'tools'), 'view': 'tools_menu', 'famfam': 'wrench'}
tools_menu = {'text': _(u'tools'), 'view': 'tools_menu', 'famfam': 'wrench'}
admin_site = {'text': _(u'admin site'), 'url': '/admin', 'famfam': 'keyboard', 'condition': is_superuser}
sentry = {'text': _(u'sentry'), 'url': '/sentry', 'famfam': 'bug', 'condition': is_superuser}
@@ -23,33 +23,32 @@ sentry = {'text': _(u'sentry'), 'url': '/sentry', 'famfam': 'bug', 'condition':
__version_info__ = {
'major': 0,
'minor': 7,
'micro': 1,
'micro': 2,
'releaselevel': 'final',
'serial': 0
}
main_menu = [
{'text': _(u'home'), 'view': 'home', 'famfam': 'house', 'position': 0},
{'text': _(u'tools'), 'view': 'tools_menu', 'links': [
tools, statistics, diagnostics, history_list, sentry,
], 'famfam': 'wrench', 'name': 'tools', 'position': 7},
{'text': _(u'setup'), 'view': 'setting_list', 'links': [
check_settings, role_list, user_list, group_list, admin_site
], 'famfam': 'cog', 'name': 'setup', 'position': 8},
{'text': _(u'about'), 'view': 'about', 'famfam': 'information', 'position': 9},
]
#setup_views = []
#setup_views.extend(permission_views)
#setup_views.extend(user_management_views)
#setup_views.extend(['setting_list'])
register_top_menu('home', link={'text': _(u'home'), 'view': 'home', 'famfam': 'house'}, position=0)
if not SIDE_BAR_SEARCH:
main_menu.insert(1, {'text': _(u'search'), 'view': 'search', 'famfam': 'zoom', 'position': 2})
register_top_menu('search', link={'text': _(u'search'), 'view': 'search', 'famfam': 'zoom'})
register_top_menu('tools', link=tools_menu, children_views=['statistics', 'history_list'])
#register_top_menu('setup_menu', link={'text': _(u'setup'), 'view': 'setting_list', 'famfam': 'cog'}, children=setup_views)
register_top_menu('setup_menu', link={'text': _(u'setup'), 'view': 'setting_list', 'famfam': 'cog'}, children_path_regex=[r'^settings/', r'^user_management/', r'permissions'])
register_top_menu('about', link={'text': _(u'about'), 'view': 'about', 'famfam': 'information'})
register_menu(main_menu)
register_links(['tools_menu', 'statistics', 'diagnostics', 'history_list'], [tools, statistics, diagnostics, history_list, sentry], menu_name='sidebar')
#register_links(['setting_list'], [check_settings, role_list, user_list, group_list, admin_site], menu_name='sidebar')
register_links(['tools_menu', 'statistics', 'history_list', 'history_view'], [tools_menu, statistics, history_list, sentry], menu_name='secondary_menu')
tool_links = [check_settings, role_list, user_list, group_list, admin_site]
register_links(['setting_list'], tool_links, menu_name='secondary_menu')
register_links(permission_views, tool_links, menu_name='secondary_menu')
register_links(user_management_views, tool_links, menu_name='secondary_menu')
def get_version():
"""
Return the formatted version information