*** blockbar.module	2006-05-26 05:01:04.000000000 +0400
--- blockbar.module	2006-06-14 14:07:40.607624415 +0400
***************
*** 38,58 ****
    // get all blocks assigned to the region thats assigned to this blockbar
    $blocks = blockbar_block_list(variable_get('blockbar_region' . $block_num, NULL));
  
!   //the following <span> tag is needed to control javascript behavior
!   $content = '<span id="block_bar_num" class="' . variable_get('blockbar_number_of_blocks', 0) . '">';
    $i = 1;
    foreach ($blocks as $key => $block) {
      $block_id = '_block' . $block_num . '_sub' . $i;
      $content .= theme('blockbar_build_panels', $block->subject, $block_id, $block_num, $block);
      $i++;
    }
!   $content .= '</span>';
    //the following <span> tags are needed to control javascript behavior
!   $content .= '<span id=block_bar_panel' . $block_num . ' class=' . ($i-1) . '></span>';
    $sticky = (variable_get('blockbar_save_state' . $block_num, 1) == 1) ? 'block_sticky' : '';
!   $content .= '<span id=block_bar_sticky' . $block_num . ' class=' . $sticky . '></span>';
    $unique = (variable_get('blockbar_open_unique' . $block_num, 1) == 1) ? 'block_unique' : '';
!   $content .= '<span id=block_bar_unique' . $block_num . ' class=' . $unique . '></span>';
  
    return $content;
  }
--- 38,58 ----
    // get all blocks assigned to the region thats assigned to this blockbar
    $blocks = blockbar_block_list(variable_get('blockbar_region' . $block_num, NULL));
  
!   //the following <div> tag is needed to control javascript behavior
!   $content = '<div id="block_bar_num'.$block_num.'" class="' . variable_get('blockbar_number_of_blocks', 0) . '">';
    $i = 1;
    foreach ($blocks as $key => $block) {
      $block_id = '_block' . $block_num . '_sub' . $i;
      $content .= theme('blockbar_build_panels', $block->subject, $block_id, $block_num, $block);
      $i++;
    }
!   $content .= '</div>';
    //the following <span> tags are needed to control javascript behavior
!   $content .= '<span id="block_bar_panel' . $block_num . '" class="' . ($i-1) . '"></span>';
    $sticky = (variable_get('blockbar_save_state' . $block_num, 1) == 1) ? 'block_sticky' : '';
!   $content .= '<span id="block_bar_sticky' . $block_num . '" class="' . $sticky . '"></span>';
    $unique = (variable_get('blockbar_open_unique' . $block_num, 1) == 1) ? 'block_unique' : '';
!   $content .= '<span id="block_bar_unique' . $block_num . '" class="' . $unique . '"></span>';
  
    return $content;
  }
***************
*** 62,70 ****
    // being called in the onclick event of the title <div>
    
    $output .= '<div class="blockbar-title blockbar-' . $blockbar_num . '-title" onclick="blockbar_toggle(\'' . $panel_id . '\',\'' . $blockbar_num . '\')">';
!   $output .= '      <div align="center" class="blockbar-head-img collapse" id="blockbarhead_' . $panel_id . '">';
    $output .= '      </div>';
!   $output .= '    <div class="blockbar-head blockbar-' . $blockbar_num . '-head" nowrap>' . $panel_title . '</div>';
    $output .= '</div>';
    $output .= '<div class="blockbar-content blockbar-'. $blockbar_num .'-content" id="' . $panel_id . '" style="display:none;">'; 
    $output .= $block->content;
--- 62,70 ----
    // being called in the onclick event of the title <div>
    
    $output .= '<div class="blockbar-title blockbar-' . $blockbar_num . '-title" onclick="blockbar_toggle(\'' . $panel_id . '\',\'' . $blockbar_num . '\')">';
!   $output .= '      <div class="blockbar-head-img collapse" id="blockbarhead_' . $panel_id . '">';
    $output .= '      </div>';
!   $output .= '    <div class="blockbar-head blockbar-' . $blockbar_num . '-head" >' . $panel_title . '</div>';
    $output .= '</div>';
    $output .= '<div class="blockbar-content blockbar-'. $blockbar_num .'-content" id="' . $panel_id . '" style="display:none;">'; 
    $output .= $block->content;
*** blockbar.js	2005-11-04 21:05:28.000000000 +0300
--- blockbar.js	2006-06-14 13:54:35.882207093 +0400
***************
*** 48,54 ****
  }
  
  function blockbar_onload(){
!   var bar1 = document.getElementById("block_bar_num")
    var bar_num = (+bar1.getAttributeNode("class").value)+1
    var cookie_name = "", cookie_value = ""
    for (var i=1; i<bar_num; i++){
--- 48,54 ----
  }
  
  function blockbar_onload(){
!   var bar1 = document.getElementById("block_bar_num1")
    var bar_num = (+bar1.getAttributeNode("class").value)+1
    var cookie_name = "", cookie_value = ""
    for (var i=1; i<bar_num; i++){
***************
*** 68,74 ****
  }
  
  function blockbar_save_state(){
!   var bar1 = document.getElementById("block_bar_num")
    var bar_num = (+bar1.getAttributeNode("class").value)+1
    var cookie_name = "", cookie_value = "", block_id = ""
  
--- 68,74 ----
  }
  
  function blockbar_save_state(){
!   var bar1 = document.getElementById("block_bar_num1")
    var bar_num = (+bar1.getAttributeNode("class").value)+1
    var cookie_name = "", cookie_value = "", block_id = ""