Menu
▾
▴
[mxbb-commits] core/modules/mx_navmenu mx_site_nav.php, 1.10, 1.11 mx_site_nav2.php, 1.1, 1.2
|
From: Florin C B. <ory...@us...> - 2013-06-02 09:40:22
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31140 Modified Files: mx_site_nav.php mx_site_nav2.php Log Message: navigation menu upgrade to v3 Index: mx_site_nav2.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_site_nav2.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_site_nav2.php 21 Oct 2012 00:04:11 -0000 1.1 --- mx_site_nav2.php 2 Jun 2013 09:40:19 -0000 1.2 *************** *** 4,8 **** * @package MX-Publisher Module - mx_navmenu * @version $Id$ ! * @copyright (c) 2002-2006 [Jon Ohlsson] MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com --- 4,8 ---- * @package MX-Publisher Module - mx_navmenu * @version $Id$ ! * @copyright (c) 2002-2008 [Jon Ohlsson] MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com *************** *** 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++ ) --- 30,34 ---- // Setup config parameters // ! $config_name = array('menu_custom_tpl', 'menu_display_mode', 'menu_page_parent'); for( $i = 0; $i < count($config_name); $i++ ) *************** *** 41,57 **** // 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; --- 41,46 ---- *************** *** 61,65 **** // $nav_def_key = 'MX_SITE_MENU_' . $block_id; - if ( defined($nav_def_key) ) { --- 50,53 ---- *************** *** 74,117 **** // $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; } } ! $template->set_filenames($template_tmp); generate_site_menu($page_parent); --- 62,91 ---- // $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); + $virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, ''); ! if (!empty($menu_custom_tpl) && !in_array($menu_custom_tpl, array('Classic','Advanced','Simple_CSS_menu','Advanced_CSS_menu','Overall_navigation'))) { ! $template_tmp = $menu_custom_tpl; } else { ! switch( $menu_display_mode ) { ! case 'Horizontal': ! $template_tmp = 'mx_menu_horizontal.tpl'; break; ! case 'Vertical': ! $template_tmp = 'mx_menu_vertical.tpl'; break; case 'Overall_navigation': ! $template_tmp = 'mx_menu_overall_navigation.tpl'; break; default: ! $template_tmp = 'mx_menu_vertical.tpl'; break; } } ! $template->set_filenames(array('body' => $template_tmp)); generate_site_menu($page_parent); *************** *** 132,137 **** 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, // ! // mygosmenu // 'MX_ROOT_PATH' => $mx_root_path, --- 106,117 ---- 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, + //phpBB + 'U_SEARCH' => mx_append_sid(PHPBB_URL .'search.'.$phpEx), + 'U_SEARCH_UNANSWERED' => mx_append_sid(PHPBB_URL . 'search.'.$phpEx.'?search_id=unanswered'), + 'U_SEARCH_SELF' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=egosearch'), + 'U_SEARCH_NEW' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=newposts'), + // ! // css // 'MX_ROOT_PATH' => $mx_root_path, Index: mx_site_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_site_nav.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mx_site_nav.php 29 Dec 2011 05:51:52 -0000 1.10 --- mx_site_nav.php 2 Jun 2013 09:40:19 -0000 1.11 *************** *** 4,8 **** * @package MX-Publisher Module - mx_navmenu * @version $Id$ ! * @copyright (c) 2002-2008 [Jon Ohlsson] MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com --- 4,8 ---- * @package MX-Publisher Module - mx_navmenu * @version $Id$ ! * @copyright (c) 2002-2006 [Jon Ohlsson] MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com *************** *** 30,34 **** // Setup config parameters // ! $config_name = array('menu_custom_tpl', 'menu_display_mode', '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,46 **** --- 41,57 ---- // 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; *************** *** 50,53 **** --- 61,65 ---- // $nav_def_key = 'MX_SITE_MENU_' . $block_id; + if ( defined($nav_def_key) ) { *************** *** 62,91 **** // $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); - $virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, ''); ! if (!empty($menu_custom_tpl) && !in_array($menu_custom_tpl, array('Classic','Advanced','Simple_CSS_menu','Advanced_CSS_menu','Overall_navigation'))) { ! $template_tmp = $menu_custom_tpl; } else { ! switch( $menu_display_mode ) { ! case 'Horizontal': ! $template_tmp = 'mx_menu_horizontal.tpl'; break; ! case 'Vertical': ! $template_tmp = 'mx_menu_vertical.tpl'; break; ! case 'Overall_navigation': ! $template_tmp = 'mx_menu_overall_navigation.tpl'; break; default: ! $template_tmp = 'mx_menu_vertical.tpl'; break; } } ! $template->set_filenames(array('body' => $template_tmp)); generate_site_menu($page_parent); --- 74,133 ---- // $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); ! if (!empty($menu_custom_tpl)) { ! $template_tmp = array('body' => $menu_custom_tpl); ! $template_tmp_path = str_replace(strrchr($template_tmp, '/'), '', $template_tmp) . '/'; ! $kick_js = @file_exists($mx_root_path . $module_root_path . 'templates/' .$mx_user->template_names[$module_root_path] . $template_tmp_path) ? ($menu_display_mode == 'Horizontal' ? 'horizontal' : 'vertical') : ''; ! if (!empty($kick_js)) ! { ! $mx_page->add_footer_text( 'templates/' . $mx_user->template_names[$module_root_path] . $template_tmp_path . $kick_js . '.js', true ); ! } } 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; } + + switch( $menu_display_mode ) + { + case 'Overall_navigation': + $template_tmp = array('body' => 'mx_menu_overall_standard.tpl'); + break; + default: + $template_tmp = $template_tmp; + break; + } } ! $template->set_filenames($template_tmp); generate_site_menu($page_parent); *************** *** 106,117 **** 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, - //phpBB - 'U_SEARCH' => mx_append_sid(PHPBB_URL .'search.'.$phpEx), - 'U_SEARCH_UNANSWERED' => mx_append_sid(PHPBB_URL . 'search.'.$phpEx.'?search_id=unanswered'), - 'U_SEARCH_SELF' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=egosearch'), - 'U_SEARCH_NEW' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=newposts'), - // ! // css // 'MX_ROOT_PATH' => $mx_root_path, --- 148,153 ---- 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, // ! // mygosmenu // 'MX_ROOT_PATH' => $mx_root_path, |
