Bug 1289851 - Integrate helpoverlay files and clean up help. r=IanN a=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sun, 04 Sep 2016 21:06:55 +0200
changeset 19977 f823ce6ce813a08654bbf92759f46a3d8d30de59
parent 19976 4fd68256ca65ffdbd82b950e01d688ad2ebc5a83
child 19978 e3a88b8c91e2267ace82651ec29049f1f451aaca
push id12255
push userfrgrahl@gmx.net
push dateSun, 04 Sep 2016 19:07:57 +0000
treeherdercomm-central@f823ce6ce813 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, IanN
bugs1289851
Bug 1289851 - Integrate helpoverlay files and clean up help. r=IanN a=IanN
suite/common/helpOverlay.js
suite/common/helpOverlay.xul
suite/common/helpviewer/contents.rdf
suite/common/helpviewer/help.js
suite/common/helpviewer/help.xul
suite/common/jar.mn
suite/locales/en-US/chrome/common/helpviewer/help-toc.rdf
suite/locales/en-US/chrome/common/helpviewer/welcome.xhtml
suite/locales/jar.mn
suite/themes/classic/communicator/helpOverlay.css
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/helpOverlay.css
suite/themes/classic/mac/communicator/helpviewer/Toolbar.png
suite/themes/classic/mac/communicator/helpviewer/Weblink.png
suite/themes/classic/mac/communicator/helpviewer/help.css
suite/themes/classic/mac/communicator/helpviewer/helpFileLayout.css
suite/themes/modern/communicator/helpOverlay.css
suite/themes/modern/communicator/helpviewer/helpFileLayout.css
suite/themes/modern/jar.mn
deleted file mode 100644
--- a/suite/common/helpOverlay.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/* 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/. */
-
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-var helpExternal;
-
-var helpContentListener = {
-  onStartURIOpen: function(aURI) {
-    return false;
-  },
-  doContent: function(aContentType, aIsContentPreferred, aRequest, aContentHandler) {
-    throw Components.results.NS_ERROR_UNEXPECTED;
-  },
-  isPreferred: function(aContentType, aDesiredContentType) {
-    return false;
-  },
-  canHandleContent: function(aContentType, aIsContentPreferred, aDesiredContentType) {
-    return false;
-  },
-  loadCookie: null,
-  parentContentListener: null,
-  QueryInterface: function (aIID) {
-    if (aIID.equals(Components.interfaces.nsIURIContentListener) ||
-        aIID.equals(Components.interfaces.nsISupportsWeakReference) ||
-        aIID.equals(Components.interfaces.nsISupports))
-      return this;
-
-    throw Components.results.NS_ERROR_NO_INTERFACE;
-  }
-};
-
-function initOverlay() {
-  helpExternal = document.getElementById("help-external");
-  helpExternal.docShell.useErrorPages = false;
-  helpExternal
-    .docShell
-    .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-    .getInterface(Components.interfaces.nsIURIContentListener)
-    .parentContentListener = helpContentListener;
-  helpExternal.addProgressListener(window.XULBrowserWindow, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
-}
-
-function contentClick(event) {
-  // is this a left click on a link?
-  if (event.shiftKey || event.ctrlKey || event.altKey || event.metaKey || event.button != 0)
-    return true;
-
-  // is this a link?
-  var target = event.target;
-  while (!(target instanceof HTMLAnchorElement))
-    if (!(target = target.parentNode))
-      return true;
-
-  // is this an internal link?
-  if (target.href.lastIndexOf("chrome:", 0) == 0)
-    return true;
-
-  var uri = target.href;
-  if (/^x-moz-url-link:/.test(uri))
-    uri = Services.urlFormatter.formatURLPref(RegExp.rightContext);
-
-  const loadFlags = Components.interfaces.nsIWebNavigation.LOAD_FLAGS_IS_LINK;
-  try {
-    helpExternal.webNavigation.loadURI(uri, loadFlags, null, null, null);
-  } catch (e) {}
-  return false;
-}
-
-function showSidebar() {
-  document.getElementById("help-sidebar-splitter").setAttribute("state", "open");
-}
-
-// needed by findUtils.js
-var gFindInstData;
-function getFindInstData()
-{
-  if (!gFindInstData) {
-    gFindInstData = new nsFindInstData();
-    gFindInstData.browser = getBrowser();
-    // defaults for rootSearchWindow and currentSearchWindow are fine here
-  }
-  return gFindInstData;
-}
deleted file mode 100644
--- a/suite/common/helpOverlay.xul
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- 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/. -->
-
-<?xml-stylesheet href="chrome://communicator/skin/helpOverlay.css" type="text/css"?>
-
-<!DOCTYPE overlay>
-
-<overlay id="helpOverlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <window id="help" onload="init(); initOverlay();"/>
-
-  <script type="application/javascript" src="chrome://communicator/content/helpOverlay.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/findUtils.js"/>
-
-  <command id="cmd_find"
-           oncommand="findInPage(getFindInstData());"/>
-  <command id="cmd_findAgain"
-           oncommand="findAgainInPage(getFindInstData(), false);"/>
-  <command id="cmd_findPrevious"
-           oncommand="findAgainInPage(getFindInstData(), true);"/>
-
-  <browser id="help-content" onclick="return contentClick(event);" />
-
-  <textbox id="findText" oncommand="showSidebar(); doFind();"/>
-
-  <splitter id="help-sidebar-splitter">
-    <grippy/>
-  </splitter>
-
-  <vbox id="appcontent">
-    <browser type="content" id="help-external" collapsed="true"/>
-  </vbox>
-
-</overlay>
deleted file mode 100644
--- a/suite/common/helpviewer/contents.rdf
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-#
-# 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/.
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-# Packages
-    <RDF:Seq RDF:about="urn:mozilla:package:root">
-        <RDF:li RDF:resource="urn:mozilla:package:help"/>
-    </RDF:Seq>
-
-# Package Description
-    <RDF:Description RDF:about="urn:mozilla:package:help"
-        chrome:name="help" />
-
-</RDF:RDF>
--- a/suite/common/helpviewer/help.js
+++ b/suite/common/helpviewer/help.js
@@ -1,13 +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/.
 
+Components.utils.import("resource://gre/modules/Services.jsm");
+
 # Global Variables
+var helpExternal;
 var helpBrowser;
 var helpSearchPanel;
 var emptySearch;
 var emptySearchText;
 var emptySearchLink = "about:blank";
 var helpTocPanel;
 var helpIndexPanel;
 var helpGlossaryPanel;
@@ -139,16 +142,67 @@ function init() {
   const webProgress = interfaceRequestor.getInterface(Components.interfaces.nsIWebProgress);
 
   webProgress.addProgressListener(window.XULBrowserWindow, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
 
   var searchBox = document.getElementById("findText");
   searchBox.clickSelectsAll = getBoolPref("browser.urlbar.clickSelectsAll", true);
 
   setTimeout(focusSearch, 0);
+
+  helpExternal = document.getElementById("help-external");
+  helpExternal.docShell.useErrorPages = false;
+  helpExternal
+    .docShell
+    .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+    .getInterface(Components.interfaces.nsIURIContentListener)
+    .parentContentListener = helpContentListener;
+  helpExternal.addProgressListener(window.XULBrowserWindow, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
+
+}
+function contentClick(event) {
+  // is this a left click on a link?
+  if (event.shiftKey || event.ctrlKey || event.altKey || event.metaKey || event.button != 0)
+    return true;
+
+  // is this a link?
+  var target = event.target;
+  while (!(target instanceof HTMLAnchorElement))
+    if (!(target = target.parentNode))
+      return true;
+
+  // is this an internal link?
+  if (target.href.lastIndexOf("chrome:", 0) == 0)
+    return true;
+
+  var uri = target.href;
+  if (/^x-moz-url-link:/.test(uri))
+    uri = Services.urlFormatter.formatURLPref(RegExp.rightContext);
+
+  const loadFlags = Components.interfaces.nsIWebNavigation.LOAD_FLAGS_IS_LINK;
+  try {
+    helpExternal.webNavigation.loadURI(uri, loadFlags, null, null, null);
+  } catch (e) {}
+  return false;
+}
+
+function showSidebar() {
+  document.getElementById("help-sidebar-splitter").setAttribute("state", "open");
+}
+
+// needed by findUtils.js
+var gFindInstData;
+function getFindInstData()
+{
+  if (!gFindInstData) {
+    gFindInstData = new nsFindInstData();
+    gFindInstData.browser = getBrowser();
+    // defaults for rootSearchWindow and currentSearchWindow are fine here
+  }
+  return gFindInstData;
 }
 
 function showSearchSidebar() {
   // if you tab too quickly, you end up with stuck focus, revert focus to the searchbar
   var searchTree = document.getElementById("help-toc-panel");
   if (searchTree.treeBoxObject.focused) {
     focusSearch();
   }
@@ -769,8 +823,33 @@ function toggleZLevel(element)
     xulwin.zLevel = xulwin.normalZ;
     element.setAttribute("checked", "false");
   } else {
     xulwin.zLevel = xulwin.raisedZ;
     element.setAttribute("checked", "true");
   }
 }
 #endif
+
+var helpContentListener = {
+  onStartURIOpen: function(aURI) {
+    return false;
+  },
+  doContent: function(aContentType, aIsContentPreferred, aRequest, aContentHandler) {
+    throw Components.results.NS_ERROR_UNEXPECTED;
+  },
+  isPreferred: function(aContentType, aDesiredContentType) {
+    return false;
+  },
+  canHandleContent: function(aContentType, aIsContentPreferred, aDesiredContentType) {
+    return false;
+  },
+  loadCookie: null,
+  parentContentListener: null,
+  QueryInterface: function (aIID) {
+    if (aIID.equals(Components.interfaces.nsIURIContentListener) ||
+        aIID.equals(Components.interfaces.nsISupportsWeakReference) ||
+        aIID.equals(Components.interfaces.nsISupports))
+      return this;
+
+    throw Components.results.NS_ERROR_NO_INTERFACE;
+  }
+};
--- a/suite/common/helpviewer/help.xul
+++ b/suite/common/helpviewer/help.xul
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 # 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/.
 
-<?xml-stylesheet href="chrome://help/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/helpviewer/help.css" type="text/css"?>
 
 <?xul-overlay href="chrome://help/content/helpContextOverlay.xul"?>
 <!DOCTYPE window [
     <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
     %brandDTD;
     <!ENTITY % helpDTD SYSTEM "chrome://help/locale/help.dtd">
     %helpDTD;
 ]>
@@ -27,16 +27,17 @@
         persist="width height screenX screenY"
 #endif
         onload="init();"
         onunload="window.XULBrowserWindow.destroy();">
 
   <script type="application/javascript" src="chrome://help/content/help.js"/>
   <script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
   <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/findUtils.js"/>
 
   <menupopup id="backMenu" position="after_start"
              onpopupshowing="return createBackMenu(event);"
              oncommand="gotoHistoryIndex(event);"/>
   <menupopup id="forwardMenu" position="after_start"
              onpopupshowing="return createForwardMenu(event);"
              oncommand="gotoHistoryIndex(event);"/>
   <popupset id="contentAreaContextSet"/>
@@ -52,21 +53,21 @@
     <command id="Help:Back" oncommand="goBack();"       observes="canGoBack"/>
     <command id="Help:Forward" oncommand="goForward();" observes="canGoForward"/>
     <command id="Help:ToggleSidebar" oncommand="toggleSidebar();"/>
     <command id="cmd_closeWindow" oncommand="close();"/>
     <command id="cmd_fullZoomReduce" oncommand="ZoomManager.reduce();"/>
     <command id="cmd_fullZoomEnlarge" oncommand="ZoomManager.enlarge();"/>
     <command id="cmd_fullZoomReset" oncommand="ZoomManager.reset();"/>
     <command id="cmd_find"
-             oncommand="document.getElementById('FindToolbar').onFindCommand();"/>
+             oncommand="findInPage(getFindInstData());"/>
     <command id="cmd_findAgain"
-             oncommand="document.getElementById('FindToolbar').onFindAgainCommand(false);"/>
+             oncommand="findAgainInPage(getFindInstData(), false);"/>
     <command id="cmd_findPrevious"
-             oncommand="document.getElementById('FindToolbar').onFindAgainCommand(true);"/>
+             oncommand="findAgainInPage(getFindInstData(), true);"/>
     <command id="cmd_copy" oncommand="goDoCommand('cmd_copy')" disabled="true"/>
     <command id="cmd_selectAll" oncommand="goDoCommand('cmd_selectAll')"/>
   </commandset>
   <keyset id="keys">
     <key id="goHome"      keycode="VK_HOME"  command="Help:Home" modifiers="alt"/>
 #ifdef XP_UNIX
     <key key="&goBackCmd.commandkey;" command="Help:Back" modifiers="accel"/>
     <key key="&goForwardCmd.commandkey;" command="Help:Forward" modifiers="accel"/>
@@ -76,17 +77,17 @@
     <key id="goForwardKb" keycode="VK_RIGHT" command="Help:Forward" modifiers="accel"/>
 #else
     <key id="goBackKb"     keycode="VK_LEFT"  command="Help:Back" modifiers="alt"/>
     <key id="goForwardKb"  keycode="VK_RIGHT" command="Help:Forward" modifiers="alt"/>
     <key keycode="VK_BACK" command="Help:Back"/>
     <key keycode="VK_BACK" command="Help:Forward" modifiers="shift"/>
 #endif
     <key id="printKb" key="&printCmd.commandkey;" oncommand="print();"
-         modifiers="accel"/>  
+         modifiers="accel"/>
     <key id="key_find" key="&findOnCmd.commandkey;" command="cmd_find" modifiers="accel"/>
     <key id="key_findAgain" key="&findAgainCmd.commandkey;" command="cmd_findAgain" modifiers="accel"/>
     <key id="key_findPrevious" key="&findAgainCmd.commandkey;" command="cmd_findPrevious" modifiers="accel,shift"/>
     <key keycode="&findAgainCmd.commandkey2;" command="cmd_findAgain"/>
     <key keycode="&findAgainCmd.commandkey2;"  command="cmd_findPrevious" modifiers="shift"/>
     <key id="key_closeWindow" key="&closeWindow.commandkey;"
          command="cmd_closeWindow" modifiers="accel"/>
     <key id="key_closeSearchSidebar" keycode="VK_ESCAPE"
@@ -136,19 +137,21 @@
         <toolbarseparator/>
         <toolbarbutton id="help-print-button"
                        label="&printButton.label;"
                        oncommand="print();"
                        tooltiptext="&printButton.tooltip;"/>
         <toolbarspring flex="1"/>
         <toolbaritem id="search-box"
                      align="center" pack="center">
-          <textbox id="findText" type="search" placeholder="&search.emptytext;"
+          <textbox id="findText"
+                   type="search"
+                   placeholder="&search.emptytext;"
                    aria-controls="help-toc-panel"
-                   oncommand="doFind();"/>
+                   oncommand="showSidebar(); doFind();"/>
         </toolbaritem>
       </toolbar>
     </toolbox>
 
     <hbox flex="1">
       <vbox id="help-sidebar" persist="width">
         <vbox flex="1" id="help-toc-sidebar">
           <sidebarheader align="center">
@@ -254,21 +257,30 @@
                 datasources="rdf:null"
                 containment="http://home.netscape.com/NC-rdf#subheadings"
                 ref="urn:root" flags="dont-build-content"/>
         </vbox>
 
         <!-- END HIDDEN ITEMS -->
       </vbox>
 
-      <splitter id="help-sidebar-splitter" collapse="before"/>
+      <splitter id="help-sidebar-splitter" collapse="before">
+        <grippy/>
+      </splitter>
 
       <vbox id="appcontent" flex="3">
         <!-- type attribute is used by frame construction to locate
              iframes intended to hold (html) content -->
         <browser context="contentAreaContextMenu"
-                 type="content-primary" id="help-content"
-                 src="about:blank" flex="1"/>
+                 type="content-primary"
+                 id="help-content"
+                 src="about:blank"
+                 flex="1"
+                 onclick="return contentClick(event);"/>
         <findbar id="FindToolbar" browserid="help-content"/>
+        <browser type="content"
+                 id="help-external"
+                 collapsed="true"/>
+
       </vbox>
     </hbox>
 
 </window>
--- a/suite/common/jar.mn
+++ b/suite/common/jar.mn
@@ -1,16 +1,15 @@
 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/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
 % overlay chrome://editor/content/EditorPublish.xul chrome://communicator/content/helpEditorOverlay.xul
 % overlay chrome://editor/content/EditorPublishProgress.xul chrome://communicator/content/helpEditorOverlay.xul
 % overlay chrome://editor/content/EditorPublishSettings.xul chrome://communicator/content/helpEditorOverlay.xul
 % overlay chrome://editor/content/EdLinkProps.xul chrome://communicator/content/helpEditorOverlay.xul
 % overlay chrome://editor/content/EdTableProps.xul chrome://communicator/content/helpEditorOverlay.xul
 % overlay chrome://pippki/content/certManager.xul chrome://communicator/content/helpSecurityOverlay.xul
@@ -68,18 +67,16 @@ comm.jar:
    content/communicator/defaultClientDialog.js
    content/communicator/defaultClientDialog.xul
    content/communicator/findUtils.js
    content/communicator/fullscreen-video.xhtml
    content/communicator/gopherAddon.xhtml
    content/communicator/helpEditorOverlay.xul
    content/communicator/helpMessengerOverlay.xul
    content/communicator/helpSecurityOverlay.xul
-   content/communicator/helpOverlay.js
-   content/communicator/helpOverlay.xul
    content/communicator/labelsencodings.properties                  (/mozilla/dom/encoding/labelsencodings.properties)
 # the following file is a suite-specific override of the generic license.html, using suite/common/app-license.html as input:
 *  content/communicator/license.html                                (/mozilla/toolkit/content/license.html)
    content/communicator/nsContextMenu.js
    content/communicator/openLocation.js
    content/communicator/openLocation.xul
    content/communicator/passwordManager.xul
    content/communicator/safeMode.js
deleted file mode 100644
--- a/suite/locales/en-US/chrome/common/helpviewer/help-toc.rdf
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/. -->
-
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns:nc="http://home.netscape.com/NC-rdf#">
-
-  <rdf:Description about="urn:root">
-    <nc:subheadings>
-      <rdf:Seq>
-        <rdf:li> <rdf:Description ID="use-help" nc:name="Using the Help Window"
-                  nc:link="chrome://help/locale/welcome.xhtml"/> </rdf:li>
-      </rdf:Seq>
-    </nc:subheadings>
-  </rdf:Description>
-
-  <rdf:Description about="#use-help">
-    <nc:subheadings>
-      <rdf:Seq>
-        <rdf:li> <rdf:Description ID="use-help-finding-the-topic-you-want" nc:name="Finding the Topic You Want"
-                  nc:link="chrome://help/locale/welcome.xhtml#finding_the_topic_you_want"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="use-help-search" nc:name="Search Tips"
-                  nc:link="chrome://help/locale/welcome.xhtml#search_tips"/> </rdf:li>
-      </rdf:Seq>
-    </nc:subheadings>
-  </rdf:Description>
-
-</rdf:RDF>
deleted file mode 100644
--- a/suite/locales/en-US/chrome/common/helpviewer/welcome.xhtml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/. -->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
-    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-    %brandDTD;
-]
->
-<!--
-Contributors:
-  R.J. Keller <rlk@trfenv.com> (original author)
-  Jeff Walden <jwalden+code@mit.edu>
-  Steffen Wilberg <steffen.wilberg@web.de>
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title>Using the Help Window</title>
-  <link rel="stylesheet" type="text/css" href="chrome://help/skin/helpFileLayout.css"/>
-</head>
-
-<body>
-
-<h1 id="help_window_top">Using the Help Window</h1>
-
-<div class="contentsBox">In this section:
-  <ul>
-    <li><a href="#finding_the_topic_you_want">Finding the Topic You Want</a></li>
-    <li><a href="#search_tips">Search Tips</a></li>
-  </ul>
-</div>
-
-<h2 id="finding_the_topic_you_want">Finding the Topic You Want</h2>
-
-<p>To display help information in this window, click a topic in the
-  <em>Contents</em> sidebar. Click the <span class="noMac">plus icon</span>
-  <span class="mac">triangle</span> next to a topic to see its subtopics.</p>
-
-<p>To search for a help topic, type a word or phrase in the <em>Search</em> bar
-  to see related topics. Click on a topic to read about it. If your search
-  doesn't return any topics, try typing fewer words or a different combination
-  of words. The results will be displayed in the sidebar as you type. To
-  display the contents in the sidebar again, clear the <em>Search</em> bar or
-  press <kbd>Esc</kbd>.</p>
-
-<p>To see information related to the Help topic you are reading, click links in
-  the Help window just as you would in a regular web page.  You can also move
-  back and forth between pages you've already seen using the Back and Forward
-  buttons.</p>
-
-<h2 id="search_tips">Search Tips</h2>
-
-<p>If you don't find what you want, here are a few helpful tips:</p>
-
-<ul>
-  <li>Be sure that you are searching for something that relates to
-    &brandShortName;; this is not a general Internet search.</li>
-  <li>Try to broaden your search - don't be too specific; terms could be worded
-    differently than your search.</li>
-  <li>Avoid being too broad with your search.  For example, a common word like
-    &quot;page&quot; will likely return more topics than you want.</li>
-</ul>
-
-</body>
-</html>
--- a/suite/locales/jar.mn
+++ b/suite/locales/jar.mn
@@ -145,18 +145,16 @@
   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)
deleted file mode 100644
--- a/suite/themes/classic/communicator/helpOverlay.css
+++ /dev/null
@@ -1,106 +0,0 @@
-/* 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/. */
-
-/* ==== helpOverlay.css =====================================================
-   == overlay for toolkit help viewer to fit within SeaMonkey.
-   ========================================================================== */
-
-@import url("chrome://communicator/skin/");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#help-sidebar {
-  min-width: 30px;
-}
-
-/* ::::: toolbar icons ::::: */
-
-#HelpToolbar > toolbarbutton {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png") !important;
-}
-
-#help-back-button toolbarbutton,
-#help-forward-button toolbarbutton {
-  list-style-image: inherit;
-  -moz-image-region: inherit;
-}
-
-#help-back-button {
-  -moz-image-region: rect(60px 29px 89px 0);
-}
-
-#help-back-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(60px 59px 89px 30px);
-}
-
-#help-back-button:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(60px 89px 89px 60px);
-}
-
-#help-back-button[disabled="true"] {
-  -moz-image-region: rect(60px 119px 89px 90px);
-}
-
-#help-forward-button {
-  -moz-image-region: rect(90px 29px 119px 0);
-}
-
-#help-forward-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(90px 59px 119px 30px);
-}
-
-#help-forward-button:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(90px 89px 119px 60px);
-}
-
-#help-forward-button[disabled="true"] {
-  -moz-image-region: rect(90px 119px 119px 90px);
-}
-
-#help-home-button {
-  -moz-image-region: rect(120px 29px 149px 0);
-}
-
-#help-home-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(120px 59px 149px 30px);
-}
-
-#help-home-button:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(120px 89px 149px 60px);
-}
-
-#help-home-button[disabled="true"] {
-  -moz-image-region: rect(120px 119px 149px 90px);
-}
-
-#help-print-button {
-  -moz-image-region: rect(0 29px 29px 0);
-}
-
-#help-print-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(0 59px 29px 30px);
-}
-
-#help-print-button:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(0 89px 29px 60px);
-}
-
-#help-print-button[disabled="true"] {
-  -moz-image-region: rect(0 119px 29px 90px);
-}
-
-/* make findbar appear above content */
-#appcontent {
-  -moz-box-direction: reverse;
-}
-
-/* style findbar for being on top */
-#FindToolbar {
-  -moz-border-top-colors: ThreeDHighlight;
-  border-top-width: 1px;
-  border-bottom: 2px solid;
-  -moz-border-bottom-colors: ThreeDShadow ThreeDHighlight;
-  padding-top: 1px;
-  padding-bottom: 0px;
-}
deleted file mode 100644
index 58b9405911606ebb516bef85ef8d12e5082976e4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4cf3ea2cab44314d91dd2f146637af17b77f96fa..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index bf201d64f8d035d1b8eb05525f44f63790f4c0e0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/suite/themes/classic/communicator/helpviewer/help.css
+++ b/suite/themes/classic/communicator/helpviewer/help.css
@@ -1,25 +1,25 @@
 /* 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/. */
 
-@import url("chrome://global/skin/");
+@import url("chrome://communicator/skin/");
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #HelpToolbar toolbarbutton {
   -moz-box-orient: horizontal !important;
   min-width: 0px;
-  list-style-image: url("chrome://help/skin/Toolbar.png");
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
   margin: 0 !important;
   padding: 4px 5px;
 }
 
 #HelpToolbar:-moz-locale-dir(rtl) toolbarbutton {
-  list-style-image: url("chrome://help/skin/Toolbar-rtl.png");
+  list-style-image: url("chrome://communicator/skin/helpviewer/Toolbar-rtl.png");
 }
 
 /* Hide labels for the toolbar because we really don't need them what with the
    tooltips */
 #HelpToolbar .toolbarbutton-text {
   display: none;
 }
 
@@ -27,89 +27,110 @@
    from the label */
 #HelpToolbar .toolbarbutton-icon {
   margin-inline-end: 0;
 }
 
 /* Set the minimum sidebar width so the help contents aren't squeezed together.*/
 #help-sidebar { min-width: 15em; width: 20em; max-width: 25em; }
 
+#help-back-button toolbarbutton,
+#help-forward-button toolbarbutton {
+  list-style-image: inherit;
+  -moz-image-region: inherit;
+}
+
 /* ----- BACK BUTTON ----- */
 
 #help-back-button {
-  -moz-image-region: rect(0px 24px 24px 0px); 
+  -moz-image-region: rect(60px 29px 89px 0);
 }
 
-#help-back-button:not([disabled="true"]):hover { 
-  -moz-image-region: rect(24px 24px 48px 0px); 
+#help-back-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(60px 59px 89px 30px);
 }
 
-#help-back-button[disabled="true"] { 
-  -moz-image-region: rect(48px 24px 72px 0px); 
+#help-back-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(60px 89px 89px 60px);
 }
 
-#help-back-button:not([disabled="true"]):hover:active { 
-  -moz-image-region: rect(72px 24px 96px 0px); 
+#help-back-button[disabled="true"] {
+  -moz-image-region: rect(60px 119px 89px 90px);
 }
 
 #help-back-button .toolbarbutton-menubutton-button {
   -moz-box-align: end !important;
 }
 
 /* ----- FORWARD BUTTON ----- */
 
 #help-forward-button {
-  -moz-image-region: rect(0px 48px 24px 24px); 
+  -moz-image-region: rect(90px 29px 119px 0);
 }
 
 #help-forward-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(24px 48px 48px 24px); 
+  -moz-image-region: rect(90px 59px 119px 30px);
+}
+
+#help-forward-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(90px 89px 119px 60px);
 }
 
 #help-forward-button[disabled="true"] {
-  -moz-image-region: rect(48px 48px 72px 24px); 
-}
-
-#help-forward-button:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(72px 48px 96px 24px); 
+  -moz-image-region: rect(90px 119px 119px 90px);
 }
 
 /* ----- HOME BUTTON ----- */
 
-#help-home-button { 
-  -moz-image-region: rect(0px 72px 24px 48px); 
+#help-home-button {
+  -moz-image-region: rect(120px 29px 149px 0);
 }
 
-#help-home-button:not([disabled="true"]):hover { 
-  -moz-image-region: rect(24px 72px 48px 48px); 
+#help-home-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(120px 59px 149px 30px);
 }
 
-#help-home-button[disabled="true"] { 
-  -moz-image-region: rect(48px 72px 72px 48px); 
+#help-home-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(120px 89px 149px 60px);
 }
 
-#help-home-button:not([disabled="true"]):hover:active { 
-  -moz-image-region: rect(72px 72px 96px 48px); 
+#help-home-button[disabled="true"] {
+  -moz-image-region: rect(120px 119px 149px 90px);
 }
 
 /* ----- PRINT BUTTON ----- */
 
-#help-print-button { 
-  -moz-image-region: rect(0px 96px 24px 72px); 
+#help-print-button {
+  -moz-image-region: rect(0 29px 29px 0);
 }
 
-#help-print-button:not([disabled="true"]):hover { 
-  -moz-image-region: rect(24px 96px 48px 72px); 
+#help-print-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(0 59px 29px 30px);
 }
 
-#help-print-button[disabled="true"] { 
-  -moz-image-region: rect(48px 96px 72px 72px); 
+#help-print-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(0 89px 29px 60px);
 }
 
-#help-print-button:not([disabled="true"]):hover:active { 
-  -moz-image-region: rect(72px 96px 96px 72px); 
+#help-print-button[disabled="true"] {
+  -moz-image-region: rect(0 119px 29px 90px);
 }
 
 /* ----- OTHER ----- */
 
 #context-copy[disabled="true"] {
   display: none;
 }
+
+/* make findbar appear above content */
+#appcontent {
+  -moz-box-direction: reverse;
+}
+
+/* style findbar for being on top */
+#FindToolbar {
+  -moz-border-top-colors: ThreeDHighlight;
+  border-top-width: 1px;
+  border-bottom: 2px solid;
+  -moz-border-bottom-colors: ThreeDShadow ThreeDHighlight;
+  padding-top: 1px;
+  padding-bottom: 0px;
+}
deleted file mode 100644
--- a/suite/themes/classic/communicator/helpviewer/helpFileLayout.css
+++ /dev/null
@@ -1,157 +0,0 @@
-/* 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/. */
-
-@import url('chrome://help/content/platformClasses.css');
-
-body,
-td,
-th,
-input {
-  font-family: arial, verdana, sans-serif;
-  font-size: small;
-}
-
-body {
-  margin: 2ex;
-  max-width: 120ex;
-}
-
-:link:hover,
-:visited:hover {
-  color: -moz-activehyperlinktext;
-}
-
-hr {
-  height: 1px;
-  background-color: #000;
-  color: #000;
-  margin: 2em 0;
-}
-
-a[href^="http://"]:after,
-a[href^="https://"]:after {
-  content: url('chrome://help/skin/Weblink.png');
-}
-
-:link {
-  color: #039;
-}
-:visited {
-  color: #636;
-}
-:link:hover,
-:visited:hover {
-  color: #333;
-}
-:link:active,
-:link:active {
-  color: #000;
-}
-
-h1 {
-  font-size: 160%;
-  font-weight: normal;
-}
-h2 {
-  font-size: 150%;
-  font-weight: normal;
-}
-h3 {
-  font-size: 120%;
-}
-h4 {
-  font-size: 100%;
-}
-h5 {
-  font-size: 90%;
-}
-h6 {
-  font-size: 90%;
-  border: 0;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 1em 0 .2em;
-  border-bottom: 1px solid #ccc;
-  font-family: arial, verdana, sans-serif;
-}
-
-li h1,
-li h2,
-li h3,
-li h4,
-li h5,
-li h6 {
-  border: none;
-}
-
-
-dt {
-  font-weight: bold;
-}
-
-sup {
-  font-size: 70%;
-}
-
-:link img,
-:visited img {
-  border: 0;
-}
-
-.contentsBox, 
-.contentsBox > ul,
-li {
-  text-indent: 0;
-}
-
-.contentsBox > ul,
-.contentsBox ul > ul {
-  margin: 0;
-  list-style-type: none;
-}
-
-.contentsBox {
-  margin-top: 12px;
-  background-color: #eee;
-  border: 1px solid #ccc;
-  width: 300px;
-  padding: 1em;
-}
-
-.menuPath {
-  background: #c4d0f4; /* bluish color */
-  color: inherit;
-  padding-left:  1px; /* else bgcolor ends at last char - no space */
-  padding-right: 1px;
-}
-
-table {
-  border-collapse: collapse;
-}
-
-td,
-th {
-  border: 1px solid #ddd;
-  padding: 6px;
-  vertical-align: top;
-}
-
-th {
-  background-color: #eee;
-  font-weight: bold;
-  text-align: start;
-}
-
-.noTableBorder,
-.noTableBorder td,
-.noTableBorder th {
-  background-color: transparent;
-  border: none;
-}
--- a/suite/themes/classic/jar.mn
+++ b/suite/themes/classic/jar.mn
@@ -1,31 +1,29 @@
 # 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
 #ifdef XP_MACOSX
   skin/classic/communicator/aboutPrivateBrowsing.css                    (mac/communicator/aboutPrivateBrowsing.css)
   skin/classic/communicator/aboutSessionRestore.css                     (mac/communicator/aboutSessionRestore.css)
   skin/classic/communicator/button.css                                  (mac/communicator/button.css)
   skin/classic/communicator/communicator.css                            (mac/communicator/communicator.css)
   skin/classic/communicator/config.css                                  (mac/communicator/config.css)
-  skin/classic/communicator/helpOverlay.css                             (mac/communicator/helpOverlay.css)
   skin/classic/communicator/toolbar.css                                 (mac/communicator/toolbar.css)
   skin/classic/communicator/viewSourceOverlay.css                       (mac/communicator/viewSourceOverlay.css)
   skin/classic/communicator/bookmarks/bookmarks.css                     (mac/communicator/bookmarks/bookmarks.css)
   skin/classic/communicator/bookmarks/bookmarksManager.css              (mac/communicator/bookmarks/bookmarksManager.css)
   skin/classic/communicator/bookmarks/bookmarksMenu.png                 (mac/communicator/bookmarks/bookmarksMenu.png)
   skin/classic/communicator/bookmarks/bookmarksToolbar.css              (mac/communicator/bookmarks/bookmarksToolbar.css)
   skin/classic/communicator/bookmarks/bookmarksToolbar.png              (mac/communicator/bookmarks/bookmarksToolbar.png)
   skin/classic/communicator/bookmarks/editBookmarkOverlay.css           (mac/communicator/bookmarks/editBookmarkOverlay.css)
@@ -36,19 +34,16 @@ classic.jar:
   skin/classic/communicator/console/console-error-dash.gif              (mac/communicator/console/console-error-dash.gif)
   skin/classic/communicator/console/console.css                         (mac/communicator/console/console.css)
   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)
@@ -62,17 +57,16 @@ classic.jar:
   skin/classic/communicator/toolbar/toolbar-gradient22.png              (mac/communicator/toolbar/toolbar-gradient22.png)
   skin/classic/communicator/toolbar/toolbar-gradient34.png              (mac/communicator/toolbar/toolbar-gradient34.png)
 #else
   skin/classic/communicator/aboutPrivateBrowsing.css                    (communicator/aboutPrivateBrowsing.css)
   skin/classic/communicator/aboutSessionRestore.css                     (communicator/aboutSessionRestore.css)
   skin/classic/communicator/button.css                                  (communicator/button.css)
   skin/classic/communicator/communicator.css                            (communicator/communicator.css)
   skin/classic/communicator/config.css                                  (communicator/config.css)
-  skin/classic/communicator/helpOverlay.css                             (communicator/helpOverlay.css)
   skin/classic/communicator/toolbar.css                                 (communicator/toolbar.css)
   skin/classic/communicator/viewSourceOverlay.css                       (communicator/viewSourceOverlay.css)
   skin/classic/communicator/bookmarks/bookmark-folder-closed.png        (communicator/bookmarks/bookmark-folder-closed.png)
   skin/classic/communicator/bookmarks/bookmark-folder-dis.png           (communicator/bookmarks/bookmark-folder-dis.png)
   skin/classic/communicator/bookmarks/bookmark-folder-open.png          (communicator/bookmarks/bookmark-folder-open.png)
   skin/classic/communicator/bookmarks/bookmarks.css                     (communicator/bookmarks/bookmarks.css)
   skin/classic/communicator/bookmarks/bookmarksManager.css              (communicator/bookmarks/bookmarksManager.css)
   skin/classic/communicator/bookmarks/bookmarksMenu.png                 (communicator/bookmarks/bookmarksMenu.png)
@@ -89,22 +83,18 @@ classic.jar:
   skin/classic/communicator/console/console-toolbar-XP.png              (communicator/console/console-toolbar-XP.png)
   skin/classic/communicator/console/itemSelected.png                    (communicator/console/itemSelected.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)
deleted file mode 100644
--- a/suite/themes/classic/mac/communicator/helpOverlay.css
+++ /dev/null
@@ -1,117 +0,0 @@
-/* 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/. */
-
-/* ==== helpOverlay.css =====================================================
-   == overlay for toolkit help viewer to fit within SeaMonkey.
-   ========================================================================== */
-
-@import url("chrome://communicator/skin/");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#help-sidebar {
-  min-width: 30px;
-}
-
-/* ::::: toolbar icons ::::: */
-
-#HelpToolbar > toolbarbutton {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png") !important;
-}
-
-#HelpToolbar > toolbarbutton[type="menu-button"] {
-  margin: 0 2px 0 2px;
-  padding: 3px 1px 3px 1px;
-}
-
-#help-back-button toolbarbutton,
-#help-forward-button toolbarbutton {
-  list-style-image: inherit;
-  -moz-image-region: inherit;
-}
-
-#help-back-button,
-#help-back-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(60px 29px 89px 0);
-}
-
-#help-back-button:not([disabled="true"]):hover:active,
-#help-back-button[open]:not([disabled="true"]) {
-  -moz-image-region: rect(60px 59px 89px 30px);
-}
-
-#help-back-button[disabled="true"] {
-  -moz-image-region: rect(60px 89px 89px 60px);
-}
-
-#help-forward-button,
-#help-forward-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(90px 29px 119px 0);
-}
-
-#help-forward-button:not([disabled="true"]):hover:active,
-#help-forward-button[open]:not([disabled="true"]) {
-  -moz-image-region: rect(90px 59px 119px 30px);
-}
-
-#help-forward-button[disabled="true"] {
-  -moz-image-region: rect(90px 89px 119px 60px);
-}
-
-#help-home-button,
-#help-home-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(120px 29px 149px 0);
-}
-
-#help-home-button:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(120px 59px 149px 30px);
-}
-
-#help-home-button[disabled="true"] {
-  -moz-image-region: rect(120px 89px 149px 60px);
-}
-
-#help-print-button,
-#help-print-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(0 29px 29px 0);
-}
-
-#help-print-button:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(0 59px 29px 30px);
-}
-
-#help-print-button[disabled="true"] {
-  -moz-image-region: rect(0 89px 29px 60px);
-}
-
-#help-back-button > .toolbarbutton-menubutton-dropmarker,
-#help-back-button:hover > .toolbarbutton-menubutton-dropmarker,
-#help-back-button:hover:active > .toolbarbutton-menubutton-dropmarker,
-#help-forward-button > .toolbarbutton-menubutton-dropmarker,
-#help-forward-button:hover > .toolbarbutton-menubutton-dropmarker,
-#help-forward-button:hover:active > .toolbarbutton-menubutton-dropmarker {
-  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
-  -moz-image-region: auto;
-}
-
-#help-back-button[disabled="true"] > .toolbarbutton-menubutton-dropmarker,
-#help-forward-button[disabled="true"] > .toolbarbutton-menubutton-dropmarker {
-  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.png") !important;
-  -moz-image-region: auto !important;
-}
-
-#help-sidebar-splitter {
-  border-inline-end: 1px solid #BEBEBE;
-}
-
-/* make findbar appear above content */
-#appcontent {
-  -moz-box-direction: reverse;
-}
-
-/* style findbar for being on top */
-#FindToolbar {
-  border-top: none;
-  border-bottom: 1px solid #888888;
-}
deleted file mode 100644
index 165a2c1f94aa13c11208da82e59d2fbe5e5bffc6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4022fb8e90c0af4f7da247cc45933e129edbdde3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/suite/themes/classic/mac/communicator/helpviewer/help.css
+++ b/suite/themes/classic/mac/communicator/helpviewer/help.css
@@ -1,102 +1,136 @@
 /* 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/. */
 
-@import url("chrome://global/skin/");
+@import url("chrome://communicator/skin/");
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #HelpToolbar {
   padding-inline-start: 5px;
 }
 
 #HelpToolbar toolbarbutton {
   min-width: 0px;
-  list-style-image: url("chrome://help/skin/Toolbar.png");
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
   -moz-box-orient: horizontal !important;
 }
 
 #HelpToolbar toolbarbutton[type="menu-button"] {
-  margin: 0px;
-  padding: 0px;
+  margin: 0 2px 0 2px;
+  padding: 3px 1px 3px 1px;
+
 }
 
 /* this element contains the icon and the label */
 #HelpToolbar .toolbarbutton-menubutton-button {
   margin: 0px !important;
   padding: 0px !important;
   border: 0px !important;
 }
 
 /* Hide labels for the toolbar because we really don't need them what with the
    tooltips */
 #HelpToolbar .toolbarbutton-text {
   display: none;
 }
 
 /* Set the minimum sidebar width so the help contents aren't squeezed together.*/
-#help-sidebar { min-width: 15em; width: 20em; max-width: 25em; }
+#help-sidebar { min-width: 30px; width: 20em; max-width: 25em; }
+
+#help-back-button toolbarbutton,
+#help-forward-button toolbarbutton {
+  list-style-image: inherit;
+  -moz-image-region: inherit;
+}
+
+#help-back-button,
+#help-back-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(60px 29px 89px 0);
+}
 
-#help-back-button { -moz-image-region: rect(0px 24px 24px 0px); }
-#help-back-button:not([disabled="true"]):hover { -moz-image-region: rect(24px 24px 48px 0px); }
-#help-back-button[disabled="true"] { -moz-image-region: rect(48px 24px 72px 0px); }
-#help-back-button:not([disabled="true"]):hover:active { -moz-image-region: rect(72px 24px 96px 0px); }
+#help-back-button:not([disabled="true"]):hover:active,
+#help-back-button[open]:not([disabled="true"]) {
+  -moz-image-region: rect(60px 59px 89px 30px);
+}
+
+#help-back-button[disabled="true"] {
+  -moz-image-region: rect(60px 89px 89px 60px);
+}
+
+#help-forward-button,
+#help-forward-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(90px 29px 119px 0);
+}
 
-#help-forward-button { -moz-image-region: rect(0px 48px 24px 24px); }
-#help-forward-button:not([disabled="true"]):hover { -moz-image-region: rect(24px 48px 48px 24px); }
-#help-forward-button[disabled="true"] { -moz-image-region: rect(48px 48px 72px 24px); }
-#help-forward-button:not([disabled="true"]):hover:active { -moz-image-region: rect(72px 48px 96px 24px); }
+#help-forward-button:not([disabled="true"]):hover:active,
+#help-forward-button[open]:not([disabled="true"]) {
+  -moz-image-region: rect(90px 59px 119px 30px);
+}
+
+#help-forward-button[disabled="true"] {
+  -moz-image-region: rect(90px 89px 119px 60px);
+}
+
+#help-home-button,
+#help-home-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(120px 29px 149px 0);
+}
 
-#help-home-button { -moz-image-region: rect(0px 72px 24px 48px); }
-#help-home-button:not([disabled="true"]):hover { -moz-image-region: rect(24px 72px 48px 48px); }
-#help-home-button[disabled="true"] { -moz-image-region: rect(48px 72px 72px 48px); }
-#help-home-button:not([disabled="true"]):hover:active { -moz-image-region: rect(72px 72px 96px 48px); }
+#help-home-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(120px 59px 149px 30px);
+}
+
+#help-home-button[disabled="true"] {
+  -moz-image-region: rect(120px 89px 149px 60px);
+}
 
-#help-print-button { -moz-image-region: rect(0px 96px 24px 72px); }
-#help-print-button:not([disabled="true"]):hover { -moz-image-region: rect(24px 96px 48px 72px); }
-#help-print-button[disabled="true"] { -moz-image-region: rect(48px 96px 72px 72px); }
-#help-print-button:not([disabled="true"]):hover:active { -moz-image-region: rect(72px 96px 96px 72px); }
+#help-print-button,
+#help-print-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#help-print-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#help-print-button[disabled="true"] {
+  -moz-image-region: rect(0 89px 29px 60px);
+}
 
 /* Style the back/forward dropmarks to connect them to the buttons */
 
-/* Style the back dropmark */
-
-#help-back-button > .toolbarbutton-menubutton-dropmarker {
+#help-back-button > .toolbarbutton-menubutton-dropmarker,
+#help-forward-button > .toolbarbutton-menubutton-dropmarker {
   margin-top: 3px;
-  list-style-image: url("chrome://help/skin/dropmark-nav.png");
-  -moz-image-region: rect(0px, 14px, 24px, 0px);
 }
 
-#help-back-button:hover > .toolbarbutton-menubutton-dropmarker {
-  -moz-image-region: rect(24px, 14px, 48px, 0px);
-}
-
-#help-back-button[disabled="true"] > .toolbarbutton-menubutton-dropmarker {
-  list-style-image: url("chrome://help/skin/dropmark-nav.png") !important;
-  -moz-image-region: rect(48px, 14px, 72px, 0px) !important;
-}
-
-#help-back-button:hover:active > .toolbarbutton-menubutton-dropmarker {
-  -moz-image-region: rect(72px, 14px, 96px, 0px);
+#help-back-button > .toolbarbutton-menubutton-dropmarker,
+#help-back-button:hover > .toolbarbutton-menubutton-dropmarker,
+#help-back-button:hover:active > .toolbarbutton-menubutton-dropmarker,
+#help-forward-button > .toolbarbutton-menubutton-dropmarker,
+#help-forward-button:hover > .toolbarbutton-menubutton-dropmarker,
+#help-forward-button:hover:active > .toolbarbutton-menubutton-dropmarker {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+  -moz-image-region: auto;
 }
 
-/* Style the forward dropmark */
-
-#help-forward-button > .toolbarbutton-menubutton-dropmarker {
-  margin-top: 3px;
-  list-style-image: url("chrome://help/skin/dropmark-nav.png");
-  -moz-image-region: rect(0px, 14px, 24px, 0px);
+#help-back-button[disabled="true"] > .toolbarbutton-menubutton-dropmarker,
+#help-forward-button[disabled="true"] > .toolbarbutton-menubutton-dropmarker {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.png") !important;
+  -moz-image-region: auto !important;
 }
-#help-forward-button:hover > .toolbarbutton-menubutton-dropmarker {
-  -moz-image-region: rect(24px, 14px, 48px, 0px);
-}
-#help-forward-button[disabled="true"] > .toolbarbutton-menubutton-dropmarker {
-  list-style-image: url("chrome://help/skin/dropmark-nav.png") !important;
-  -moz-image-region: rect(48px, 14px, 72px, 0px) !important;
-}
-#help-forward-button:hover:active > .toolbarbutton-menubutton-dropmarker {
-  -moz-image-region: rect(72px, 14px, 96px, 0px);
+
+#help-sidebar-splitter {
+  border-inline-end: 1px solid #BEBEBE;
 }
 
-#helpsidebar-splitter {
-  border-right: 1px solid #bebebe;
+/* make findbar appear above content */
+#appcontent {
+  -moz-box-direction: reverse;
 }
+
+/* style findbar for being on top */
+#FindToolbar {
+  border-top: none;
+  border-bottom: 1px solid #888888;
+}
deleted file mode 100644
--- a/suite/themes/classic/mac/communicator/helpviewer/helpFileLayout.css
+++ /dev/null
@@ -1,157 +0,0 @@
-/* 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/. */
-
-@import url('chrome://help/content/platformClasses.css');
-
-body,
-td,
-th,
-input {
-  font-family: verdana, sans-serif;
-  font-size: small;
-}
-
-body {
-  margin: 2ex;
-  max-width: 120ex;
-}
-
-:link:hover,
-:visited:hover {
-  color: -moz-activehyperlinktext;
-}
-
-hr {
-  height: 1px;
-  background-color: #000;
-  color: #000;
-  margin: 2em 0;
-}
-
-a[href^="http://"]:after,
-a[href^="https://"]:after {
-  content: url('chrome://help/skin/Weblink.png');
-}
-
-:link {
-  color: #039;
-}
-:visited {
-  color: #636;
-}
-:link:hover,
-:visited:hover {
-  color: #333;
-}
-:link:active,
-:link:active {
-  color: #000;
-}
-
-h1 {
-  font-size: 160%;
-  font-weight: normal;
-}
-h2 {
-  font-size: 150%;
-  font-weight: normal;
-}
-h3 {
-  font-size: 120%;
-}
-h4 {
-  font-size: 100%;
-}
-h5 {
-  font-size: 90%;
-}
-h6 {
-  font-size: 90%;
-  border: 0;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 1em 0 .2em;
-  border-bottom: 1px solid #ccc;
-  font-family: arial, verdana, sans-serif;
-}
-
-li h1,
-li h2,
-li h3,
-li h4,
-li h5,
-li h6 {
-  border: none;
-}
-
-
-dt {
-  font-weight: bold;
-}
-
-sup {
-  font-size: 70%;
-}
-
-:link img,
-:visited img {
-  border: 0;
-}
-
-.contentsBox, 
-.contentsBox > ul,
-li {
-  text-indent: 0;
-}
-
-.contentsBox > ul,
-.contentsBox ul > ul {
-  margin: 0;
-  list-style-type: none;
-}
-
-.contentsBox {
-  margin-top: 12px;
-  background-color: #eee;
-  border: 1px solid #ccc;
-  width: 300px;
-  padding: 1em;
-}
-
-.menuPath {
-  background: #c4d0f4; /* bluish color */
-  color: inherit;
-  padding-left:  1px; /* else bgcolor ends at last char - no space */
-  padding-right: 1px;
-}
-
-table {
-  border-collapse: collapse;
-}
-
-td,
-th {
-  border: 1px solid #ddd;
-  padding: 6px;
-  vertical-align: top;
-}
-
-th {
-  background-color: #eee;
-  font-weight: bold;
-  text-align: start;
-}
-
-.noTableBorder,
-.noTableBorder td,
-.noTableBorder th {
-  background-color: transparent;
-  border: none;
-}
deleted file mode 100644
--- a/suite/themes/modern/communicator/helpOverlay.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/* 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/. */
-
-/* modern help is styled in its own help component */
deleted file mode 100644
--- a/suite/themes/modern/communicator/helpviewer/helpFileLayout.css
+++ /dev/null
@@ -1,157 +0,0 @@
-/* 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/. */
-
-@import url('chrome://help/content/platformClasses.css');
-
-body,
-td,
-th,
-input {
-  font-family: arial, verdana, sans-serif;
-  font-size: small;
-}
-
-body {
-  margin: 2ex;
-  max-width: 120ex;
-}
-
-:link:hover,
-:visited:hover {
-  color: -moz-activehyperlinktext;
-}
-
-hr {
-  height: 1px;
-  background-color: #000;
-  color: #000;
-  margin: 2em 0;
-}
-
-a[href^="http://"]:after,
-a[href^="https://"]:after {
-  content: url('chrome://help/skin/Weblink.png');
-}
-
-:link {
-  color: #039;
-}
-:visited {
-  color: #636;
-}
-:link:hover,
-:visited:hover {
-  color: #333;
-}
-:link:active,
-:link:active {
-  color: #000;
-}
-
-h1 {
-  font-size: 160%;
-  font-weight: normal;
-}
-h2 {
-  font-size: 150%;
-  font-weight: normal;
-}
-h3 {
-  font-size: 120%;
-}
-h4 {
-  font-size: 100%;
-}
-h5 {
-  font-size: 90%;
-}
-h6 {
-  font-size: 90%;
-  border: 0;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 1em 0 .2em;
-  border-bottom: 1px solid #ccc;
-  font-family: arial, verdana, sans-serif;
-}
-
-li h1,
-li h2,
-li h3,
-li h4,
-li h5,
-li h6 {
-  border: none;
-}
-
-
-dt {
-  font-weight: bold;
-}
-
-sup {
-  font-size: 70%;
-}
-
-:link img,
-:visited img {
-  border: 0;
-}
-
-.contentsBox, 
-.contentsBox > ul,
-li {
-  text-indent: 0;
-}
-
-.contentsBox > ul,
-.contentsBox ul > ul {
-  margin: 0;
-  list-style-type: none;
-}
-
-.contentsBox {
-  margin-top: 12px;
-  background-color: #eee;
-  border: 1px solid #ccc;
-  width: 300px;
-  padding: 1em;
-}
-
-.menuPath {
-  background: #c4d0f4; /* bluish color */
-  color: inherit;
-  padding-left:  1px; /* else bgcolor ends at last char - no space */
-  padding-right: 1px;
-}
-
-table {
-  border-collapse: collapse;
-}
-
-td,
-th {
-  border: 1px solid #ddd;
-  padding: 6px;
-  vertical-align: top;
-}
-
-th {
-  background-color: #eee;
-  font-weight: bold;
-  text-align: start;
-}
-
-.noTableBorder,
-.noTableBorder td,
-.noTableBorder th {
-  background-color: transparent;
-  border: none;
-}
--- a/suite/themes/modern/jar.mn
+++ b/suite/themes/modern/jar.mn
@@ -3,17 +3,16 @@
 # 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/communicator/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
@@ -22,17 +21,16 @@ modern.jar:
   skin/modern/communicator/blockedSite.css                         (communicator/blockedSite.css)
   skin/modern/communicator/certError.css                           (communicator/certError.css)
   skin/modern/communicator/prefpanels.css                          (communicator/prefpanels.css)
   skin/modern/communicator/preferences.css                         (communicator/preferences.css)
   skin/modern/communicator/tasksOverlay.css                        (communicator/tasksOverlay.css)
   skin/modern/communicator/button.css                              (communicator/button.css)
   skin/modern/communicator/toolbar.css                             (communicator/toolbar.css)
   skin/modern/communicator/dialogs.css                             (communicator/dialogs.css)
-  skin/modern/communicator/helpOverlay.css                         (communicator/helpOverlay.css)
   skin/modern/communicator/smileys.css                             (communicator/smileys.css)
   skin/modern/communicator/communicator.css                        (communicator/communicator.css)
   skin/modern/communicator/aboutPrivateBrowsing.css                (communicator/aboutPrivateBrowsing.css)
   skin/modern/communicator/aboutSessionRestore.css                 (communicator/aboutSessionRestore.css)
   skin/modern/communicator/viewSourceOverlay.css                   (communicator/viewSourceOverlay.css)
   skin/modern/communicator/bookmarks/allBookmarks.png              (communicator/bookmarks/allBookmarks.png)
   skin/modern/communicator/bookmarks/bookmark.png                  (communicator/bookmarks/bookmark.png)
   skin/modern/communicator/bookmarks/bookmark-folder-closed.gif    (communicator/bookmarks/bookmark-folder-closed.gif)
@@ -68,17 +66,16 @@ modern.jar:
   skin/modern/communicator/directory/directory.css                 (communicator/directory/directory.css)
   skin/modern/communicator/downloads/dl-remove.png                 (communicator/downloads/dl-remove.png)
   skin/modern/communicator/downloads/downloadButtons.png           (communicator/downloads/downloadButtons.png)
   skin/modern/communicator/downloads/downloadmanager.css           (communicator/downloads/downloadmanager.css)
   skin/modern/communicator/feed-subscribe.css                      (communicator/feed-subscribe.css)
   skin/modern/communicator/feed-subscribe-ui.css                   (communicator/feed-subscribe-ui.css)
   skin/modern/communicator/fullscreen-video.css                    (communicator/fullscreen-video.css)
   skin/modern/communicator/helpviewer/help.css                     (communicator/helpviewer/help.css)
-  skin/modern/communicator/helpviewer/helpFileLayout.css           (communicator/helpviewer/helpFileLayout.css)
   skin/modern/communicator/history/calendar.png                    (communicator/history/calendar.png)
   skin/modern/communicator/icons/alwaysAsk.png                     (communicator/icons/alwaysAsk.png)
   skin/modern/communicator/icons/application.png                   (communicator/icons/application.png)
   skin/modern/communicator/icons/audioFeedIcon.png                 (communicator/icons/feedIcon.png)
   skin/modern/communicator/icons/closeFullScreenVideo.png          (communicator/icons/closeFullScreenVideo.png)
   skin/modern/communicator/icons/btn1.gif                          (communicator/icons/btn1.gif)
   skin/modern/communicator/icons/common.png                        (communicator/icons/common.png)
   skin/modern/communicator/icons/common-small.png                  (communicator/icons/common-small.png)