Bug 686168 - Move help from toolkit to suite. r=IanN a=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Wed, 27 Jul 2016 02:05:47 +0100
changeset 19781 b87713baaa13c8d582c983b91f0872ee5c93c157
parent 19780 fa786e755299c9f591f094d38f40349f3382f389
child 19782 15822e1bf8c8c7641a23763806ff08e7367beca6
push id12113
push useriann_cvs@blueyonder.co.uk
push dateWed, 27 Jul 2016 01:07:07 +0000
treeherdercomm-central@b87713baaa13 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, IanN
bugs686168
Bug 686168 - Move help from toolkit to suite. r=IanN a=IanN
suite/common/bindings/prefwindow.xml
suite/common/helpviewer/contextHelp.js
suite/common/helpviewer/help.xul
suite/common/jar.mn
suite/locales/jar.mn
suite/themes/classic/communicator/help/Toolbar-rtl.png
suite/themes/classic/communicator/help/Toolbar.png
suite/themes/classic/communicator/help/Weblink-rtl.png
suite/themes/classic/communicator/help/Weblink.png
suite/themes/classic/communicator/help/help.css
suite/themes/classic/communicator/help/helpFileLayout.css
suite/themes/classic/communicator/helpviewer/Toolbar-rtl.png
suite/themes/classic/communicator/helpviewer/Toolbar.png
suite/themes/classic/communicator/helpviewer/Weblink-rtl.png
suite/themes/classic/communicator/helpviewer/Weblink.png
suite/themes/classic/communicator/helpviewer/help.css
suite/themes/classic/communicator/helpviewer/helpFileLayout.css
suite/themes/classic/jar.mn
suite/themes/classic/mac/communicator/help/Toolbar.png
suite/themes/classic/mac/communicator/help/Weblink.png
suite/themes/classic/mac/communicator/help/dropmark-nav.png
suite/themes/classic/mac/communicator/help/help.css
suite/themes/classic/mac/communicator/help/helpFileLayout.css
suite/themes/classic/mac/communicator/helpviewer/Toolbar.png
suite/themes/classic/mac/communicator/helpviewer/Weblink.png
suite/themes/classic/mac/communicator/helpviewer/dropmark-nav.png
suite/themes/classic/mac/communicator/helpviewer/help.css
suite/themes/classic/mac/communicator/helpviewer/helpFileLayout.css
suite/themes/modern/help/help.css
suite/themes/modern/help/helpFileLayout.css
suite/themes/modern/helpviewer/help.css
suite/themes/modern/helpviewer/helpFileLayout.css
suite/themes/modern/jar.mn
--- a/suite/common/bindings/prefwindow.xml
+++ b/suite/common/bindings/prefwindow.xml
@@ -391,17 +391,17 @@
     <!-- copied from contextHelp.js
          Locate existing help window for this helpFileURI. -->
       <method name="locateHelpWindow">
         <parameter name="helpFileURI"/>
         <body>
         <![CDATA[
           const wm = Components.classes['@mozilla.org/appshell/window-mediator;1']
                                .getService(Components.interfaces.nsIWindowMediator);
-          const iterator = wm.getEnumerator("mozilla:help");
+          const iterator = wm.getEnumerator("suite:help");
           var topWindow = null;
           var aWindow;
 
           // Loop through help windows looking for one with selected helpFileURI
           while (iterator.hasMoreElements())
           {
             aWindow = iterator.getNext();
             if (aWindow.getHelpFileURI() == helpFileURI)
--- a/suite/common/helpviewer/contextHelp.js
+++ b/suite/common/helpviewer/contextHelp.js
@@ -48,17 +48,17 @@ function setHelpFileURI(rdfURI)
   helpFileURI = rdfURI;
 }
 
 # Locate existing help window for this content pack.
 function locateHelpWindow(contentPack) {
     const windowManagerInterface = Components
         .classes['@mozilla.org/appshell/window-mediator;1'].getService()
         .QueryInterface(Components.interfaces.nsIWindowMediator);
-    const iterator = windowManagerInterface.getEnumerator("mozilla:help");
+    const iterator = windowManagerInterface.getEnumerator("suite:help");
     var topWindow = null;
     var aWindow;
 
 # Loop through help windows looking for one with selected content
 # pack.
     while (iterator.hasMoreElements()) {
         aWindow = iterator.getNext();
         if (!aWindow.closed && aWindow.getHelpFileURI() == contentPack) {
--- a/suite/common/helpviewer/help.xul
+++ b/suite/common/helpviewer/help.xul
@@ -9,17 +9,17 @@
 <!DOCTYPE window [
     <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
     %brandDTD;
     <!ENTITY % helpDTD SYSTEM "chrome://help/locale/help.dtd">
     %helpDTD;
 ]>
 
 <window id="help"
-        windowtype="mozilla:help"
+        windowtype="suite:help"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         width="700"
         height="550"
 #ifdef XP_WIN
 #define HELP_ALWAYS_RAISED_TOGGLE
 #endif
 #ifdef HELP_ALWAYS_RAISED_TOGGLE
         persist="width height screenX screenY zlevel"
--- a/suite/common/jar.mn
+++ b/suite/common/jar.mn
@@ -1,10 +1,11 @@
 comm.jar:
 % content communicator %content/communicator/ contentaccessible=yes
+% content help %content/communicator/helpviewer/
 % override chrome://global/content/license.html chrome://communicator/content/license.html
 % override chrome://mozapps/content/profile/profileSelection.xul chrome://communicator/content/profile/profileSelection.xul
 % overlay chrome://global/content/console.xul chrome://communicator/content/consoleOverlay.xul
 % overlay chrome://global/content/viewSource.xul chrome://communicator/content/viewSourceOverlay.xul
 % overlay chrome://global/content/viewPartialSource.xul chrome://communicator/content/viewSourceOverlay.xul
 % overlay chrome://help/content/help.xul chrome://communicator/content/helpOverlay.xul
 % overlay chrome://editor/content/EdAdvancedEdit.xul chrome://communicator/content/helpEditorOverlay.xul
 % overlay chrome://editor/content/EdImageProps.xul chrome://communicator/content/helpEditorOverlay.xul
@@ -126,16 +127,21 @@ comm.jar:
    content/communicator/bookmarks/editBookmarkOverlay.xul           (bookmarks/editBookmarkOverlay.xul)
    content/communicator/bookmarks/moveBookmarks.js                  (bookmarks/moveBookmarks.js)
    content/communicator/bookmarks/moveBookmarks.xul                 (bookmarks/moveBookmarks.xul)
    content/communicator/bookmarks/placesOverlay.xul                 (bookmarks/placesOverlay.xul)
    content/communicator/dataman/dataman.css                         (dataman/dataman.css)
    content/communicator/dataman/dataman.js                          (dataman/dataman.js)
    content/communicator/dataman/dataman.xml                         (dataman/dataman.xml)
    content/communicator/dataman/dataman.xul                         (dataman/dataman.xul)
+*  content/communicator/helpviewer/help.xul                         (helpviewer/help.xul)
+*  content/communicator/helpviewer/contextHelp.js                   (helpviewer/contextHelp.js)
+*  content/communicator/helpviewer/help.js                          (helpviewer/help.js)
+*  content/communicator/helpviewer/helpContextOverlay.xul           (helpviewer/helpContextOverlay.xul)
+*  content/communicator/helpviewer/platformClasses.css              (helpviewer/platformClasses.css)
    content/communicator/directory/directory.html                    (directory/directory.html)
    content/communicator/directory/directory.js                      (directory/directory.js)
    content/communicator/directory/directory.xul                     (directory/directory.xul)
    content/communicator/downloads/downloadmanager.js                (downloads/downloadmanager.js)
    content/communicator/downloads/downloadmanager.xul               (downloads/downloadmanager.xul)
    content/communicator/downloads/DownloadProgressListener.js       (downloads/DownloadProgressListener.js)
    content/communicator/downloads/progressDialog.xul                (downloads/progressDialog.xul)
    content/communicator/downloads/progressDialog.js                 (downloads/progressDialog.js)
--- a/suite/locales/jar.mn
+++ b/suite/locales/jar.mn
@@ -4,16 +4,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
 @AB_CD@.jar:
 % locale branding @AB_CD@ %locale/@AB_CD@/branding/
 % locale communicator @AB_CD@ %locale/@AB_CD@/communicator/
 % locale communicator-platform @AB_CD@ %locale/@AB_CD@/communicator-platform/
 % locale communicator-region @AB_CD@ %locale/@AB_CD@/communicator-region/
+% locale help @AB_CD@ %locale/@AB_CD@/helpviewer/
 % locale messenger @AB_CD@ %locale/@AB_CD@/messenger/
 % locale messenger-mapi @AB_CD@ %locale/@AB_CD@/messenger-mapi/
 % locale messenger-region @AB_CD@ %locale/@AB_CD@/messenger-region/
 % locale messenger-smime @AB_CD@ %locale/@AB_CD@/messenger-smime/
 % locale messenger-newsblog @AB_CD@ %locale/@AB_CD@/messenger-newsblog/
 % locale mozldap @AB_CD@ %locale/@AB_CD@/mozldap/
 % locale navigator @AB_CD@ %locale/@AB_CD@/navigator/
 % locale navigator-platform @AB_CD@ %locale/@AB_CD@/navigator-platform/
@@ -141,16 +142,20 @@
   locale/@AB_CD@/communicator/help/images/tabbed_browsing_bar.png           (%chrome/common/help/images/tabbed_browsing_bar.png)
   locale/@AB_CD@/communicator/help/images/table.gif                         (%chrome/common/help/images/table.gif)
   locale/@AB_CD@/communicator/help/images/taskbar.png                       (%chrome/common/help/images/taskbar.png)
   locale/@AB_CD@/communicator/help/images/taskbar-ab.png                    (%chrome/common/help/images/taskbar-ab.png)
   locale/@AB_CD@/communicator/help/images/task_mail.png                     (%chrome/common/help/images/task_mail.png)
   locale/@AB_CD@/communicator/help/images/task_newmail.png                  (%chrome/common/help/images/task_newmail.png)
   locale/@AB_CD@/communicator/help/images/threadbutton.png                  (%chrome/common/help/images/threadbutton.png)
   locale/@AB_CD@/communicator/help/images/web-links.png                     (%chrome/common/help/images/web-links.png)
+  locale/@AB_CD@/helpviewer/help.properties                                 (%chrome/common/helpviewer/help.properties)
+  locale/@AB_CD@/helpviewer/help.dtd                                        (%chrome/common/helpviewer/help.dtd)
+  locale/@AB_CD@/helpviewer/help-toc.rdf                                    (%chrome/common/helpviewer/help-toc.rdf)
+  locale/@AB_CD@/helpviewer/welcome.xhtml                                   (%chrome/common/helpviewer/welcome.xhtml)
   locale/@AB_CD@/communicator/history/history.dtd                           (%chrome/common/history/history.dtd)
   locale/@AB_CD@/communicator/migration/migration.dtd                       (%chrome/common/migration/migration.dtd)
   locale/@AB_CD@/communicator/migration/migration.properties                (%chrome/common/migration/migration.properties)
   locale/@AB_CD@/communicator/permissions/cookieViewer.properties           (%chrome/common/permissions/cookieViewer.properties)
   locale/@AB_CD@/communicator/permissions/cookieViewer.dtd                  (%chrome/common/permissions/cookieViewer.dtd)
   locale/@AB_CD@/communicator/permissions/permissionsManager.dtd            (%chrome/common/permissions/permissionsManager.dtd)
   locale/@AB_CD@/communicator/permissions/permissionsManager.properties     (%chrome/common/permissions/permissionsManager.properties)
   locale/@AB_CD@/communicator/places/places.properties                      (%chrome/common/places/places.properties)
rename from suite/themes/classic/communicator/help/Toolbar-rtl.png
rename to suite/themes/classic/communicator/helpviewer/Toolbar-rtl.png
rename from suite/themes/classic/communicator/help/Toolbar.png
rename to suite/themes/classic/communicator/helpviewer/Toolbar.png
rename from suite/themes/classic/communicator/help/Weblink-rtl.png
rename to suite/themes/classic/communicator/helpviewer/Weblink-rtl.png
rename from suite/themes/classic/communicator/help/Weblink.png
rename to suite/themes/classic/communicator/helpviewer/Weblink.png
rename from suite/themes/classic/communicator/help/help.css
rename to suite/themes/classic/communicator/helpviewer/help.css
rename from suite/themes/classic/communicator/help/helpFileLayout.css
rename to suite/themes/classic/communicator/helpviewer/helpFileLayout.css
--- a/suite/themes/classic/communicator/help/helpFileLayout.css
+++ b/suite/themes/classic/communicator/helpviewer/helpFileLayout.css
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url('chrome://help/content/platformClasses.css');
 
 body,
 td,
 th,
 input {
-  font-family: verdana, sans-serif;
+  font-family: arial, verdana, sans-serif;
   font-size: small;
 }
 
 body {
   margin: 2ex;
   max-width: 120ex;
 }
 
--- a/suite/themes/classic/jar.mn
+++ b/suite/themes/classic/jar.mn
@@ -1,15 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 classic.jar:
 % skin communicator classic/1.0 %skin/classic/communicator/
 % skin editor classic/1.0 %skin/classic/editor/
+% skin help classic/1.0 %skin/classic/communicator/helpviewer/
 % skin messenger classic/1.0 %skin/classic/messenger/
 % skin navigator classic/1.0 %skin/classic/navigator/
 % skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
 % style chrome://global/content/customizeToolbar.xul chrome://navigator/skin/navigator.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/primaryToolbar.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/messengercompose/messengercompose.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/smime/msgCompSMIMEOverlay.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/addressbook/addressbook.css
@@ -30,16 +31,21 @@ classic.jar:
   skin/classic/communicator/bookmarks/editBookmarkOverlay.css           (mac/communicator/bookmarks/editBookmarkOverlay.css)
   skin/classic/communicator/bookmarks/livemark-folder.png               (mac/communicator/bookmarks/livemark-folder.png)
   skin/classic/communicator/bookmarks/query.png                         (mac/communicator/bookmarks/query.png)
   skin/classic/communicator/bookmarks/toolbarDropMarker.png             (mac/communicator/bookmarks/toolbarDropMarker.png)
   skin/classic/communicator/directory/directory.css                     (mac/communicator/directory/directory.css)
   skin/classic/communicator/downloads/downloadButtons.png               (mac/communicator/downloads/downloadButtons.png)
   skin/classic/communicator/downloads/progressBg.png                    (mac/communicator/downloads/progressBg.png)
   skin/classic/communicator/downloads/downloadmanager.css               (mac/communicator/downloads/downloadmanager.css)
+  skin/classic/communicator/helpviewer/dropmark-nav.png                 (mac/communicator/helpviewer/dropmark-nav.png)
+  skin/classic/communicator/helpviewer/help.css                         (mac/communicator/helpviewer/help.css)
+  skin/classic/communicator/helpviewer/helpFileLayout.css               (mac/communicator/helpviewer/helpFileLayout.css)
+  skin/classic/communicator/helpviewer/Toolbar.png                      (mac/communicator/helpviewer/Toolbar.png)
+  skin/classic/communicator/helpviewer/Weblink.png                      (mac/communicator/helpviewer/Weblink.png)
   skin/classic/communicator/search/searchbar.css                        (mac/communicator/search/searchbar.css)
   skin/classic/communicator/search/searchbar-dropmarker.png             (mac/communicator/search/searchbar-dropmarker.png)
   skin/classic/communicator/search/searchbar-search.png                 (mac/communicator/search/searchbar-search.png)
   skin/classic/communicator/sidebar/sidebar.css                         (mac/communicator/sidebar/sidebar.css)
   skin/classic/communicator/sync/syncSetup.css                          (mac/communicator/sync/syncSetup.css)
   skin/classic/communicator/icons/communicatoricons.png                 (mac/communicator/icons/communicatoricons.png)
   skin/classic/communicator/icons/communicatoricons-small.png           (mac/communicator/icons/communicatoricons-small.png)
   skin/classic/communicator/icons/feedIcon16-disabled.png               (mac/communicator/icons/feedIcon16-disabled.png)
@@ -74,16 +80,22 @@ classic.jar:
   skin/classic/communicator/bookmarks/query.png                         (communicator/bookmarks/query.png)
   skin/classic/communicator/bookmarks/toolbarDropMarker.png             (communicator/bookmarks/toolbarDropMarker.png)
   skin/classic/communicator/directory/directory.css                     (communicator/directory/directory.css)
   skin/classic/communicator/directory/file.gif                          (communicator/directory/file.gif)
   skin/classic/communicator/directory/folder-clsd.gif                   (communicator/directory/folder-clsd.gif)
   skin/classic/communicator/directory/folder-open.gif                   (communicator/directory/folder-open.gif)
   skin/classic/communicator/downloads/downloadButtons.png               (communicator/downloads/downloadButtons.png)
   skin/classic/communicator/downloads/downloadmanager.css               (communicator/downloads/downloadmanager.css)
+  skin/classic/communicator/helpviewer/Toolbar.png                      (communicator/helpviewer/Toolbar.png)
+  skin/classic/communicator/helpviewer/Toolbar-rtl.png                  (communicator/helpviewer/Toolbar-rtl.png)
+  skin/classic/communicator/helpviewer/help.css                         (communicator/helpviewer/help.css)
+  skin/classic/communicator/helpviewer/helpFileLayout.css               (communicator/helpviewer/helpFileLayout.css)
+  skin/classic/communicator/helpviewer/Weblink.png                      (communicator/helpviewer/Weblink.png)
+  skin/classic/communicator/helpviewer/Weblink-rtl.png                  (communicator/helpviewer/Weblink-rtl.png)
   skin/classic/communicator/search/mainwindow-dropdown-arrow.png        (communicator/search/mainwindow-dropdown-arrow.png)
   skin/classic/communicator/search/searchbar.css                        (communicator/search/searchbar.css)
   skin/classic/communicator/sidebar/sidebar.css                         (communicator/sidebar/sidebar.css)
   skin/classic/communicator/sync/syncSetup.css                          (communicator/sync/syncSetup.css)
   skin/classic/communicator/icons/communicatoricons.png                 (communicator/icons/communicatoricons.png)
   skin/classic/communicator/icons/communicatoricons-small.png           (communicator/icons/communicatoricons-small.png)
   skin/classic/communicator/icons/geolocation-16.png                    (communicator/icons/geolocation-16.png)
   skin/classic/communicator/icons/geolocation-64.png                    (communicator/icons/geolocation-64.png)
rename from suite/themes/classic/mac/communicator/help/Toolbar.png
rename to suite/themes/classic/mac/communicator/helpviewer/Toolbar.png
rename from suite/themes/classic/mac/communicator/help/Weblink.png
rename to suite/themes/classic/mac/communicator/helpviewer/Weblink.png
rename from suite/themes/classic/mac/communicator/help/dropmark-nav.png
rename to suite/themes/classic/mac/communicator/helpviewer/dropmark-nav.png
rename from suite/themes/classic/mac/communicator/help/help.css
rename to suite/themes/classic/mac/communicator/helpviewer/help.css
rename from suite/themes/classic/mac/communicator/help/helpFileLayout.css
rename to suite/themes/classic/mac/communicator/helpviewer/helpFileLayout.css
rename from suite/themes/modern/help/help.css
rename to suite/themes/modern/helpviewer/help.css
rename from suite/themes/modern/help/helpFileLayout.css
rename to suite/themes/modern/helpviewer/helpFileLayout.css
--- a/suite/themes/modern/help/helpFileLayout.css
+++ b/suite/themes/modern/helpviewer/helpFileLayout.css
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url('chrome://help/content/platformClasses.css');
 
 body,
 td,
 th,
 input {
-  font-family: verdana, sans-serif;
+  font-family: arial, verdana, sans-serif;
   font-size: small;
 }
 
 body {
   margin: 2ex;
   max-width: 120ex;
 }
 
--- a/suite/themes/modern/jar.mn
+++ b/suite/themes/modern/jar.mn
@@ -3,17 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 modern.jar:
 % override chrome://mozapps/skin/places/defaultFavicon.png chrome://communicator/skin/bookmarks/bookmark-item.png
 % skin communicator modern/1.0 %skin/modern/communicator/
 % skin editor modern/1.0 %skin/modern/editor/
 % skin global modern/1.0 %skin/modern/global/
 % skin global-platform modern/1.0 %skin/modern/global/
-% skin help modern/1.0 %skin/modern/help/
+% skin help modern/1.0 %skin/modern/helpviewer/
 % skin messenger modern/1.0 %skin/modern/messenger/
 % skin mozapps modern/1.0 %skin/modern/mozapps/
 % skin navigator modern/1.0 %skin/modern/navigator/
 % skin messenger-newsblog modern/1.0 %skin/modern/messenger-newsblog/
 % style chrome://global/content/customizeToolbar.xul chrome://navigator/skin/navigator.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/primaryToolbar.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/messengercompose/messengercompose.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/smime/msgCompSMIMEOverlay.css
@@ -387,18 +387,18 @@ modern.jar:
   skin/modern/global/mac/tree/sort-dsc.gif                         (global/tree/sort-asc.gif)
   skin/modern/global/unix/tree/sort-asc.gif                        (global/tree/sort-asc.gif)
   skin/modern/global/unix/tree/sort-dsc.gif                        (global/tree/sort-dsc.gif)
   skin/modern/global/win/tree/sort-asc.gif                         (global/tree/sort-dsc.gif)
   skin/modern/global/win/tree/sort-dsc.gif                         (global/tree/sort-asc.gif)
   skin/modern/global/tree/twisty-clsd.gif                          (global/tree/twisty-clsd.gif)
   skin/modern/global/tree/twisty-open.gif                          (global/tree/twisty-open.gif)
   skin/modern/global/tree/columnpicker.gif                         (global/tree/columnpicker.gif)
-  skin/modern/help/help.css                                        (help/help.css)
-  skin/modern/help/helpFileLayout.css                              (/mozilla/toolkit/themes/windows/help/helpFileLayout.css)
+  skin/modern/helpviewer/help.css                                  (helpviewer/help.css)
+  skin/modern/helpviewer/helpFileLayout.css                        (helpviewer/helpFileLayout.css)
   skin/modern/messenger/threadPaneLabels.css                       (messenger/threadPaneLabels.css)
   skin/modern/messenger/accountCentral.css                         (messenger/accountCentral.css)
   skin/modern/messenger/accountManage.css                          (messenger/accountManage.css)
   skin/modern/messenger/accountWizard.css                          (messenger/accountWizard.css)
   skin/modern/messenger/addressingWidget.css                       (messenger/addressingWidget.css)
   skin/modern/messenger/browserRequest.css                         (messenger/browserRequest.css)
   skin/modern/messenger/dialogs.css                                (messenger/dialogs.css)
   skin/modern/messenger/filterDialog.css                           (messenger/filterDialog.css)