|
From: Jon O. <jon...@us...> - 2006-08-20 13:02:46
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29694/modules/mx_navmenu Modified Files: mx_menu_nav.php Log Message: highlight fix Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mx_menu_nav.php 16 Aug 2006 20:00:33 -0000 1.14 --- mx_menu_nav.php 20 Aug 2006 13:02:42 -0000 1.15 *************** *** 106,109 **** --- 106,110 ---- $num_of_cats = count($navCategory); + $hasCurrentMenu = false; foreach($navCategory as $cat_id => $catData) { *************** *** 194,199 **** --- 195,204 ---- } + // + // Loop through each menu in this category + // foreach($catData as $key => $menuData) { + $isCurrentMenu = false; // // Find if user is allowed for view menu *************** *** 215,218 **** --- 220,243 ---- $action = mx_decode($action, $bbcode_uid, false); + if ( $menu_page_sync && !$hasCurrentMenu) + { + if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false ) + { + $isCurrentMenu = true; + } + else if ( $menuData['page_id'] == $page_id && $menuData['block_id'] == 0 ) + { + $isCurrentMenu = true; + } + else if ( $menu_display_style == 'Overall_navigation' && $current_cat && $menuData['page_id'] == $page_id && !$isCurrentMenu ) + { + $isCurrentMenu = true; + } + $hasCurrentMenu = $isCurrentMenu; + } + + $style = $isCurrentMenu ? 'cattitle' : 'genmed'; + + /* if ( $menu_page_sync ) { *************** *** 234,237 **** --- 259,263 ---- $style = 'genmed'; } + */ // *************** *** 243,248 **** if ( file_exists($mx_root_path . $images['mx_graphics']['menu_icons'] . '/' . $icon_url_hot) ) { ! $icon_url = ( $style == 'cattitle' ) ? $icon_url_hot : $icon_tmp; ! $icon_style = ( $style == 'cattitle' ) ? 'mx_icon_hot' : 'mx_icon'; } else --- 269,274 ---- if ( file_exists($mx_root_path . $images['mx_graphics']['menu_icons'] . '/' . $icon_url_hot) ) { ! $icon_url = ( $isCurrentMenu ) ? $icon_url_hot : $icon_tmp; ! $icon_style = ( $isCurrentMenu ) ? 'mx_icon_hot' : 'mx_icon'; } else |