diff -urpN ./README.txt /Users/torpy/Desktop/nice_menus/README.txt
--- ./README.txt 2008-11-28 11:58:55.000000000 +1100
+++ /Users/torpy/Desktop/nice_menus/README.txt 2008-11-28 11:13:52.000000000 +1100
@@ -21,6 +21,8 @@ Installation
5. Return to the blocks page and enable the nice menus block(s), e.g. 'Nice Menu 1 (Nice Menu)' by putting it in a region.
6. See below sections on Customization and Advanced Theming as well as the handbook page (http://drupal.org/node/185543) for more tips.
+NOTE: if you want to use Superfish enhaced menus you have to extract Superfish script to a superfish folder in the nice_menu module folder. The script as well as some examples of usage are available at http://users.tpg.com.au/j_birch/plugins/superfish/.
+
Upgrade
-------
Please read the UPGRADE.txt file for upgrade information.
diff -urpN ./nice_menus.module /Users/torpy/Desktop/nice_menus/nice_menus.module
--- ./nice_menus.module 2008-11-28 11:09:43.000000000 +1100
+++ /Users/torpy/Desktop/nice_menus/nice_menus.module 2008-11-28 11:29:20.000000000 +1100
@@ -147,10 +147,16 @@ function nice_menus_block($op = 'list',
);
$form['nice_menus_type_'. $delta] = array(
'#type' => 'select',
- '#title' => t('Menu Style'),
- '#description' => t('right: menu items are listed on top of each other and expand to the right') .'
'. t('left: menu items are listed on top of each other and expand to the left') .'
'. t('down: menu items are listed side by side and expand down'),
+ '#title' => t('Menu Type'),
+ '#description' => t('right: menu items are listed on top of each other and expand to the right') .'
'.
+ t('left: menu items are listed on top of each other and expand to the left') .'
'.
+ t('down: menu items are listed side by side and expand down') .'
'.
+ t('superfish-* menu types are only available if you have extracted superfish script to a superfish folder in the nice_menu module folder', array('@url' => 'http://users.tpg.com.au/j_birch/plugins/superfish/')),
'#default_value' => variable_get('nice_menus_type_'. $delta, 'right'),
- '#options' => drupal_map_assoc(array('right', 'left', 'down')),
+ '#options' => drupal_map_assoc(array(
+ 'right', 'left', 'down',
+ 'superfish-horizontal', 'superfish-vertical', 'superfish-navbar')
+ ),
);
return $form;
break;
@@ -164,8 +170,8 @@ function nice_menus_block($op = 'list',
case 'view':
// Build the nice menu for the block.
$pid = variable_get('nice_menus_menu_'. $delta, '1');
- $direction = variable_get('nice_menus_type_'. $delta, 'right');
- if ($output = theme('nice_menu', $delta, $pid, $direction)) {
+ $type = variable_get('nice_menus_type_'. $delta, 'right');
+ if ($output = theme('nice_menu', $delta, $pid, $type)) {
$block['content'] = $output['content'];
if (variable_get('nice_menus_type_'. $delta, 'right') == 'down') {
$class = 'nice-menu-hide-title';
@@ -207,7 +213,7 @@ function theme_nice_menu_tree($pid = 1,
$menu = isset($menu) ? $menu : menu_get_menu();
$output['content'] = '';
- $output['subject'] = check_plain($menu['items'][$pid]['title']);
+ // $output['subject'] = check_plain($menu['items'][$pid]['title']);
if ($menu['visible'][$pid]['children']) {
// Build class name based on menu path
@@ -242,7 +248,7 @@ function theme_nice_menu_tree($pid = 1,
* The nice menu ID.
* @param $pid
* The parent menu ID from which to build the nice menu
- * @param $direction
+ * @param $type
* Optional. The direction the menu expands. Default is 'right'.
* @param $menu
* Optional. A custom menu array to use for theming --
@@ -251,12 +257,53 @@ function theme_nice_menu_tree($pid = 1,
* @return
* An HTML string of nice menu links.
*/
-function theme_nice_menu($id, $pid, $direction = 'right', $menu = NULL) {
+function theme_nice_menu($id, $pid, $type = 'right', $menu = NULL) {
+ $classes = '';
+ $type_exploded = explode('-', $type);
+ if ($type_exploded[0] == 'superfish') {
+ drupal_add_css(drupal_get_path('module', 'nice_menus') .'/superfish/css/superfish.css');
+ drupal_add_js(drupal_get_path('module', 'nice_menus') .'/superfish/js/hoverIntent.js');
+ drupal_add_js(drupal_get_path('module', 'nice_menus') .'/superfish/js/supersubs.js');
+ drupal_add_js(drupal_get_path('module', 'nice_menus') .'/superfish/js/superfish.js');
+ $classes .= " sf-menu";
+ switch ($type_exploded[1]) {
+ case 'vertical':
+ drupal_add_css(drupal_get_path('module', 'nice_menus') .'/superfish/css/superfish-vertical.css');
+ $classes .= " sf-vertical";
+ break;
+ case 'navbar':
+ drupal_add_css(drupal_get_path('module', 'nice_menus') .'/superfish/css/superfish-navbar.css');
+ $classes .= " sf-navbar";
+ break;
+ }
+ $superfish = "jQuery(function(){jQuery('ul.sf-menu').supersubs({minWidth: 12, maxWidth: 27, extraWidth: 1}).superfish();});";
+ drupal_add_js($superfish, $type="inline");
+ }
+
+ else {
+ $classes .= ' nice-menu nice-menu-'. $type;
+ // Add JavaScript, if enabled.
+ if (variable_get('nice_menus_ie', 1) == 1) {
+ drupal_add_js(drupal_get_path('module', 'nice_menus') .'/nice_menus.js');
+ }
+
+ // Add main CSS functionality.
+ drupal_add_css(drupal_get_path('module', 'nice_menus') .'/nice_menus.css');
+ // Add custom CSS layout if specified.
+ if ($custom = variable_get('nice_menus_custom_css', '')) {
+ drupal_add_css($custom);
+ }
+ // Fall back to default layout.
+ else {
+ drupal_add_css(drupal_get_path('module', 'nice_menus') .'/nice_menus_default.css');
+ }
+ }
$output = array();
if ($menu_tree = theme('nice_menu_tree', $pid, $menu)) {
if ($menu_tree['content']) {
- $output['content'] = ''."\n";
+ #TODO: pakeisti
+ $output['content'] = ''."\n";
$output['subject'] = $menu_tree['subject'];
}
}
@@ -266,7 +313,7 @@ function theme_nice_menu($id, $pid, $dir
/**
* Theme primary links as nice menus
*
- * @param $direction
+ * @param $type
* Optional. The direction the menu expands. Default is 'down'.
* @param $menu
* Optional. A custom menu array to use for theming --
@@ -275,8 +322,8 @@ function theme_nice_menu($id, $pid, $dir
* @return
* An HTML string of nice menu primary links.
*/
-function theme_nice_menu_primary_links($direction = 'down', $menu = NULL) {
+function theme_nice_menu_primary_links($type = 'down', $menu = NULL) {
$pid = variable_get('menu_primary_menu', 0);
- $output = theme('nice_menu', 'primary', $pid, $direction, $menu);
+ $output = theme('nice_menu', 'primary', $pid, $type, $menu);
return $output['content'];
}