more classic skin work

mailnews/base/resources/content/mailTasksOverlay.xul

@@ -48,7 +48,7 @@
   </script>         
          
   <box id="taskButtons">
-    <button class="button-toolbar-4 plain taskbutton" id="mini-mail" onclick="toMessengerWindow()" 
+    <button class="button-toolbar-4 taskbutton" id="mini-mail" onclick="toMessengerWindow()" 
             position="2" tooltip="aTooltip" tooltiptext="&taskMessenger.tooltip;"/>
   </box>
   

themes/classic/communicator/menubuttonBindings.xml

@@ -15,4 +15,14 @@
     </content>
   </binding>
   
+  <binding id="menubutton-toolbar-single" extends="chrome://global/content/menulistBindings.xml#menubutton-single-left">
+    <content excludes="observes,template,menupopup">
+      <xul:box class="menubutton-toolbar-single-internal-box" flex="1" autostretch="never">
+        <xul:image class="menubutton-toolbar-single-icon" inherits="src,disabled"/>
+        <xul:text class="menubutton-toolbar-single-text" inherits="value,accesskey,crop,disabled" flex="1"/>
+        <xul:image class="menubutton-toolbar-single-dropmarker" inherits="disabled"/>
+      </xul:box>
+    </content>
+  </binding>
+  
 </bindings>

themes/classic/communicator/sidebar/win/sidebar.css

@@ -46,7 +46,6 @@
       border-top          : 1px solid threedhighlight;
       border-right        : 1px solid threedshadow;
       border-bottom       : 1px solid threedshadow;
-      margin-bottom       : 1px;
     }
     
   .box-texttab[last-panel="true"], .box-texttab[selected="true"]
@@ -96,7 +95,5 @@
 .iframe-panel
   {
     border-left           : 1px solid threedhighlight;
-    border-top            : 1px solid threedhighlight;
-    border-right          : 1px solid threedshadow;
     border-bottom         : 1px solid threedshadow;
   }  

themes/classic/communicator/win/button.css

@@ -19,7 +19,7 @@
       border              : 1px solid transparent;
     }
     
-  .button-toolbar-1:hover, .button-toolbar:hover, .button-toolbar-2:hover
+  .button-toolbar-1:hover, .button-toolbar:hover, .button-toolbar-2:hover, .button-toolbar-4:hover
     {
       border              : 1px solid threeddarkshadow;
       color               : #0000FF;

themes/classic/communicator/win/communicator.css

@@ -20,12 +20,42 @@
 
 #offline-status[offline="true"]
   {
-    list-style-image: url("chrome://communicator/skin/offline.gif");
+    list-style-image      : url("chrome://communicator/skin/offline.gif");
   }
 
 #offline-status
   {
-    list-style-image: url("chrome://communicator/skin/online.gif");
+    list-style-image      : url("chrome://communicator/skin/online.gif");
   }
   
-  
+
+/*
+ comment out really bad style rules, but leave them here so future intent is
+ clear
+   
+.tree-sidebar .thumb-box
+  {
+    border                : none;
+  }  
+  
+.tree-sidebar thumb
+  {
+    border-left           : 1px solid threedhighlight;
+    border-top            : 1px solid threedhighlight;
+    border-right          : 1px solid threedshadow;
+    border-bottom         : 1px solid threedshadow;
+  }  
+  
+.tree-sidebar .scrollbarbutton-box
+  {
+    border                : none;
+  }  
+  
+.tree-sidebar scrollbarbutton
+  {
+    border-left           : 1px solid threedhighlight;
+    border-top            : 1px solid threedhighlight;
+    border-right          : 1px solid threedshadow;
+    border-bottom         : 1px solid threedshadow;
+  }
+*/  

themes/classic/communicator/win/menubutton.css

@@ -52,3 +52,46 @@
      border-bottom          : 1px solid #CCCCCC;
    }
 
+/* toolbar menubuttons */   
+menubutton.button-toolbar-4
+  {
+    behavior                : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-toolbar-single");
+    border                  : 1px solid threedface;
+  }
+  
+menubutton.button-toolbar-4:hover
+  {
+    border                  : 1px solid threeddarkshadow;
+  }
+  
+.menubutton-toolbar-single-internal-box
+  {
+    border                  : 1px solid threedface;
+    padding                 : 1px 4px 1px 4px;
+  }  
+  
+menubutton.button-toolbar-4:hover > .menubutton-toolbar-single-internal-box
+  {
+    border-left             : 1px solid threedhighlight;
+    border-top              : 1px solid threedhighlight;
+    border-right            : 1px solid threedshadow;
+    border-bottom           : 1px solid threedshadow;
+  }  
+  
+menubutton.button-toolbar-4:hover:active > .menubutton-toolbar-single-internal-box,
+menubutton.button-toolbar-4[open="true"] > .menubutton-toolbar-single-internal-box
+  {
+    border-left             : 1px solid threedshadow;
+    border-top              : 1px solid threedshadow;
+    border-right            : 1px solid threedhighlight;
+    border-bottom           : 1px solid threedhighlight;
+    padding                 : 2px 3px 0px 5px;
+  }  
+  
+.menubutton-toolbar-single-dropmarker
+  {
+    padding-left            : 4px;
+    list-style-image        : url("chrome://global/skin/scroll-up.gif");
+  } 
+  
+  

themes/classic/communicator/win/tasksOverlay.css

@@ -21,8 +21,6 @@
 #taskbar 
   {
 	  margin-top            : 2px;
-	  min-height            : 1em;
-  	user-focus            : ignore;
   }
 
 .taskbutton 
@@ -36,7 +34,7 @@
     width                 : 1em;
   }
 
-#taskbar > toolbargrippy
+#taskbar-toolbar > toolbargrippy
   {
     display               : none;
   }

themes/classic/global/win/scrollbars.css

@@ -120,3 +120,4 @@ slider
     background-color      : scrollbar;
     background-image      : url("chrome://global/skin/scrollbar-slider-bg.gif");
   }
+  

xpfe/browser/resources/content/navigatorOverlay.xul

@@ -156,12 +156,12 @@ Contributor(s): ______________________________________. -->
 	      <menuitem id="menu_close"/>
 		    <menuitem id="context-savepage" key="savePage" observes="Browser:SavePage"/>
 		    <menuitem id="savepage" value="&saveFrameCmd.label;" accesskey="&saveFrameCmd.accesskey;" oncommand="savePage(gFocusedURL);" hidden="true"/>
-	      <menuseparator/>
+	      <menuseparator id="file_moduleSeparator"/>
 	      <menuitem accesskey="&editPageCmd.accesskey;" observes="Browser:EditPage" />
 	      <menuseparator/>
 	      <menuitem accesskey="&printSetupCmd.accesskey;" observes="Browser:PrintSetup"/>
 	      <menuitem accesskey="&printPreviewCmd.accesskey;" observes="Browser:PrintPreview"/>
-	      <menuitem accesskey="&printCmd.accesskey;" key="printKb" observes="Browser:Print"/>
+	      <menuitem id="printMenuItem" accesskey="&printCmd.accesskey;" key="printKb" observes="Browser:Print"/>
 	      <menuseparator />
 	      <menu id="offlineMenu">
 	        <menupopup id="offlineMenuPopup"/>
@@ -188,7 +188,7 @@ Contributor(s): ______________________________________. -->
 
   <menu id="menu_View" accesskey="v" value="&viewMenu.label;">
     <menupopup id="menu_View_Popup">
-    	 <menu value="&toolbarsCmd.label;"  >
+    	 <menu value="&toolbarsCmd.label;" id="view_toolbars">
 		  	<menupopup> 
 		  		<menuitem value="&navbarCmd.label;" observes="cmd_viewnavbar"  />
 		  		<menuitem value="&personalbarCmd.label;" observes="cmd_viewpersonaltoolbar" />
@@ -489,7 +489,6 @@ END of Deprecated -->
     <statusbarpanel id="offline-status"/>
     <progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0"/>
     <statusbarpanel id="statusbar-display" value="&statusText.label;" crop="right" flex="1"/>
-    <statusbarpanel id="statusbar-buildid" value="&buildId.label;"/>
     <statusbarpanel id="security-button"/>
   </statusbar>
 

xpfe/browser/resources/locale/en-US/navigator.dtd

@@ -4,9 +4,9 @@
 <!-- LOCALIZATION NOTE : FILE Do not translate accesskey and commandkey --> 
 
 <!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE --> 
-<!ENTITY mainWindow.title "&brandShortName;"> 
+<!ENTITY mainWindow.title "&brandShortName; {&buildId.label;}"> 
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE --> 
-<!ENTITY mainWindow.titlemodifier "&brandShortName;"> 
+<!ENTITY mainWindow.titlemodifier "&brandShortName; {&buildId.label;}"> 
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 <!ENTITY viewsourcetitle.preface "Source for: ">