129540 r=racham sr=alecf Adding help buttons in some cases and making them point to the right page (in all cases).

mailnews/addrbook/prefs/resources/content/pref-directory.js

@@ -505,3 +505,8 @@ function onAccept()
   window.opener.gRefresh = true;
   return true;
 }
+
+function doHelpButton()
+{
+  openHelp("mail-ldap-properties");
+}

mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul

@@ -26,10 +26,13 @@ Rights Reserved.
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         title="&window.title;"
+        buttons="accept,cancel,help"
         onload="onInitEditDirectories();"
-        ondialogaccept="return onAccept();">
+        ondialogaccept="return onAccept();"
+        ondialoghelp="return doHelpButton();">
 
   <script type="application/x-javascript" src="chrome://messenger/content/addressbook/pref-directory.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
     <description>&directoriesText.label;</description>
     <hbox flex="1">

mailnews/base/prefs/resources/content/am-help.js

@@ -30,10 +30,10 @@ var pageTagPairs = {
   "chrome://messenger/content/am-server.xul": "mail",
   "chrome://messenger/content/am-copies.xul": "mail_copies",
   "chrome://messenger/content/am-addressing.xul": "mail_addressing_settings",
-  "chrome://messenger/content/am-offline.xul": "mail-offline-sync",
+  "chrome://messenger/content/am-offline.xul": "mail-offline-accounts",
   "chrome://messenger/content/am-smtp.xul": "mail_smtp",
   "chrome://messenger/content/am-smime.xul": "mail_security_settings",
-  "chrome://messenger/content/am-serverwithnoidentities.xul": "mail_local_folder_settings",
+  "chrome://messenger/content/am-serverwithnoidentities.xul": "mail_local_folders_settings",
   "chrome://messenger/content/am-mdn.xul": "mail-account-receipts"
 } 
 

mailnews/base/resources/content/mailCommands.js

@@ -445,5 +445,5 @@ function ViewPageSource(messages)
 
 function doHelpButton() 
 {
-    openHelp("offline_sync");
+    openHelp("mail-offline-items");
 }

mailnews/base/search/resources/content/ABSearchDialog.xul

@@ -96,7 +96,7 @@ Rights Reserved.
 
          <hbox align="center">
            <spacer flex="2"/>
-           <button label="&helpButton.label;" align="end" oncommand="openHelp('search_messages');" accesskey="&helpButton.accesskey;"/> 
+           <button label="&helpButton.label;" align="end" oncommand="openHelp('mail_advanced_ab_search');" accesskey="&helpButton.accesskey;"/> 
          </hbox>
       </vbox>
 

mailnews/base/search/resources/content/FilterEditor.js

@@ -525,3 +525,8 @@ function SetBusyCursor(window, enable)
             window.setCursor("auto");
     }
 }
+
+function doHelpButton()
+{
+  openHelp("send-filter");
+}

mailnews/base/search/resources/content/FilterEditor.xul

@@ -38,9 +38,11 @@ Contributor(s):
   windowtype="mailnews:filtereditor"
   width="510" height="360"
   persist="width height screenX screenY"
+  buttons="accept,cancel,help"
   onload="filterEditorOnLoad();"
   onunload="filterEditorOnUnload();"
-  ondialogaccept="return onAccept();">
+  ondialogaccept="return onAccept();"
+  ondialoghelp="return doHelpButton();">
 
   <dummy class="usesMailWidgets"/>
   <stringbundleset id="stringbundleset">
@@ -52,6 +54,7 @@ Contributor(s):
   <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/FilterEditor.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
   <hbox align="start">
     <label value="&filterName.label;" accesskey="&filterName.accesskey;" control="filterName"/>

mailnews/base/search/resources/content/FilterListDialog.js

@@ -355,3 +355,10 @@ function onFilterTreeKeyPress(event)
     }
   }
 }
+
+function doHelpButton()
+{
+  openHelp("mail-filters");
+}
+
+  

mailnews/base/search/resources/content/FilterListDialog.xul

@@ -30,14 +30,17 @@ Contributor(s):  Hkan Waara <hwaara@chello.se>
   xmlns:nc="http://home.netscape.com/NC-rdf#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   windowtype="mailnews:filterlist"
+  buttons="accept,cancel,help"
   onload="onLoad();"
   ondialogaccept="return onOk();"
+  ondialoghelp="return doHelpButton();"
   width="440"
   height="320"
   persist="width height screenX screenY"
   title="&window.title;">
 
   <script type="application/x-javascript" src="chrome://messenger/content/FilterListDialog.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
   <stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
 
   <keyset id="dialogKeys"/>