[mxbb-commits] core/modules/mx_navmenu NavigationMenu.pak, 1.12, 1.13 mx_menu_nav.php, 1.21, 1.22

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

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

Modified Files:
	NavigationMenu.pak mx_menu_nav.php 
Log Message:
Added custom icons for nav menu, and pages. New db fields
Added postgreSQL schema
Updated pak files

Index: mx_menu_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** mx_menu_nav.php	19 Jun 2007 18:31:00 -0000	1.21
--- mx_menu_nav.php	9 Jul 2007 21:57:51 -0000	1.22
***************
*** 256,275 ****
  		// Get menu icon
  		//
! 		$icon_tmp = ( file_exists($mx_root_path . $images['mx_graphics']['menu_icons'] . '/' . $menuData['menu_icon']) ? $menuData['menu_icon'] : 'icon_blank.gif' );
! 		$icon_url_hot = str_replace('.gif', '_hot.gif', $icon_tmp);
! 
! 		if ( file_exists($mx_root_path . $images['mx_graphics']['menu_icons'] . '/' . $icon_url_hot) )
  		{
! 			$icon_url = ( $menuData['is_current'] ) ? $icon_url_hot : $icon_tmp;
! 			$icon_style = ( $menuData['is_current'] ) ? 'mx_icon_hot' : 'mx_icon';
  		}
  		else
  		{
! 			$icon_url = $icon_tmp;
! 			$icon_style = '';
  		}
  
- 		$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 . '" />&nbsp;' : '';
- 
  		//
  		// Generate Links
--- 256,283 ----
  		// Get menu icon
  		//
! 		if (empty($menuData['menu_alt_icon']))
  		{
! 			$icon_tmp = ( file_exists($mx_root_path . $images['mx_graphics']['menu_icons'] . '/' . $menuData['menu_icon']) ? $menuData['menu_icon'] : 'icon_blank.gif' );
! 			$icon_url_hot = str_replace('.gif', '_hot.gif', $icon_tmp);
! 
! 			if ( file_exists($mx_root_path . $images['mx_graphics']['menu_icons'] . '/' . $icon_url_hot) )
! 			{
! 				$icon_url = ( $menuData['is_current'] ) ? $icon_url_hot : $icon_tmp;
! 				$icon_style = ( $menuData['is_current'] ) ? 'mx_icon_hot' : 'mx_icon';
! 			}
! 			else
! 			{
! 				$icon_url = $icon_tmp;
! 				$icon_style = '';
! 			}
! 
! 			$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 . '" />&nbsp;' : '';
  		}
  		else
  		{
! 			$icon_url = ( $menuData['is_current'] ) ? (!empty($menuData['menu_alt_icon_hot']) ? $menuData['menu_alt_icon_hot'] : $menuData['menu_alt_icon']) : $menuData['menu_alt_icon'];
! 			$menu_icon = '<img border="0" align="absmiddle" src="' . $icon_url . '" alt="' . $desc . '" />&nbsp;';
  		}
  
  		//
  		// Generate Links

Index: NavigationMenu.pak
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/NavigationMenu.pak,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** NavigationMenu.pak	10 Dec 2006 18:50:01 -0000	1.12
--- NavigationMenu.pak	9 Jul 2007 21:57:51 -0000	1.13
***************
*** 1,10 ****
! module=+:56=+:Navigation Menu=+:modules/mx_navmenu/=+:mxBB Portal Site Navigation=+:
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:56=+:11=+:Navigation Menu=+:Site Navigation Menu Blocks=+:mx_menu_nav.php=+:
! parameter=+:11=+:378=+: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=+:0
! parameter=+:11=+:334=+:Nav menu=+:nav_menu=+:=+:=+:0=+:10
! parameter=+:11=+:63=+:menu_display_mode=+:Radio_single_select=+:Vertical=+:a:2:{i:0;s:8:"vertical";i:1;s:10:"horizontal";}=+:0=+:20
! parameter=+:11=+:64=+:menu_page_sync=+:Boolean=+:0=+:=+:0=+:30
  parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
! block=+:=+:Demo - Navigation Menu=+:Demo block=+:11=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  function=+:0=+:0=+:0=+:endoflist=+:0=+:0
--- 1,10 ----
! module=+:50=+:Navigation Menu=+:modules/mx_navmenu/=+:mxBB Portal Site Navigation=+:
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
! function=+:50=+:51=+:Navigation Menu=+:Site Navigation Menu Blocks=+: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 - Navigation Menu=+:Demo block=+:51=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
  function=+:0=+:0=+:0=+:endoflist=+:0=+:0