Fix 23606, 'Sidebar shows incorrect cursor.' Use a box instead of a splitter when the sidebar is the only thing there (e.g. no mail folders).

suite/common/sidebar/sidebarOverlay.css

@@ -94,7 +94,7 @@ iframe.panel-frame {
 /*
  *  Sidebar and Panel title buttons
  */
-splitter.sidebar-main-header {
+.sidebar-main-header {
   color: #CCFFFF;
   background-color: #003366;
   padding: 0px;
@@ -102,16 +102,16 @@ splitter.sidebar-main-header {
   padding-right: 5px;
 }
 
-splitter.sidebar-main-header div {
+.sidebar-main-header > div {
   font-weight: bold;
   margin: 2px;
 }
 
-splitter.sidebar-main-header titledbutton {
+.sidebar-main-header > titledbutton {
   padding: 0px;
 }
 
-splitter.sidebar-main-header titledbutton:hover {
+.sidebar-main-header > titledbutton:hover {
   color: white;
 }
 

suite/common/sidebar/sidebarOverlay.js

@@ -113,6 +113,15 @@ function sidebar_overlay_init() {
       debug("sidebarObj.resource = " + sidebarObj.resource);
       debug("sidebarObj.datasource_uri = " + sidebarObj.datasource_uri);
 
+      // Show the header for the panels area. Use a splitter if there
+      // is stuff over the panels area.
+      var title_box = document.getElementById('title-box');
+      if (sidebar_element.firstChild == title_box) {
+        title_box.removeAttribute('hidden');
+      } else {
+        document.getElementById('title-splitter').removeAttribute('hidden');
+      }
+      
       // Add the user's current panel choices to the template builder,
       // which will aggregate it with the other datasources that describe
       // the individual panel's title, customize URL, and content URL.

suite/common/sidebar/sidebarOverlay.xul

@@ -29,8 +29,19 @@
   <!-- Overlay the sidebar panels -->
   <box id="sidebar-box" align="vertical"
     persist="hidden width collapsed">
-    <splitter id="title-box" class="sidebar-main-header" collapse="after"
-      persist="state" onmouseup="PersistHeight();">
+    <!-- Make sure title-box and title-spitter stay in sync. -->
+    <box id="title-box" class="sidebar-main-header" hidden="true">
+      <html:div class="panel-bar">
+        &sidebar.panels.label;
+      </html:div>
+      <spring flex="100%"/>
+      <titledbutton class="toolbar-flat"
+        value="&sidebar.customize.label;" 
+        oncommand="SidebarCustomize();"/>
+    </box>
+    <splitter id="title-splitter" class="sidebar-main-header" collapse="after"
+      persist="state" onmouseup="PersistHeight();"
+      hidden="true">
       <html:div class="panel-bar">
         &sidebar.panels.label;
       </html:div>