[mxbb-commits] core/modules/mx_navmenu mx_menu_nav.php,1.22,1.23

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_navmenu
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1046/modules/mx_navmenu

Modified Files:
	mx_menu_nav.php 
Log Message:
This and that, while updating my work site...

Index: mx_menu_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** mx_menu_nav.php	9 Jul 2007 21:57:51 -0000	1.22
--- mx_menu_nav.php	19 Nov 2007 16:39:56 -0000	1.23
***************
*** 183,188 ****
  	$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>';
! 	$cat_url = ( $catData[0]['cat_url'] != 0 ) ? $cat_url_tmp : 'javascript:void(0)';
  
  	//
--- 183,189 ----
  	$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));
+ 	$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)' );
  
  	//
***************
*** 205,208 ****
--- 206,211 ----
  	$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 );
  
+ 	$style = $catData[0]['cat_url'] == $page_id && !$hasCurrentMenu ? 'cattitle' : 'genmed';
+ 
  	$template->assign_block_vars('catrow', array(
  		'CAT_ID'				=> intval($cat_id),
***************
*** 211,214 ****
--- 214,218 ----
  		'CATEGORY_URL'			=> $cat_url,
  		'CATEGORY_NAME'			=> $cat,
+ 		'CATEGORY_STYLE'		=> $style,
  		//'U_CAT_ICON'			=> $cat_icon,
  		'U_CAT_NAV_CONTRACT' 	=> $images['mx_contract'],
***************
*** 216,222 ****
  		'U_CAT_NAV_DYNAMIC' 	=> $cat_on ? $images['mx_contract'] : $images['mx_expand'],
  		'CAT_SHOW' 				=> $cat_on ? '' : 'none',
! 		'CURRENT' 				=> $current_cat ? '-current' : ''
  	));
  
  	if (!empty($cat_desc))
  	{
--- 220,235 ----
  		'U_CAT_NAV_DYNAMIC' 	=> $cat_on ? $images['mx_contract'] : $images['mx_expand'],
  		'CAT_SHOW' 				=> $cat_on ? '' : 'none',
! 		'CURRENT' 				=> $current_cat ? '-current' : '',
  	));
  
+ 	if ( $catData[0]['cat_url'] != 0 )
+ 	{
+ 		$template->assign_block_vars('catrow.modulerow_cat', array(
+ 			'CATEGORY_URL'			=> $cat_url,
+ 			'CATEGORY_NAME'			=> $cat,
+ 			'CATEGORY_STYLE'		=> $style,
+ 		));
+ 	}
+ 
  	if (!empty($cat_desc))
  	{
***************
*** 229,232 ****
--- 242,246 ----
  	// Loop through each menu in this category
  	//
+ 	$first_menu = true;
  	foreach($catData as $key => $menuData)
  	{
***************
*** 241,244 ****
--- 255,261 ----
  		}
  
+ 		$menu_sep = $first_menu ? '' : '|';
+ 		$first_menu = false;
+ 
  		$action = $menuData['menu_name'];
  		$action = ( !empty($lang[$action]) ? $lang[$action] : $action );
***************
*** 316,319 ****
--- 333,337 ----
  			'MENU_STYLE'		=> $style,
  			'MENU_DESC'			=> $desc,
+ 			'MENU_SEP'			=> $menu_sep,
  			'U_MENU_MODULE'		=> $menu_link,
  			'U_LINK_TARGET'		=> $link_target,