1.1 --- a/macros/CategoryMenu.py Sun Oct 19 01:20:23 2008 +0200
1.2 +++ b/macros/CategoryMenu.py Sun Oct 19 01:50:12 2008 +0200
1.3 @@ -99,7 +99,8 @@
1.4 categories = getCategoryMapping(getCategories(request), request)
1.5
1.6 # Generate a menu with the categories, together with expanded submenus for
1.7 - # the categories employed by the current page or as requested in the macro
1.8 + # the categories employed by the current page, the category represented by
1.9 + # the current page, or for those categories specified in the macro
1.10 # arguments.
1.11
1.12 output = []
1.13 @@ -110,14 +111,22 @@
1.14
1.15 pages_in_category = getPages(category_pagename, request)
1.16 pagenames_in_category = [p.page_name for p in pages_in_category]
1.17 + page_is_category = page.page_name == category_pagename
1.18
1.19 # Generate the submenu where appropriate.
1.20
1.21 if selected_category_names and category_name in selected_category_names or \
1.22 - not selected_category_names and page.page_name in pagenames_in_category:
1.23 + not selected_category_names and (
1.24 + page_is_category or page.page_name in pagenames_in_category):
1.25
1.26 - output.append(fmt.listitem(on=1, attr={"class" : "category-menu-item-selected"}))
1.27 - output.append(fmt.text(category_name))
1.28 + if page_is_category:
1.29 + output.append(fmt.listitem(on=1, attr={"class" : "selected current"}))
1.30 + output.append(fmt.text(category_name))
1.31 + else:
1.32 + output.append(fmt.listitem(on=1, attr={"class" : "selected"}))
1.33 + output.append(fmt.pagelink(on=1, pagename=category_pagename))
1.34 + output.append(fmt.text(category_name))
1.35 + output.append(fmt.pagelink(on=0, pagename=category_pagename))
1.36
1.37 output.append(fmt.bullet_list(on=1, attr={"class" : "category-submenu"}))
1.38
1.39 @@ -127,7 +136,7 @@
1.40 pagename = page_in_category.page_name
1.41
1.42 if page.page_name == pagename:
1.43 - output.append(fmt.listitem(on=1, attr={"class" : "category-submenu-item-selected"}))
1.44 + output.append(fmt.listitem(on=1, attr={"class" : "selected"}))
1.45 else:
1.46 output.append(fmt.listitem(on=1))
1.47 output.append(fmt.pagelink(on=1, pagename=pagename))
1.48 @@ -141,7 +150,7 @@
1.49 # Otherwise generate a simple link.
1.50
1.51 else:
1.52 - output.append(fmt.listitem(on=1, attr={"class" : "category-menu-item"}))
1.53 + output.append(fmt.listitem(on=1))
1.54 output.append(fmt.pagelink(on=1, pagename=category_pagename))
1.55 output.append(fmt.text(category_name))
1.56 output.append(fmt.pagelink(on=0, pagename=category_pagename))