|
From: Jon O. <jon...@us...> - 2008-02-01 16:12:42
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14955 Modified Files: mx_menu_nav.php Log Message: renaming and moving of files... Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** mx_menu_nav.php 30 Jan 2008 09:10:58 -0000 1.25 --- mx_menu_nav.php 1 Feb 2008 16:12:01 -0000 1.26 *************** *** 65,68 **** --- 65,74 ---- { $template_tmp = $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 *************** *** 279,283 **** } ! $menu_icon = ( !empty($menuData['menu_icon']) && $menuData['menu_icon'] != 'none' ) ? '<img class="'.$icon_style.'" border="0" align="absmiddle" src="' . PORTAL_URL . $images['mx_graphics']['menu_icons'] . '/' . $icon_url . '" alt="' . $desc . '" /> ' : ''; } else --- 285,290 ---- } ! $icon_url = PORTAL_URL . $images['mx_graphics']['menu_icons'] . '/' . $icon_url; ! $menu_icon = ( !empty($menuData['menu_icon']) && $menuData['menu_icon'] != 'none' ) ? '<img class="'.$icon_style.'" border="0" align="absmiddle" src="' . $icon_url . '" alt="' . $desc . '" /> ' : ''; } else *************** *** 327,330 **** --- 334,338 ---- 'U_MENU_URL_TARGET' => $link_target, 'U_MENU_ICON' => $menu_icon, + 'MENU_ICON' => $icon_url, 'CURRENT' => $menuData['is_current'] ? '-current' : '', ); *************** *** 348,356 **** 'NUM_OF_CATS_EDIT' => $num_of_cats - 1, 'CAT_WIDTH' => $cat_width, ! //+ mxBB 'U_PORTAL_ROOT_PATH' => PORTAL_URL, 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, // --- 356,365 ---- 'NUM_OF_CATS_EDIT' => $num_of_cats - 1, 'CAT_WIDTH' => $cat_width, ! //+ mxBB 'U_PORTAL_ROOT_PATH' => PORTAL_URL, 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, + 'TEMPLATE_IMAGES_PATH' => $images['mx_menu_images'], // Full path // |