Menu
▾
▴
[mxbb-commits] core/modules/mx_navmenu NavigationMenu.pak, 1.6, 1.7 mx_menu_nav.php, 1.11, 1.12
|
From: Jon O. <jon...@us...> - 2006-06-29 13:13:48
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24423/modules/mx_navmenu Modified Files: NavigationMenu.pak mx_menu_nav.php Log Message: Removed unneeded nav_menu parameter Selvens nav_menu fix for get_nav() Selvens fix for finding bbcode faq info when posting Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mx_menu_nav.php 17 Jun 2006 20:45:22 -0000 1.11 --- mx_menu_nav.php 29 Jun 2006 13:13:44 -0000 1.12 *************** *** 39,43 **** // Define some parameters // - $menu_mode = $mx_menu_config['menu_mode']; $menu_display_style = $mx_menu_config['menu_display_style']; $menu_display_mode = $mx_menu_config['menu_display_mode']; --- 39,42 ---- *************** *** 46,51 **** // // Prevent this block to be used both in overall_header and as a block // ! if ( (defined('MX_OVERALL_NAVIGATION') && $menu_mode == 'block') || (!defined('MX_OVERALL_NAVIGATION') && $menu_mode == 'overall_header')) { $mx_block->show_title = false; --- 45,53 ---- // // Prevent this block to be used both in overall_header and as a block + // Define this menu block has been used on this page - either as a block or in the header. To avoid it being used several times // ! $nav_def_key = 'MX_NAV_MENU_' . $block_id; ! ! if ( defined($nav_def_key) ) { $mx_block->show_title = false; *************** *** 53,56 **** --- 55,59 ---- return; } + define($nav_def_key, true); // *************** *** 120,124 **** --- 123,132 ---- continue; } + $menuIsCat = true; + if ($catData[0]['cat_url'] == 0 && $menuData['page_id'] != 0) + { + $catData[0]['cat_url'] = $menuData['page_id']; + } } *************** *** 138,143 **** $cat_desc = mx_decode($cat_desc, $bbcode_uid, false); $cat_target = ( $catData[0]['cat_target'] == 0 ) ? '' : '_blank'; - $cat_url_tmp = mx_append_sid(PORTAL_URL . 'index.php?page=' . $catData[0]['cat_url'] . '&cat_link=' . intval($cat_id)); $catt = ( $catData[0]['cat_url'] != 0 ) ? '<a class="nav" href="' . $cat_url_tmp . '" target="' . $cat_target . '" /><span class="nav">' . $cat . '</span></a>' : '<span class="nav">' . $cat . '</span>'; --- 146,153 ---- $cat_desc = mx_decode($cat_desc, $bbcode_uid, false); + // + // Is this category a custom link? If not, link to first menu page. + // $cat_target = ( $catData[0]['cat_target'] == 0 ) ? '' : '_blank'; $cat_url_tmp = mx_append_sid(PORTAL_URL . 'index.php?page=' . $catData[0]['cat_url'] . '&cat_link=' . intval($cat_id)); $catt = ( $catData[0]['cat_url'] != 0 ) ? '<a class="nav" href="' . $cat_url_tmp . '" target="' . $cat_target . '" /><span class="nav">' . $cat . '</span></a>' : '<span class="nav">' . $cat . '</span>'; *************** *** 149,153 **** $current_cat = ($pageMapping[$mx_page->page_id] == $cat_id || intval($HTTP_GET_VARS['cat_link']) == $cat_id) ? true : false; ! // // Update cookie - if this was a cat link // --- 159,163 ---- $current_cat = ($pageMapping[$mx_page->page_id] == $cat_id || intval($HTTP_GET_VARS['cat_link']) == $cat_id) ? true : false; ! // // Update cookie - if this was a cat link // *************** *** 158,162 **** --- 168,174 ---- } + // // Generate the fold/unfold categories switches + // $cat_on = $current_cat ? true : ( isset($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id]) ? $HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id] == 1 : $catData[0]['cat_show'] == 1 ); *************** *** 188,191 **** --- 200,204 ---- // $is_auth_ary = menu_auth(AUTH_VIEW, $menuData['menu_id'], $userdata, $menuData, $menuData['auth_view_group']); + if ( !$is_auth_ary['auth_view'] ) { *************** *** 300,304 **** --- 313,319 ---- 'CAT_WIDTH' => $cat_width, + // // mygosmenu + // 'MX_ROOT_PATH' => $mx_root_path, 'T_TR_COLOR1' => '#'.$theme['tr_color1'], Index: NavigationMenu.pak =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/NavigationMenu.pak,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** NavigationMenu.pak 7 Apr 2006 11:45:04 -0000 1.6 --- NavigationMenu.pak 29 Jun 2006 13:13:44 -0000 1.7 *************** *** 4,8 **** parameter=+:51=+:63=+:menu_display_mode=+:Radio_single_select=+:Vertical=+:a:2:{i:0;s:8:"vertical";i:1;s:10:"horizontal";}=+:0 parameter=+:51=+:93=+:menu_display_style=+:Radio_single_select=+:Standard=+:a:5:{i:0;s:8:"Standard";i:1;s:6:"Simple";i:2;s:8:"Advanced";i:3;s:12:"Advanced_app";i:4;s:18:"Overall_navigation";}=+:0 - parameter=+:51=+:94=+:menu_mode=+:Menu_single_select=+:block=+:a:2:{i:0;s:5:"block";i:1;s:14:"overall_header";}=+:0 parameter=+:51=+:64=+:menu_page_sync=+:Boolean=+:0=+:=+:0 parameter=+:51=+:66=+:Nav menu=+:nav_menu=+:=+:=+:0 --- 4,7 ---- |
