Index: /Users/dburns/Sites/sonymulti/daughtry/trunk/public_html/sites/all/themes/daveburns/panels_accordion/panels_accordion.module =================================================================== --- /Users/dburns/Sites/sonymulti/daughtry/trunk/public_html/sites/all/themes/daveburns/panels_accordion/panels_accordion.module (revision 5665) +++ /Users/dburns/Sites/sonymulti/daughtry/trunk/public_html/sites/all/themes/daveburns/panels_accordion/panels_accordion.module (working copy) @@ -29,11 +29,11 @@ }*/ drupal_add_js('$(document).ready(function(){ - $("#panels_accordion-' .$panel_id .' .panel-pane .content:not(:first)").hide(); - $("#panels_accordion-' .$panel_id .' .panel-pane span a").' .$settings['action']. '(function(){ - $("#panels_accordion-' .$panel_id .' .panel-pane span a").removeClass("active"); + $("#panels_accordion-' .$panel_id .' .content:not(:first)").hide(); + $("#panels_accordion-' .$panel_id .' span a").' .$settings['action']. '(function(){ + $("#panels_accordion-' .$panel_id .' span a").removeClass("active"); $(this).addClass("active"); - $("#panels_accordion-' .$panel_id .' .panel-pane .content:visible").' .$reverse_action[$settings['effect']]. '("' .$settings['speed'].'"); + $("#panels_accordion-' .$panel_id .' .content:visible").' .$reverse_action[$settings['effect']]. '("' .$settings['speed'].'"); $(this).parent().parent().next().' .$settings['effect']. '("' .$settings['speed'].'"); return false; }); @@ -43,8 +43,8 @@ $output .= '
'; $class = 'class="active"'; foreach ($panes as $pane_id => $pane) { - $pane->subject = '' .strip_tags($pane->subject, '

'). ''; - $output .= theme('panels_pane', $pane, $display); + $pane->subject = '' .strip_tags($pane->title, '

'). ''; + $output .= theme('panels_pane', $pane, $display->content[$pane_id], $display); $class = ''; } $output .= '

'; @@ -68,7 +68,7 @@ '#type' => 'radios', '#title' => t('Action'), '#options' => array('click' => t('Click'), 'mouseover' => t('Mouse Over')), - '#default_value' => isset($style_settings['action']) ? $style_settings['action'] : 'click', + '#default_value' => isset($style_settings['action']) ? $style_settings['action'] : $style_settings['action'] = 'click', '#description' => t('Choose what event will make the action occur'), ); $form['effect'] = array( @@ -75,7 +75,7 @@ '#type' => 'radios', '#title' => t('Effect'), '#options' => array('slideDown' => t('Slide Down'), 'fadeIn' => t('Fade In'), 'show' => t('Show')), - '#default_value' => isset($style_settings['effect']) ? $style_settings['effect'] : 'slideUp', + '#default_value' => isset($style_settings['effect']) ? $style_settings['effect'] : $style_settings['effect'] = 'slideUp', '#description' => t('Choose what effect will occur when focus area is triggered'), ); $form['speed'] = array( @@ -82,7 +82,7 @@ '#type' => 'radios', '#title' => t('Speed'), '#options' => array('slow' => t('Slow'), 'normal' => t('Normal'), 'fast' => t('Fast')), - '#default_value' => isset($style_settings['speed']) ? $style_settings['speed'] : 'normal', + '#default_value' => isset($style_settings['speed']) ? $style_settings['speed'] : $style_settings['speed'] = 'normal', '#description' => t('Choose the speed at which the effects will occur'), ); // need to check for alternative to this method of MouseOver Delays