Bug 480533 "know your rights" is not findable - add buttons for about your rights and contributors to the about dialog. r=philringnalda,ui-review=clarkbw

mail/base/content/aboutDialog.js

@@ -84,3 +84,11 @@ function switchPage(aEvent) {
   }
   document.getElementById("modes").setAttribute("selectedIndex", gSelectedPage);
 }
+
+function loadAbout(type)
+{
+  window.openDialog("chrome://messenger/content/", "_blank",
+                    "chrome,dialog=no,all", null,
+                    { tabType: "contentTab",
+                      tabParams: { contentPage: "about:" + type } });
+}

mail/base/content/aboutDialog.xul

@@ -57,7 +57,7 @@
         onload="onLoad();" onunload="onUnload(event);"
         title="&aboutDialog.title;"
         creditslabel="&credits.label;" creditsaccesskey="&credits.accesskey;"
-        aboutlabel="&aboutLink.label;" aboutaccesskey="&aboutLink.accesskey;">
+        aboutlabel="&aboutButton.label;" aboutaccesskey="&aboutButton.accesskey;">
 
     <script type="application/x-javascript"
             src="chrome://messenger/content/aboutDialog.js"/>
@@ -74,6 +74,26 @@
       </vbox>
     </deck>
     <separator class="groove" id="groove"/>
+    <hbox>
+      <!-- dialog.xml has these buttons as extra 2 then accept on all platforms.
+           So we'll just insert our menu in-between. -->
+      <button dlgtype="extra2" class="dialog-button"/>
+      <button id="aboutMenu" type="menu" label="&aboutMenu.label;"
+              accesskey="&aboutMenu.accesskey;" class="dialog-button"
+              oncommand="event.preventDefault();">
+        <menupopup id="aboutRightsMenu">
+          <menuitem label="&aboutRights.label;"
+                    accesskey="&aboutRights.accesskey;"
+                    oncommand="loadAbout('rights');"/>
+          <menuitem label="&aboutContributors.label;"
+                    accesskey="&aboutContributors.accesskey;"
+                    oncommand="loadAbout('credits');"/>
+        </menupopup>
+      </button>
+#ifndef XP_MACOSX
+      <button dlgtype="accept" class="dialog-button"/>
+#endif
+    </hbox>
 #ifdef XP_MACOSX
     <keyset id="mainKeyset">
       <key id="key_close" modifiers="accel" key="&cmdCloseMac.commandKey;"

mail/base/content/msgMail3PaneWindow.js

@@ -511,8 +511,18 @@ function atStartupRestoreTabs() {
   return true;
 }
 
+function loadExtraTabs()
+{
+  if ("arguments" in window && window.arguments.length >= 2) {
+    if ("tabType" in window.arguments[1]) {
+      document.getElementById('tabmail').openTab(window.arguments[1].tabType, window.arguments[1].tabParams);
+    }
+  }
+}
+
 function loadStartFolder(initialUri)
 {
+  setTimeout(loadExtraTabs, 0);
     var defaultServer = null;
     var startFolder;
     var isLoginAtStartUpEnabled = false;

mail/locales/en-US/chrome/messenger/aboutDialog.dtd

@@ -1,10 +1,17 @@
 <!ENTITY aboutDialog.title      "About &brandFullName;">
 <!ENTITY credits.label          "Credits">
 <!ENTITY credits.accesskey      "C">
-<!ENTITY aboutLink.label        "&lt; About &brandFullName;">
-<!ENTITY aboutLink.accesskey    "A">
+<!ENTITY aboutButton.label      "&lt; Back">
+<!ENTITY aboutButton.accesskey  "B">
 <!ENTITY aboutVersion           "version">
 <!ENTITY copyrightText          "&#169;1998-2009 Contributors. All Rights Reserved. Mozilla Thunderbird and the 
                                  Thunderbird logos are trademarks of the Mozilla Foundation.  All rights 
                                  reserved.">
+<!ENTITY aboutMenu.label        "About">
+<!ENTITY aboutMenu.accesskey    "A">
+<!ENTITY aboutRights.label      "Your Rights">
+<!ENTITY aboutRights.accesskey  "R">
+<!ENTITY aboutContributors.label "Contributors">
+<!ENTITY aboutContributors.accesskey "o">
+
 <!ENTITY cmdCloseMac.commandKey "w">