--- C:\Apache Webs\drupal\drupal-4.7-modules\controlpanel\controlpanel.module	Tue Nov 08 16:04:02 2005
+++ C:\Apache Webs\phpMiX - phpmix.org\public_html\sites\default\modules\controlpanel\controlpanel.module	Sun Dec 18 00:24:29 2005
@@ -1,4 +1,6 @@
 <?php
+// $Id $
+
 /**
  * @file
  * Enables the use of graphical Control Panels that can be used for site navigation.
@@ -73,7 +75,7 @@
   if (variable_get('controlpanel_build_children' . $block, 0) != 0) {
     $content .= '<fieldset class="collapsible">';
     $content .= '<legend>' . $menu['items'][$mid]['title'] . '</legend>';
-   } 
+  }
   $content .= theme('controlpanel_panel_view', $mid, $block);
   
   if (variable_get('controlpanel_build_children' . $block, 0) && (variable_get('controlpanel_child_levels' . $block, 2) > 1) && ($menu_visible[$mid]['children'])) {
@@ -81,9 +83,9 @@
   }
   if (variable_get('controlpanel_build_children' . $block, 0) != 0) {
     $content .= '</fieldset>';
-   } 
+  }
 
-  If ($theme_page == TRUE) {
+  if ($theme_page == TRUE) {
     print theme('page', $content);
   } else {
     return $content;
@@ -104,27 +106,27 @@
     $image_directory = drupal_get_path('module', 'controlpanel') . '/images/' . variable_get('controlpanel_icon_size' . $block, '48x48');
   }
   
-  $content .= '<div id="' . $pid . '" class=control-panel>';
+  $content .= '<div id="control-panel-' . $pid . '" class="control-panel">';
   if (isset($menu_visible[$pid]) && $menu_visible[$pid]['children']) {
     foreach ($menu_visible[$pid]['children'] as $mid) {
       $content .= '<div class="control-panel-item control-panel-icon-size-' . variable_get('controlpanel_icon_size' . $block, '48x48') . '">';
-      $content .= '<a href=' . url($menu_visible[$mid]['path']) . '>';
+      $content .= '<a href="' . url($menu_visible[$mid]['path']) . '">';
       $file_name = $image_directory . '/' . str_replace('/', '_', $menu_visible[$mid]['path']) . '.png'; 
       if (file_exists($file_name)) {
         $src = $file_name;
       } else {
         $src = $image_directory . '/control_panel_default.png';
       }
-      $content .= '<div>';
-      $content .= '<img src=' . $src . '>';
-      $content .= '<br>' . $menu_visible[$mid]['title'];
-      $content .= '</div>';
+      $content .= '<span style="display:block;">';
+      $content .= '<img src="' . $src . '" alt="'. $menu_visible[$mid]['title'] .'" title="'. $menu_visible[$mid]['title'] .'" />';
+      $content .= '<br />' . $menu_visible[$mid]['title'];
+      $content .= '</span>';
       $content .= '</a>';
       $content .= '</div>';
     }
-    $content .= '</div>';
-    return $content;
   }
+  $content .= '</div>';
+  return $content;
 }
 /**
  * Build child panel(s) 
@@ -138,11 +140,11 @@
         $content .= '<fieldset class="collapsible collapsed">';
         $content .= '<legend>' . $menu['items'][$cid]['title'] . '</legend>';
         $content .= theme('controlpanel_panel_view', $cid, $block);
+        $content .= '</fieldset>';
         $content = theme('controlpanel_child_panel_view', $cid, $depth + 1, $content, $block);
       }  
     }
   }
-  $content .= '</fieldset>';
   return $content;
 }
 /**
