matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Further navigation highlight improvements

Browse Source
This commit is contained in:
Roberto Rosario
2011-07-23 00:09:58 -04:00
parent a3eaf1a0b5
commit 29976541df
5 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/navigation/api.py
View File

@@ -44,7 +44,8 @@ def register_links(src, links, menu_name=None, position=None):
object_navigation[menu_name][src]['links'].extend(links)
def register_top_menu(name, link, children_views=None, children_path_regex=None, position=None):
def register_top_menu(name, link, children_views=None, \
children_path_regex=None, children_view_regex=None, position=None):
"""
Register a new menu entry for the main menu displayed at the top
of the page
@@ -55,6 +56,8 @@ def register_top_menu(name, link, children_views=None, children_path_regex=None,
entry['children_views'] = children_views
if children_path_regex:
entry['children_path_regex'] = children_path_regex
if children_view_regex:
entry['children_view_regex'] = children_view_regex
if position is not None:
top_menu_entries.insert(position, entry)
else:

10
apps/navigation/templatetags/navigation_tags.py
View File

@@ -28,14 +28,16 @@ class TopMenuNavigationNode(Node):
menu_links = resolve_links(context, all_menu_links, current_view, current_path)
for index, link in enumerate(top_menu_entries):
children_views = link.get('children_views', [])
if current_view in children_views:
if current_view in link.get('children_views', []):
menu_links[index]['active'] = True
children_path_regex = link.get('children_path_regex', [])
for child_path_regex in children_path_regex:
for child_path_regex in link.get('children_path_regex', []):
if re.compile(child_path_regex).match(current_path.lstrip('/')):
menu_links[index]['active'] = True
for children_view_regex in link.get('children_view_regex', []):
if re.compile(children_view_regex).match(children_view_regex):
menu_links[index]['active'] = True
context['menu_links'] = menu_links
return ''