Index: menu-block.js =================================================================== --- menu-block.js (Revision 412) +++ menu-block.js (Arbeitskopie) @@ -3,8 +3,8 @@ $(document).ready( function() { $('#edit-parent') .html(Drupal.settings.menu_block.parent_options[Drupal.settings.menu_block.menus_default]) - .val(Drupal.settings.menu_block.parent_default) - .before(Drupal.settings.menu_block.menus); + .val(Drupal.settings.menu_block.parent_default); + $('#edit-parent-wrapper').before(Drupal.settings.menu_block.menus); $('#edit-parent-menu').change( function() { $('#edit-parent') .html(Drupal.settings.menu_block.parent_options[$('#edit-parent-menu').val()]) @@ -12,10 +12,10 @@ $(document).ready( function() { } ); $('#edit-follow').change( function() { if ($('#edit-follow:checked').length) { - $('#edit-follow-parent-wrapper').slideDown('slow'); + $('#edit-follow-parent-wrapper').slideDown('fast'); } else { - $('#edit-follow-parent-wrapper').slideUp('slow'); + $('#edit-follow-parent-wrapper').slideUp('fast'); } } ); if (!$('#edit-follow:checked').length) { Index: menu-block-admin.css =================================================================== --- menu-block-admin.css (Revision 412) +++ menu-block-admin.css (Arbeitskopie) @@ -1,79 +1,2 @@ /* $Id: menu-block-admin.css,v 1.2 2008/12/01 09:56:56 johnalbin Exp $ */ -#menu-block-settings .form-item -{ - padding-left: 200px; -} - -#menu-block-settings .form-checkboxes .form-item, -#menu-block-settings .form-radios .form-item -{ - padding-left: 0; -} - -#menu-block-settings .form-item label -{ - float: left; - width: 190px; - margin-left: -200px; - margin-right: 10px; - text-align: right; - _display: inline-block; /* IE6 is dumb. */ -} - -#menu-block-settings .form-item label.option, -.form-item #edit-parent-menu-wrapper label, -.form-item label#item-label, -#edit-follow-parent-wrapper.form-item label -{ - float: none; - width: auto; - margin-left: 0; - margin-right: 0; - text-align: left; -} - -.form-item #edit-parent-menu-wrapper -{ - padding-left: 0; - margin: 0; -} - -.form-item #edit-parent-menu-wrapper label, -.form-item label#item-label -{ - _display: block; /* IE6 is dumb. */ - font-weight: normal; - font-style: italic; -} - -#edit-follow-parent-wrapper.form-item label -{ - display: inline; - font-weight: normal; -} - -#expanded-wrapper strong, -#sort-wrapper strong -{ - float: left; - width: 190px; - margin-left: 0; - margin-right: 10px; - text-align: right; -} - -#expanded-wrapper fieldset .form-item, -#sort-wrapper fieldset .form-item -{ - display: inline; - margin-left: 0; - padding-left: 0; -} - -#expanded-wrapper fieldset .form-item .description, -#sort-wrapper fieldset .form-item .description -{ - display: block; - margin-left: 200px; -} Index: menu_block.admin.inc =================================================================== --- menu_block.admin.inc (Revision 412) +++ menu_block.admin.inc (Arbeitskopie) @@ -178,21 +178,20 @@ function _menu_block_block_configure($de $parent_options_js[$menu_name] = form_select_options(array('#value' => NULL), $options); } // Build a select element that is only needed for the jquery version. - $menus_select = theme('select', array( + $menus_select['parent_menu'] = array( + '#type' => 'select', '#title' => t('Menu'), '#value' => $menus_default, '#options' => $menus, - '#name' => 'parent_menu', '#id' => 'edit-parent-menu', '#size' => 1, '#required' => FALSE, '#multiple' => FALSE, - '#parents' => array('parent_menu'), - )); + ); // Load the javascript data. $settings = array( 'menu_block' => array( - 'menus' => $menus_select . '', + 'menus' => drupal_render($menus_select), 'menus_default' => $menus_default, 'parent_options' => $parent_options_js, 'parent_default' => $parent_default, @@ -271,15 +270,11 @@ function _menu_block_block_configure($de ); $form['expanded'] = array( '#type' => 'checkbox', - '#prefix' => '
' . t('Expand children') . ':', - '#suffix' => '
', - '#title' => t('Expand all the sub-menus of this tree.'), + '#title' => t('Expand all children of this tree.'), '#default_value' => variable_get("menu_block_{$delta}_expanded", 0), ); $form['sort'] = array( '#type' => 'checkbox', - '#prefix' => '
' . t('Sort') . ':', - '#suffix' => '
', '#title' => t('Sort menu tree by the active menu item’s trail.'), '#default_value' => variable_get("menu_block_{$delta}_sort", 0), '#description' => t('Sort each item in the active trail to the top of its level. When used on a deep or wide menu tree, the active menu item’s children will be easier to see when the page is reloaded.'),