Menu
▾
▴
[mxbb-commits] core/modules/mx_navmenu NavigationMenu.pak, 1.14.2.3, 1.14.2.4 mx_site_nav.php, 1.1.2.3, 1.1.2.4
|
From: Jon O. <jon...@us...> - 2008-05-08 18:52:09
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31777 Modified Files: Tag: core28x NavigationMenu.pak mx_site_nav.php Log Message: A few fixes, and added custom tpl file switch Index: mx_site_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_site_nav.php,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** mx_site_nav.php 3 May 2008 19:11:55 -0000 1.1.2.3 --- mx_site_nav.php 8 May 2008 18:51:43 -0000 1.1.2.4 *************** *** 30,34 **** // Setup config parameters // ! $config_name = array('menu_display_style', 'menu_display_mode', 'menu_page_sync', 'menu_page_parent'); for( $i = 0; $i < count($config_name); $i++ ) --- 30,34 ---- // Setup config parameters // ! $config_name = array('menu_display_style', 'menu_display_mode', 'menu_page_sync', 'menu_page_parent', 'menu_custom_tpl'); for( $i = 0; $i < count($config_name); $i++ ) *************** *** 41,47 **** --- 41,56 ---- // Define some parameters // + /* $menu_display_style = 'Overall_navigation'; $menu_display_mode == 'Horizontal'; $menu_page_sync = true; + */ + // + // Define some parameters + // + $menu_custom_tpl = $mx_menu_config['menu_custom_tpl']; + $menu_display_style = $mx_menu_config['menu_display_style']; + $menu_display_mode = $mx_menu_config['menu_display_mode']; + $menu_page_sync = ( $mx_menu_config['menu_page_sync'] != 'No' ); $page_parent = !empty($mx_menu_config['menu_page_parent']) ? $mx_menu_config['menu_page_parent'] : 0; *************** *** 66,98 **** $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); ! switch( $menu_display_style ) { ! case 'Classic': ! $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl'); ! break; ! case 'Advanced': ! $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_hor.tpl') : array('body' => 'mx_menu_advanced_ver.tpl'); ! $kick_js = $menu_display_mode == 'Horizontal' ? 'adv_hor.js' : 'adv_ver.js'; ! $mx_page->add_footer_text( 'includes/js/' . $kick_js, true ); ! break; ! case 'Simple_CSS_menu': ! $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_CSS_hor.tpl') : array('body' => 'mx_menu_simple_CSS_ver.tpl'); ! $kick_js = $menu_display_mode == 'Horizontal' ? 'simple_CSS_hor.js' : 'simple_CSS_ver.js'; ! $mx_page->add_footer_text( 'includes/js/' . $kick_js, true ); ! break; ! case 'Advanced_CSS_menu': ! $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_CSS_hor.tpl') : array('body' => 'mx_menu_advanced_CSS_ver.tpl'); ! $kick_js = $menu_display_mode == 'Horizontal' ? 'adv_CSS_hor.js' : 'adv_CSS_ver.js'; ! $mx_page->add_footer_text( 'includes/js/' . $kick_js, true ); ! break; ! case 'Simple_x': ! $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_x_hor.tpl') : array('body' => 'mx_menu_simple_x_ver.tpl'); ! break; ! case 'Overall_navigation': ! $template_tmp = array('body' => 'mx_menu_overall_standard.tpl'); ! break; ! default: ! $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl'); ! break; } --- 75,114 ---- $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); ! if (!empty($menu_custom_tpl)) { ! $template_tmp = array('body' => $menu_custom_tpl); ! } ! else ! { ! switch( $menu_display_style ) ! { ! case 'Classic': ! $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl'); ! break; ! case 'Advanced': ! $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_hor.tpl') : array('body' => 'mx_menu_advanced_ver.tpl'); ! $kick_js = $menu_display_mode == 'Horizontal' ? 'adv_hor.js' : 'adv_ver.js'; ! $mx_page->add_footer_text( 'includes/js/' . $kick_js, true ); ! break; ! case 'Simple_CSS_menu': ! $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_CSS_hor.tpl') : array('body' => 'mx_menu_simple_CSS_ver.tpl'); ! $kick_js = $menu_display_mode == 'Horizontal' ? 'simple_CSS_hor.js' : 'simple_CSS_ver.js'; ! $mx_page->add_footer_text( 'includes/js/' . $kick_js, true ); ! break; ! case 'Advanced_CSS_menu': ! $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_CSS_hor.tpl') : array('body' => 'mx_menu_advanced_CSS_ver.tpl'); ! $kick_js = $menu_display_mode == 'Horizontal' ? 'adv_CSS_hor.js' : 'adv_CSS_ver.js'; ! $mx_page->add_footer_text( 'includes/js/' . $kick_js, true ); ! break; ! case 'Simple_x': ! $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_x_hor.tpl') : array('body' => 'mx_menu_simple_x_ver.tpl'); ! break; ! case 'Overall_navigation': ! $template_tmp = array('body' => 'mx_menu_overall_standard.tpl'); ! break; ! default: ! $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl'); ! break; ! } } Index: NavigationMenu.pak =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/NavigationMenu.pak,v retrieving revision 1.14.2.3 retrieving revision 1.14.2.4 diff -C2 -d -r1.14.2.3 -r1.14.2.4 *** NavigationMenu.pak 3 May 2008 19:11:55 -0000 1.14.2.3 --- NavigationMenu.pak 8 May 2008 18:51:43 -0000 1.14.2.4 *************** *** 1,5 **** ! module=+:50=+:Navigation Menu=+:modules/mx_navmenu/=+:MX-Publisher Site Navigation=+: New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:50=+:51=+:User Navigation=+:Advanced menus=+:mx_menu_nav.php=+: parameter=+:51=+:66=+:Nav menu=+:nav_menu=+:=+:=+:0=+:10 parameter=+:51=+:93=+:menu_display_style=+:Radio_single_select=+:Classic=+:a:5:{i:0;s:7:"Classic";i:1;s:8:"Advanced";i:2;s:15:"Simple_CSS_menu";i:3;s:17:"Advanced_CSS_menu";i:4;s:18:"Overall_navigation";}=+:0=+:20 --- 1,5 ---- ! module=+:50=+:Navigation Menu=+:modules/mx_navmenu/=+:mxBB Portal Site Navigation=+: New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:50=+:51=+:User Navigation Menu=+:Site Navigation=+:mx_menu_nav.php=+: parameter=+:51=+:66=+:Nav menu=+:nav_menu=+:=+:=+:0=+:10 parameter=+:51=+:93=+:menu_display_style=+:Radio_single_select=+:Classic=+:a:5:{i:0;s:7:"Classic";i:1;s:8:"Advanced";i:2;s:15:"Simple_CSS_menu";i:3;s:17:"Advanced_CSS_menu";i:4;s:18:"Overall_navigation";}=+:0=+:20 *************** *** 9,19 **** block=+:=+:Demo - User Navigation Menu=+:Demo block=+:51=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:50=+:52=+:Page Navigation=+:Standard Page Menus=+:mx_site_nav.php=+: ! parameter=+:52=+:155=+:menu_page_parent=+:Function=+:0=+:generate_page_jumpbox("{parameter_id}[]",0,0,"{parameter_value}")=+:0=+:0 ! parameter=+:52=+:100=+:Site menu=+:site_menu=+:=+:=+:0=+:10 ! parameter=+:52=+:101=+:menu_display_style=+:Radio_single_select=+:Overall_navigation=+:a:5:{i:0;s:7:"Classic";i:1;s:8:"Advanced";i:2;s:15:"Simple_CSS_menu";i:3;s:17:"Advanced_CSS_menu";i:4;s:18:"Overall_navigation";}=+:0=+:20 ! parameter=+:52=+:102=+:menu_display_mode=+:Radio_single_select=+:Horizontal=+:a:2:{i:0;s:8:"Vertical";i:1;s:10:"Horizontal";}=+:0=+:30 ! parameter=+:52=+:103=+:menu_page_sync=+:Boolean=+:1=+:=+:0=+:40 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Demo - Page Navigation Menu=+:Demo block=+:52=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 ! function=+:0=+:0=+:0=+:endoflist=+:0=+:0 \ No newline at end of file --- 9,20 ---- block=+:=+:Demo - User Navigation Menu=+:Demo block=+:51=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:50=+:52=+:Page Navigation Menu=+:Site Navigation=+:mx_site_nav.php=+: ! parameter=+:52=+:155=+:menu_page_parent=+:Function=+:0=+:generate_page_jumpbox("{parameter_id}[]",0,0,"{parameter_value}")=+:0=+:10 ! parameter=+:52=+:100=+:Site menu=+:site_menu=+:=+:=+:0=+:20 ! parameter=+:52=+:101=+:menu_display_style=+:Radio_single_select=+:Overall_navigation=+:a:5:{i:0;s:7:"Classic";i:1;s:8:"Advanced";i:2;s:15:"Simple_CSS_menu";i:3;s:17:"Advanced_CSS_menu";i:4;s:18:"Overall_navigation";}=+:0=+:30 ! parameter=+:52=+:102=+:menu_display_mode=+:Radio_single_select=+:Horizontal=+:a:2:{i:0;s:8:"Vertical";i:1;s:10:"Horizontal";}=+:0=+:40 ! parameter=+:52=+:103=+:menu_page_sync=+:Boolean=+:1=+:=+:0=+:50 ! parameter=+:52=+:156=+:menu_custom_tpl=+:Text=+:=+:=+:1=+:60 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Demo - Page Navigation Menu=+:Demo block=+:52=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 ! function=+:0=+:0=+:0=+:endoflist=+:0=+:0 |