Menu
▾
▴
[mxbb-commits] core/modules/mx_navmenu NavigationMenu.pak, 1.15, 1.16 mx_menu_nav.php, 1.24, 1.25 mx_site_nav.php, 1.3, 1.4
|
From: Jon O. <jon...@us...> - 2008-01-30 09:11:35
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7690/modules/mx_navmenu Modified Files: NavigationMenu.pak mx_menu_nav.php mx_site_nav.php Log Message: BlockCP - updated what features should be adminCP options only Schemas - no point updating the module INSERTS with full spec Sitelog - updated sitemap and pagination mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom ...more to come ;) Tinymce updates wherever needed - admin has full interface, users less options. mx_users - bugfix for renaming users Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** mx_menu_nav.php 22 Dec 2007 02:56:18 -0000 1.24 --- mx_menu_nav.php 30 Jan 2008 09:10:58 -0000 1.25 *************** *** 30,34 **** // Setup config parameters // ! $config_name = array('menu_display_style', 'menu_display_mode', 'menu_page_sync'); for( $i = 0; $i < count($config_name); $i++ ) --- 30,34 ---- // Setup config parameters // ! $config_name = array('menu_custom_tpl', 'menu_display_mode'); for( $i = 0; $i < count($config_name); $i++ ) *************** *** 41,47 **** // Define some parameters // ! $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' ); // --- 41,46 ---- // Define some parameters // ! $menu_custom_tpl = $mx_menu_config['menu_custom_tpl']; $menu_display_mode = $mx_menu_config['menu_display_mode']; // *************** *** 50,54 **** // $nav_def_key = 'MX_NAV_MENU_' . $block_id; - if ( defined($nav_def_key) ) { --- 49,52 ---- *************** *** 64,99 **** $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; } ! $template->set_filenames($template_tmp); // --- 62,89 ---- $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); ! 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)); // *************** *** 144,148 **** // $catData[$key]['is_current'] = false; ! if ( $menu_page_sync && !$hasCurrentMenu) { if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false ) --- 134,138 ---- // $catData[$key]['is_current'] = false; ! if (!$hasCurrentMenu) { if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false ) *************** *** 154,158 **** $catData[$key]['is_current'] = true; } ! else if ( $menu_display_style == 'Overall_navigation' && $current_cat && $menuData['page_id'] == $page_id ) { $catData[$key]['is_current'] = true; --- 144,148 ---- $catData[$key]['is_current'] = true; } ! else if ( $menu_display_mode == 'Overall_navigation' && $current_cat && $menuData['page_id'] == $page_id ) { $catData[$key]['is_current'] = true; *************** *** 185,189 **** $cat_url_tmp_this = mx_append_sid(PORTAL_URL . 'index.php?page=' . $page_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>'; ! $cat_url = ( $catData[0]['cat_url'] != 0 ) ? $cat_url_tmp : ( $menu_display_style == 'Classic' ? $cat_url_tmp_this : 'javascript:void(0)' ); // --- 175,179 ---- $cat_url_tmp_this = mx_append_sid(PORTAL_URL . 'index.php?page=' . $page_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>'; ! $cat_url = ( $catData[0]['cat_url'] != 0 ) ? $cat_url_tmp : $cat_url_tmp_this; // *************** *** 204,207 **** --- 194,198 ---- // Generate the fold/unfold categories switches // + //echo(intval($current_cat) . intval($hasCurrentMenu) . intval($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id])); $cat_on = $current_cat || $hasCurrentMenu ? true : ( isset($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id]) ? $HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id] == 1 : $catData[0]['cat_show'] == 1 ); *************** *** 212,219 **** 'BLOCK_ID' => intval($block_id), 'CATEGORY' => $catt, - 'CATEGORY_URL' => $cat_url, 'CATEGORY_NAME' => $cat, 'CATEGORY_STYLE' => $style, ! //'U_CAT_ICON' => $cat_icon, 'U_CAT_NAV_CONTRACT' => $images['mx_contract'], 'U_CAT_NAV_EXPAND' => $images['mx_expand'], --- 203,209 ---- 'BLOCK_ID' => intval($block_id), 'CATEGORY' => $catt, 'CATEGORY_NAME' => $cat, 'CATEGORY_STYLE' => $style, ! 'U_CATEGORY_URL' => $cat_url, 'U_CAT_NAV_CONTRACT' => $images['mx_contract'], 'U_CAT_NAV_EXPAND' => $images['mx_expand'], *************** *** 225,231 **** if ( $catData[0]['cat_url'] != 0 ) { ! $template->assign_block_vars('catrow.modulerow_cat', array( ! 'CATEGORY_URL' => $cat_url, 'CATEGORY_NAME' => $cat, 'CATEGORY_STYLE' => $style, )); --- 215,221 ---- if ( $catData[0]['cat_url'] != 0 ) { ! $template->assign_block_vars('catrow.menurow_cat', array( 'CATEGORY_NAME' => $cat, + 'U_CATEGORY_URL' => $cat_url, 'CATEGORY_STYLE' => $style, )); *************** *** 334,347 **** 'MENU_DESC' => $desc, 'MENU_SEP' => $menu_sep, ! 'U_MENU_MODULE' => $menu_link, ! 'U_LINK_TARGET' => $link_target, ! 'U_MENU_ICON' => $menu_icon ); ! $template->assign_block_vars('catrow.modulerow', $menu_array); if ($current_cat) { ! $template->assign_block_vars('modulerow', $menu_array); } } --- 324,338 ---- 'MENU_DESC' => $desc, 'MENU_SEP' => $menu_sep, ! 'U_MENU_URL' => $menu_link, ! 'U_MENU_URL_TARGET' => $link_target, ! 'U_MENU_ICON' => $menu_icon, ! 'CURRENT' => $menuData['is_current'] ? '-current' : '', ); ! $template->assign_block_vars('catrow.menurow', $menu_array); if ($current_cat) { ! $template->assign_block_vars('menurow', $menu_array); } } *************** *** 364,368 **** // ! // mygosmenu // 'MX_ROOT_PATH' => $mx_root_path, --- 355,359 ---- // ! // 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.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_site_nav.php 23 Dec 2007 00:12:01 -0000 1.3 --- mx_site_nav.php 30 Jan 2008 09:10:58 -0000 1.4 *************** *** 30,34 **** // Setup config parameters // ! $config_name = array('menu_display_style', 'menu_display_mode', 'menu_page_sync'); for( $i = 0; $i < count($config_name); $i++ ) --- 30,34 ---- // Setup config parameters // ! $config_name = array('menu_custom_tpl', 'menu_display_mode'); for( $i = 0; $i < count($config_name); $i++ ) *************** *** 41,50 **** // Define some parameters // ! //$menu_display_style = $mx_menu_config['menu_display_style']; ! $menu_display_style = 'Overall_navigation'; ! //$menu_display_mode = $mx_menu_config['menu_display_mode']; ! $menu_display_mode == 'Horizontal'; ! //$menu_page_sync = ( $mx_menu_config['menu_page_sync'] != 'No' ); ! $menu_page_sync = true; // --- 41,46 ---- // Define some parameters // ! $menu_custom_tpl = $mx_menu_config['menu_custom_tpl']; ! $menu_display_mode = $mx_menu_config['menu_display_mode']; // *************** *** 53,57 **** // $nav_def_key = 'MX_SITE_MENU_' . $block_id; - if ( defined($nav_def_key) ) { --- 49,52 ---- *************** *** 67,102 **** $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; } ! $template->set_filenames($template_tmp); generate_site_menu(); --- 62,89 ---- $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); ! 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(); *************** *** 124,128 **** // ! // mygosmenu // 'MX_ROOT_PATH' => $mx_root_path, --- 111,115 ---- // ! // css // 'MX_ROOT_PATH' => $mx_root_path, Index: NavigationMenu.pak =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/NavigationMenu.pak,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** NavigationMenu.pak 12 Aug 2007 20:55:41 -0000 1.15 --- NavigationMenu.pak 30 Jan 2008 09:10:58 -0000 1.16 *************** *** 3,9 **** 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 ! parameter=+:51=+:63=+:menu_display_mode=+:Radio_single_select=+:Vertical=+:a:2:{i:0;s:8:"Vertical";i:1;s:10:"Horizontal";}=+:0=+:30 ! parameter=+:51=+:64=+:menu_page_sync=+:Boolean=+:0=+:=+:0=+:40 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Demo - User Navigation Menu=+:Demo block=+:51=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 --- 3,8 ---- 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_custom_tpl=+:Text=+:=+:=+:1=+:20 ! parameter=+:51=+:63=+:menu_display_mode=+:Radio_single_select=+:Vertical=+:a:3:{i:0;s:8:"Vertical";i:1;s:10:"Horizontal";i:2;s:18:"Overall_navigation";}=+:0=+:30 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Demo - User Navigation Menu=+:Demo block=+:51=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 *************** *** 11,17 **** function=+:50=+:52=+:Page Navigation Menu=+:Site Navigation=+:mx_site_nav.php=+: 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 --- 10,15 ---- function=+:50=+:52=+:Page Navigation Menu=+:Site Navigation=+:mx_site_nav.php=+: parameter=+:52=+:100=+:Site menu=+:site_menu=+:=+:=+:0=+:10 ! parameter=+:52=+:102=+:menu_display_mode=+:Radio_single_select=+:Horizontal=+:a:3:{i:0;s:8:"Vertical";i:1;s:10:"Horizontal";i:2;s:18:"Overall_navigation";}=+:1=+:20 ! parameter=+:52=+:101=+:menu_custom_tpl=+:Text=+:=+:=+:1=+:30 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Demo - Page Navigation Menu=+:Demo block=+:52=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 |
