From 73f4356070dad60ea6bf09209e0e62b247480f07 Mon Sep 17 00:00:00 2001
From: "morse%netscape.com" <morse%netscape.com>
Date: Wed, 21 Feb 2001 05:14:11 +0000
Subject: [PATCH] new file, not yet part of build

---
 extensions/cookie/jar.mn                      |  16 ++
 .../cookie/resources/content/contents.rdf     |  36 +++++
 .../content/cookieContextOverlay.xul          | 120 +++++++++++++++
 .../cookie/resources/content/cookieOverlay.js |  33 +++++
 .../resources/content/cookiePrefsOverlay.xul  |  47 ++++++
 .../resources/content/cookieTasksOverlay.xul  | 138 ++++++++++++++++++
 .../cookie/resources/content/pref-cookies.xul |  71 +++++++++
 .../cookie/resources/content/pref-images.xul  | 119 +++++++++++++++
 .../resources/locale/en-US/contents.rdf       |  21 +++
 .../locale/en-US/cookieContextOverlay.dtd     |   2 +
 .../locale/en-US/cookiePrefsOverlay.dtd       |   2 +
 .../locale/en-US/cookieTasksOverlay.dtd       |  22 +++
 .../resources/locale/en-US/pref-cookies.dtd   |  28 ++++
 .../resources/locale/en-US/pref-images.dtd    |  22 +++
 .../cookie/locale/en-US/contents.rdf          |  21 +++
 .../content/cookieTasksOverlay.xul            | 138 ++++++++++++++++++
 .../content/imageContextOverlay.xul           | 120 +++++++++++++++
 .../permissions/content/permissionsOverlay.js |  33 +++++
 .../locale/en-US/cookieTasksOverlay.dtd       |  22 +++
 .../locale/en-US/imageContextOverlay.dtd      |   2 +
 .../resources/content/cookiePrefsOverlay.xul  |  47 ++++++
 .../content/permissionsPrefsOverlay.xul       |  47 ++++++
 .../locale/en-US/cookiePrefsOverlay.dtd       |   2 +
 .../locale/en-US/permissionsPrefsOverlay.dtd  |   2 +
 24 files changed, 1111 insertions(+)
 create mode 100644 extensions/cookie/jar.mn
 create mode 100644 extensions/cookie/resources/content/contents.rdf
 create mode 100644 extensions/cookie/resources/content/cookieContextOverlay.xul
 create mode 100644 extensions/cookie/resources/content/cookieOverlay.js
 create mode 100644 extensions/cookie/resources/content/cookiePrefsOverlay.xul
 create mode 100644 extensions/cookie/resources/content/cookieTasksOverlay.xul
 create mode 100644 extensions/cookie/resources/content/pref-cookies.xul
 create mode 100644 extensions/cookie/resources/content/pref-images.xul
 create mode 100644 extensions/cookie/resources/locale/en-US/contents.rdf
 create mode 100644 extensions/cookie/resources/locale/en-US/cookieContextOverlay.dtd
 create mode 100644 extensions/cookie/resources/locale/en-US/cookiePrefsOverlay.dtd
 create mode 100644 extensions/cookie/resources/locale/en-US/cookieTasksOverlay.dtd
 create mode 100644 extensions/cookie/resources/locale/en-US/pref-cookies.dtd
 create mode 100644 extensions/cookie/resources/locale/en-US/pref-images.dtd
 create mode 100644 xpfe/components/cookie/locale/en-US/contents.rdf
 create mode 100644 xpfe/components/permissions/content/cookieTasksOverlay.xul
 create mode 100644 xpfe/components/permissions/content/imageContextOverlay.xul
 create mode 100644 xpfe/components/permissions/content/permissionsOverlay.js
 create mode 100644 xpfe/components/permissions/locale/en-US/cookieTasksOverlay.dtd
 create mode 100644 xpfe/components/permissions/locale/en-US/imageContextOverlay.dtd
 create mode 100644 xpfe/components/prefwindow/resources/content/cookiePrefsOverlay.xul
 create mode 100644 xpfe/components/prefwindow/resources/content/permissionsPrefsOverlay.xul
 create mode 100644 xpfe/components/prefwindow/resources/locale/en-US/cookiePrefsOverlay.dtd
 create mode 100644 xpfe/components/prefwindow/resources/locale/en-US/permissionsPrefsOverlay.dtd

diff --git a/extensions/cookie/jar.mn b/extensions/cookie/jar.mn
new file mode 100644
index 000000000000..1a51c92f54e6
--- /dev/null
+++ b/extensions/cookie/jar.mn
@@ -0,0 +1,16 @@
+comm.jar:
+	content/communicator/cookie/contents.rdf			(resources/content/contents.rdf)
+	content/communicator/cookie/cookieTasksOverlay.xul		(resources/content/cookieTasksOverlay.xul)
+	content/communicator/cookie/cookieContextOverlay.xul		(resources/content/cookieContextOverlay.xul)
+	content/communicator/cookie/cookiePrefsOverlay.xul		(resources/content/cookiePrefsOverlay.xul)
+	content/communicator/cookie/pref-cookies.xul			(resources/content/pref-cookies.xul)
+	content/communicator/cookie/pref-images.xul			(resources/content/pref-images.xul)
+	content/communicator/cookie/cookieOverlay.js			(resources/content/cookieOverlay.js)
+
+en-US.jar:
+	locale/en-US/communicator/cookie/contents.rdf			(resources/locale/en-US/contents.rdf)
+	locale/en-US/communicator/cookie/cookieTasksOverlay.dtd		(resources/locale/en-US/cookieTasksOverlay.dtd)
+	locale/en-US/communicator/cookie/cookieContextOverlay.dtd	(resources/locale/en-US/cookieContextOverlay.dtd)
+	locale/en-US/communicator/cookie/cookiePrefsOverlay.dtd		(resources/locale/en-US/cookiePrefsOverlay.dtd)
+	locale/en-US/communicator/cookie/pref-cookies.dtd		(resources/locale/en-US/pref-cookies.dtd)
+	locale/en-US/communicator/cookie/pref-images.dtd		(resources/locale/en-US/pref-images.dtd)
diff --git a/extensions/cookie/resources/content/contents.rdf b/extensions/cookie/resources/content/contents.rdf
new file mode 100644
index 000000000000..4427638bfccd
--- /dev/null
+++ b/extensions/cookie/resources/content/contents.rdf
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:cookie"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:cookie"
+        chrome:displayName="Cookie Manager"
+        chrome:author="mozilla.org"
+        chrome:name="cookie">
+  </RDF:Description>
+
+  <!-- overlay information -->
+  <RDF:Seq about="urn:mozilla:overlays">
+    <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
+    <RDF:li resource="chrome://communicator/content/contentAreaContextOverlay.xul"/>
+    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
+    <RDF:li>chrome://content/communicator/cookie/cookieTasksOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://communicator/content/contentAreaContextOverlay.xul">
+    <RDF:li>chrome://content/communicator/cookie/cookieContextOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
+    <RDF:li>chrome://communicator/content/cookie/cookiePrefsOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+</RDF:RDF>
diff --git a/extensions/cookie/resources/content/cookieContextOverlay.xul b/extensions/cookie/resources/content/cookieContextOverlay.xul
new file mode 100644
index 000000000000..59c9a0a0f22e
--- /dev/null
+++ b/extensions/cookie/resources/content/cookieContextOverlay.xul
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+
+<!--
+   The contents of this file are subject to the Netscape Public
+   License Version 1.1 (the "License"); you may not use this file
+   except in compliance with the License. You may obtain a copy of
+   the License at http://www.mozilla.org/NPL/
+    
+   Software distributed under the License is distributed on an "AS
+   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   implied. See the License for the specific language governing
+   rights and limitations under the License.
+    
+   The Original Code is Mozilla Communicator client code, released
+   March 31, 1998.
+   
+   The Initial Developer of the Original Code is Netscape
+   Communications Corporation. Portions created by Netscape are
+   Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   Rights Reserved.
+   
+   Contributor(s): 
+  -->
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/cookie/cookieContextOverlay.dtd">
+
+<overlay id="cookieContextOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script language="javascript" src="chrome://communicator/content/cookie/cookieOverlay.js"/>
+
+  <script language="JavaScript">
+  <![CDATA[
+
+    // Code from nsContextMenu.js. Note that we extend the prototype here, rather 
+    // than making these methods on a new object, as some methods require access
+    // to data maintained by nsContextMenu.  
+
+    var cookieContextMenu = {
+
+      // Determine if "Block Image" is to appear in the menu.
+      // Return true if "imageBlocker.enabled" pref is set and image is not already blocked.
+      isBlockingImages : function () {
+        /* determine if "imageBlocker.enabled" pref is set */
+        var pref = contextMenu.getService('@mozilla.org/preferences;1', 'nsIPref');
+        var result = false;
+        try {
+          result = pref.GetBoolPref( "imageblocker.enabled" );
+        } catch(e) {
+        }
+        if (!result) {
+          /* pref is not set so return false */
+          return false;
+        }
+  
+        /* determine if image is already being blocked */
+        var cookieViewer = contextMenu.createInstance
+          ("@mozilla.org/cookieviewer/cookieviewer-world;1", "nsICookieViewer");
+        var list = cookieViewer.GetPermissionValue(1);
+        var permissionList  = list.split(list[0]);
+        for(var i = 1; i < permissionList.length; i+=2) {
+          var permStr = permissionList[i+1];
+          var type = permStr.substring(0,1);
+          if (type == "-") {
+            /* some host is being blocked, need to find out if it's our image's host */
+            var host = permStr.substring(1,permStr.length);
+            if (host && contextMenu.imageURL.search(host) != -1) {
+              /* it's our image's host that's being blocked */
+
+              return false;
+            }
+          }
+        }  
+        /* image is not already being blocked, so "Block Image" can appear on the menu */
+        return true;
+      },
+
+      // Block image from loading in the future.
+      blockImage : function () {
+        var cookieViewer =
+          contextMenu.createInstance("@mozilla.org/cookieviewer/cookieviewer-world;1",
+                                     "nsICookieViewer" );
+        cookieViewer.BlockImage(this.imageURL);
+      },
+
+      initImageBlocking : function () {
+        // Block image depends on whether an image was clicked on, and,
+        // whether the user pref is enabled.
+        contextMenu.showItem
+          ("context-blockimage",
+           contextMenu.onImage && cookieContextMenu.isBlockingImages());
+      },
+
+      addContextMenuItemListeners : function (aEvent) {
+        var contextPopup = document.getElementById("contentAreaContextSet");
+        contextPopup.addEventListener("create", cookieContextMenu.initImageBlocking, false);
+      }
+    }
+
+    window.addEventListener("load", cookieContextMenu.addContextMenuItemListeners, false);
+
+    // For some unexplainable reason, this overlay is loaded twice as can be demonstrated
+    // by uncommenting the following "dump" statement which will get displayed twice
+    //    dump("$$$$$$$$$$ HERE WE ARE IN cookieContextOverlay.xul $$$$$$$$$$\n");
+    // As a consequence, the block-image item appears twice in the context menu.  To
+    // prevent that from happening, the "display:none" was added to the menuitem below
+
+   ]]>
+  </script>         
+
+  <!-- context menu -->
+  <popup id="contentAreaContextMenu">
+    <menuitem id="context-blockimage"
+              value="&blockImageCmd.label;"
+              accesskey=""
+              oncommand="contextMenu.blockImage();"
+              style="display:none;"
+              insertafter="context-viewimage"/>
+  </popup>
+</overlay>
diff --git a/extensions/cookie/resources/content/cookieOverlay.js b/extensions/cookie/resources/content/cookieOverlay.js
new file mode 100644
index 000000000000..656d67a15f89
--- /dev/null
+++ b/extensions/cookie/resources/content/cookieOverlay.js
@@ -0,0 +1,33 @@
+/* -*- Mode: Java; tab-width: 4; c-basic-offset: 4; -*-
+ * 
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributor(s):
+ */
+
+function viewImages() {
+  window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul","",
+                    "modal=yes,chrome,resizable=yes", 2 );
+}
+
+function viewCookies() {
+  window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul","","modal=yes,chrome,resizable=yes", 0);
+}  
+
+function viewTutorial() {
+  window.openDialog
+    ("chrome://communicator/content/wallet/privacy.xul","","modal=yes,chrome,resizable=yes,height=400,width=600", 0);
+}  
diff --git a/extensions/cookie/resources/content/cookiePrefsOverlay.xul b/extensions/cookie/resources/content/cookiePrefsOverlay.xul
new file mode 100644
index 000000000000..01b5b368ed8b
--- /dev/null
+++ b/extensions/cookie/resources/content/cookiePrefsOverlay.xul
@@ -0,0 +1,47 @@
+<?xml version="1.0"?> 
+
+<!-- The contents of this file are subject to the Netscape Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/NPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corporation. Portions created by Netscape are
+   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -->
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/cookie/cookiePrefsOverlay.dtd" >
+
+<overlay id="cookiePrefsOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <treechildren id="advancedChildren">
+    <treeitem position="1">
+      <treerow>
+        <treecell class="treecell-indent"
+                  url="chrome://communicator/content/cookie/pref-cookies.xul"
+                  value="&cookies.label;"
+                  id="cookiesCell"/> 
+      </treerow>
+    </treeitem>
+    <treeitem position="2">
+      <treerow>
+        <treecell class="treecell-indent"
+                  url="chrome://communicator/content/cookie/pref-images.xul"
+                  value="&images.label;"/> 
+      </treerow>
+    </treeitem>
+  </treechildren>
+    
+</overlay>
diff --git a/extensions/cookie/resources/content/cookieTasksOverlay.xul b/extensions/cookie/resources/content/cookieTasksOverlay.xul
new file mode 100644
index 000000000000..e80587632d35
--- /dev/null
+++ b/extensions/cookie/resources/content/cookieTasksOverlay.xul
@@ -0,0 +1,138 @@
+<?xml version="1.0"?>
+
+<!--
+   The contents of this file are subject to the Netscape Public
+   License Version 1.1 (the "License"); you may not use this file
+   except in compliance with the License. You may obtain a copy of
+   the License at http://www.mozilla.org/NPL/
+    
+   Software distributed under the License is distributed on an "AS
+   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   implied. See the License for the specific language governing
+   rights and limitations under the License.
+    
+   The Original Code is Mozilla Communicator client code, released
+   March 31, 1998.
+   
+   The Initial Developer of the Original Code is Netscape
+   Communications Corporation. Portions created by Netscape are
+   Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   Rights Reserved.
+   
+   Contributor(s): 
+  -->
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/cookie/cookieTasksOverlay.dtd">
+
+<overlay id="cookieTasksOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script language="javascript" src="chrome://communicator/content/cookie/cookieOverlay.js"/>
+
+  <script language="JavaScript">
+  <![CDATA[
+
+    // Remove the image entries from the task menu
+    function HideImage() {
+      var element;
+      element = document.getElementById("image");
+      element.setAttribute("style","display: none;" );
+      element.setAttribute("disabled","true" );
+    }
+
+    // determine if we need to remove the image entries from the task menu
+    function CheckForImage()
+    {
+      // remove image functions (unless overruled by the "imageblocker.enabled" pref)
+      try {
+        if (!this.pref.GetBoolPref("imageblocker.enabled")) {
+          HideImage();
+        }
+      } catch(e) {
+	HideImage();
+        dump("imageblocker.enabled pref is missing from all.js\n");
+      }
+    }
+
+    // perform a Cookie or Image action
+    function CookieImageAction(action) {
+
+      var cookieViewer =
+        Components.classes["@mozilla.org/cookieviewer/cookieviewer-world;1"]
+          .createInstance(Components.interfaces["nsICookieViewer"]);
+
+      var COOKIEPERMISSION = 0;
+      var IMAGEPERMISSION = 1;
+
+      switch (action) {
+        case "cookieAllow":
+          cookieViewer.AddPermission(window._content, true, COOKIEPERMISSION);
+          element = document.getElementById("AllowCookies");
+          alert(element.getAttribute("msg"));
+          break;
+        case "cookieBlock":
+          cookieViewer.AddPermission(window._content, false, COOKIEPERMISSION);
+          element = document.getElementById("BlockCookies");
+          alert(element.getAttribute("msg"));
+          break;
+        case "imageAllow":
+          cookieViewer.AddPermission(window._content, true, IMAGEPERMISSION);
+          element = document.getElementById("AllowImages");
+          alert(element.getAttribute("msg"));
+          break;
+        case "imageBlock":
+          cookieViewer.AddPermission(window._content, false, IMAGEPERMISSION);
+          element = document.getElementById("BlockImages");
+          alert(element.getAttribute("msg"));
+          break;
+        default:
+      }
+    }  
+
+  ]]>
+  </script>         
+
+  <!-- tasksOverlay menu items -->
+  <menupopup  id="personalManagers"> 
+    <menu value="&cookieCookieManager.label;"
+                accesskey="&cookieCookieManager.accesskey;"
+                position="1">
+      <menupopup>
+        <menuitem value="&cookieDisplayCookiesCmd.label;"
+                  accesskey="&cookieDisplayCookiesCmd.accesskey;" 
+                  oncommand="viewCookies();"/> 
+        <menuitem id="AllowCookies" value="&cookieAllowCookiesCmd.label;"
+                  accesskey="&cookieAllowCookiesCmd.accesskey;" 
+                  msg="&cookieAllowCookiesMsg.label;"
+                  oncommand="CookieImageAction('cookieAllow');"/> 
+        <menuitem id="BlockCookies" value="&cookieBlockCookiesCmd.label;"
+                  accesskey="&cookieBlockCookiesCmd.accesskey;" 
+                  msg="&cookieBlockCookiesMsg.label;"
+                  oncommand="CookieImageAction('cookieBlock');"/> 
+      </menupopup>
+    </menu>
+    <menu value="&cookieImageManager.label;"
+          accesskey="&cookieImageManager.accesskey;" id="image"
+          position="2">
+      <menupopup oncreate="CheckForImage()">
+        <menuitem value="&cookieDisplayImagesCmd.label;"
+                  accesskey="&cookieDisplayImagesCmd.accesskey;" 
+                  oncommand="viewImages();"/> 
+        <menuitem id="AllowImages" value="&cookieAllowImagesCmd.label;"
+                  accesskey="&cookieAllowImagesCmd.accesskey;" 
+                  msg="&cookieAllowImagesMsg.label;"
+                  oncommand="CookieImageAction('imageAllow');"/> 
+        <menuitem id="BlockImages" value="&cookieBlockImagesCmd.label;"
+                  accesskey="&cookieBlockImagesCmd.accesskey;" 
+                  msg="&cookieBlockImagesMsg.label;"
+                  oncommand="CookieImageAction('imageBlock');"/> 
+      </menupopup>
+    </menu>
+    <menuseparator insertbefore="lastInPersonalManagers"/>
+    <menuitem value="&cookieTutorialCmd.label;"
+              accesskey="&cookieTutorialCmd.accesskey;"
+              oncommand="viewTutorial();"
+              insertbefore="lastInPersonalManagers"/>
+  </menupopup>
+
+</overlay>
diff --git a/extensions/cookie/resources/content/pref-cookies.xul b/extensions/cookie/resources/content/pref-cookies.xul
new file mode 100644
index 000000000000..dcb5c015de39
--- /dev/null
+++ b/extensions/cookie/resources/content/pref-cookies.xul
@@ -0,0 +1,71 @@
+<?xml version="1.0"?> 
+
+<!--
+   The contents of this file are subject to the Netscape Public
+   License Version 1.1 (the "License"); you may not use this file
+   except in compliance with the License. You may obtain a copy of
+   the License at http://www.mozilla.org/NPL/
+    
+   implied. See the License for the specific language governing
+   rights and limitations under the License.
+    
+   The Original Code is Mozilla Communicator client code, released
+   March 31, 1998.
+   
+   The Initial Developer of the Original Code is Netscape
+   Communications Corporation. Portions created by Netscape are
+   Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   Rights Reserved.
+   
+   Contributor(s): 
+  -->
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % prefCookieDTD SYSTEM "chrome://communicator/locale/cookie/pref-cookies.dtd" >
+%prefCookieDTD;
+]>
+
+<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml" id="cookieWindow"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        class="color-dialog"
+        align="vertical"
+        onload="parent.initPanel('chrome://communicator/content/cookie/pref-cookies.xul');">
+          
+  <script language="javascript" src="chrome://communicator/content/cookie/cookieOverlay.js"/>
+
+  <script>
+  <![CDATA[
+  
+  var _elementIDs = ["networkCookieBehaviour", "networkWarnAboutCookies"];
+
+  ]]>
+  </script>   
+
+  <box class="box-smallheader" id="cookieHeader" title="&lHeader;"/>
+
+  <titledbox orient="vertical">
+    <title><text value="&cookiePolicy.label;"/></title>  
+
+    <html>&cookieDetails;</html>
+
+    <radiogroup id="networkCookieBehaviour" orient="vertical" autostretch="never"
+                pref="true" preftype="int" prefstring="network.cookie.cookieBehavior"
+                prefattribute="data">
+      <radio group="networkCookieBehaviour" data="0" value="&accAllCookiesRadio.label;" accesskey="&accAllCookiesRadio.accesskey;"/>
+      <radio group="networkCookieBehaviour" data="1" value="&accOrgCookiesRadio.label;" accesskey="&accOrgCookiesRadio.accesskey;"/>
+      <radio group="networkCookieBehaviour" data="2" value="&disableCookies.label;" accesskey="&disableCookies.accesskey;"/>
+    </radiogroup>
+    <checkbox class="indent" id="networkWarnAboutCookies" value="&warnAboutCookies.label;" accesskey="&warnAboutCookies.accesskey;"
+              pref="true" preftype="bool" prefstring="network.cookie.warnAboutCookies"
+              prefattribute="checked"/>
+    <box autostretch="never" halign="right">
+      <button class="dialog" value="&viewCookies.label;" accesskey="&viewCookies.accesskey;" oncommand="viewCookies();"/>
+      <button class="dialog" value="&viewTutorial.label;" accesskey="&viewTutorial.accesskey;" oncommand="viewTutorial();"/>
+    </box>              
+  </titledbox>
+
+</window>
diff --git a/extensions/cookie/resources/content/pref-images.xul b/extensions/cookie/resources/content/pref-images.xul
new file mode 100644
index 000000000000..44eadce0d7b5
--- /dev/null
+++ b/extensions/cookie/resources/content/pref-images.xul
@@ -0,0 +1,119 @@
+<?xml version="1.0"?> 
+
+<!--
+   The contents of this file are subject to the Netscape Public
+   License Version 1.1 (the "License"); you may not use this file
+   except in compliance with the License. You may obtain a copy of
+   the License at http://www.mozilla.org/NPL/
+    
+   implied. See the License for the specific language governing
+   rights and limitations under the License.
+    
+   The Original Code is Mozilla Communicator client code, released
+   March 31, 1998.
+   
+   The Initial Developer of the Original Code is Netscape
+   Communications Corporation. Portions created by Netscape are
+   Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   Rights Reserved.
+   
+   Contributor(s): 
+  -->
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % prefImagesDTD SYSTEM "chrome://communicator/locale/cookie/pref-images.dtd" >
+%prefImagesDTD;
+]>
+
+<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml" id="imagesWindow"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        class="color-dialog"
+        align="vertical"
+        onload="imageBlockingEnabled(); parent.initPanel('chrome://communicator/content/cookie/pref-images.xul');">
+          
+  <script language="javascript" src="chrome://communicator/content/cookie/cookieOverlay.js"/>
+
+  <script language="JavaScript">
+  <![CDATA[
+  
+  var _elementIDs = ["accOrgImages", "networkImageBehaviour", "networkImageWarnAboutImages"];
+
+  // Present finer control over image loading to the user.
+  // enable image blocker if "imageblocker.enabled" pref is true
+  function imageBlockingEnabled() {
+
+      if( !parent.hPrefWindow.getPref( "bool", "imageblocker.enabled" ) ) 
+        {
+
+          // Hide originating server option.
+          var orgImages = document.getElementById( "accOrgImages" );
+          orgImages.setAttribute("hidden", "true");
+
+          // Hide warn about images button.
+          var networkImageWarnAboutImages = document.getElementById( "networkImageWarnAboutImages");
+          networkImageWarnAboutImages.setAttribute("hidden", "true");
+
+          // Hide viewImages button.
+          var viewImagesButton = document.getElementById( "viewImages");
+          viewImagesButton.setAttribute("hidden", "true");
+
+        } else {
+
+          // Show originating server option.
+          var orgImages = document.getElementById( "accOrgImages" );
+          orgImages.setAttribute("hidden", "false");
+
+          // Show warn about images button.
+          var networkImageWarnAboutImages = document.getElementById( "networkImageWarnAboutImages");
+          networkImageWarnAboutImages.setAttribute("hidden", "false");
+
+          // Show viewImages button.
+          var viewImagesButton = document.getElementById( "viewImages");
+          viewImagesButton.setAttribute("hidden", "false");
+
+        }
+    }
+
+  function updateImageFields( aInteger, aBoolean ) {
+    var imageBehaviourField = document.getElementById("networkImageBehaviour");
+    var imageBehaviourCheckbox = document.getElementById("networkImageWarnAboutImages");
+    
+    imageBehaviourField.value = aInteger;
+    imageBehaviourCheckbox.checked = aBoolean;
+  }
+
+ 
+  ]]>
+  </script>
+
+  <box class="box-smallheader" id="imagesHeader" title="&lHeader;"/>
+
+  <titledbox orient="vertical" id="imagesArea">
+    <title><text value="&imageBlocking.label;"/></title>  
+
+    <html>&imageDetails;</html>
+
+    <radiogroup id="networkImageBehaviour" orient="vertical" autostretch="never"
+                pref="true" preftype="int" prefstring="network.image.imageBehavior"
+                prefattribute="data">
+      <radio group="networkImageBehaviour" data="0" value="&accAllImagesRadio.label;" accesskey="&accAllImagesRadio.accesskey;"/>
+      <radio id="accOrgImages" group="networkImageBehaviour" data="1" value="&accOrgImagesRadio.label;" accesskey="&accOrgImagesRadio.accesskey;"/>
+      <radio group="networkImageBehaviour" data="2" value="&disableImages.label;" accesskey="&disableImages.accesskey;"/>
+    </radiogroup>
+    
+    <checkbox class="indent" id="networkImageWarnAboutImages" value="&warnAboutImages.label;" accesskey="&warnAboutImages.accesskey;"
+              pref="true" preftype="bool" prefstring="network.image.warnAboutImages" 
+              prefattribute="checked"/>
+
+    <box autostretch="never" halign="right">
+      <button class="dialog" id="viewImages" value="&viewImages.label;" accesskey="&viewImages.accesskey;" oncommand="viewImages();"/>
+    </box>
+
+  </titledbox>
+
+
+</window>
diff --git a/extensions/cookie/resources/locale/en-US/contents.rdf b/extensions/cookie/resources/locale/en-US/contents.rdf
new file mode 100644
index 000000000000..1c921de236e6
--- /dev/null
+++ b/extensions/cookie/resources/locale/en-US/contents.rdf
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:en-US"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:en-US"
+                   chrome:displayName="English (US)"
+                   chrome:author="mozilla.org"
+                   chrome:name="en-US">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
+        <RDF:li resource="urn:mozilla:locale:en-US:cookie"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+</RDF:RDF>
diff --git a/extensions/cookie/resources/locale/en-US/cookieContextOverlay.dtd b/extensions/cookie/resources/locale/en-US/cookieContextOverlay.dtd
new file mode 100644
index 000000000000..ac966201d64e
--- /dev/null
+++ b/extensions/cookie/resources/locale/en-US/cookieContextOverlay.dtd
@@ -0,0 +1,2 @@
+<!ENTITY blockImageCmd.label          "Block Image from Loading">
+<!ENTITY blockImageCmd.accesskey      "k">
diff --git a/extensions/cookie/resources/locale/en-US/cookiePrefsOverlay.dtd b/extensions/cookie/resources/locale/en-US/cookiePrefsOverlay.dtd
new file mode 100644
index 000000000000..8fc78a118b4e
--- /dev/null
+++ b/extensions/cookie/resources/locale/en-US/cookiePrefsOverlay.dtd
@@ -0,0 +1,2 @@
+<!ENTITY cookies.label "Cookies">
+<!ENTITY images.label "Images">
diff --git a/extensions/cookie/resources/locale/en-US/cookieTasksOverlay.dtd b/extensions/cookie/resources/locale/en-US/cookieTasksOverlay.dtd
new file mode 100644
index 000000000000..ae0752c4e83a
--- /dev/null
+++ b/extensions/cookie/resources/locale/en-US/cookieTasksOverlay.dtd
@@ -0,0 +1,22 @@
+<!ENTITY cookieDisplayCookiesCmd.label "View Stored Cookies">
+<!ENTITY cookieDisplayCookiesCmd.accesskey "v">
+<!ENTITY cookieAllowCookiesCmd.label "Unblock Cookies from this Site">
+<!ENTITY cookieAllowCookiesCmd.accesskey "u">
+<!ENTITY cookieAllowCookiesMsg.label "Cookies from this site will not be blocked">
+<!ENTITY cookieBlockCookiesCmd.label "Block Cookies from this Site">
+<!ENTITY cookieBlockCookiesCmd.accesskey "b">
+<!ENTITY cookieBlockCookiesMsg.label "Cookies from this site will always be rejected">
+<!ENTITY cookieDisplayImagesCmd.label "View Sites that can/cannot Display Images">
+<!ENTITY cookieDisplayImagesCmd.accesskey "v">
+<!ENTITY cookieAllowImagesCmd.label "Unblock Images from this Site">
+<!ENTITY cookieAllowImagesCmd.accesskey "u">
+<!ENTITY cookieAllowImagesMsg.label "Images from this site will always be downloaded">
+<!ENTITY cookieBlockImagesCmd.label "Block Images from this Site">
+<!ENTITY cookieBlockImagesCmd.accesskey "b">
+<!ENTITY cookieBlockImagesMsg.label "Images from this site will never be downloaded">
+<!ENTITY cookieTutorialCmd.label "Understanding Privacy">
+<!ENTITY cookieTutorialCmd.accesskey "u">
+<!ENTITY cookieCookieManager.label "Cookie Manager">
+<!ENTITY cookieCookieManager.accesskey "c">
+<!ENTITY cookieImageManager.label "Image Manager">
+<!ENTITY cookieImageManager.accesskey "i">
diff --git a/extensions/cookie/resources/locale/en-US/pref-cookies.dtd b/extensions/cookie/resources/locale/en-US/pref-cookies.dtd
new file mode 100644
index 000000000000..be602d73815f
--- /dev/null
+++ b/extensions/cookie/resources/locale/en-US/pref-cookies.dtd
@@ -0,0 +1,28 @@
+<!ENTITY window.title                   "Cookies">
+<!ENTITY lHeader                        "Cookies">
+
+<!-- cookies -->
+
+<!ENTITY cookiePolicy.label             "Cookie Acceptance Policy">
+
+<!ENTITY accAllCookiesRadio.label       "Enable all cookies">
+<!ENTITY accAllCookiesRadio.accesskey   "a">
+
+<!ENTITY accOrgCookiesRadio.label       "Enable cookies for the originating web site only">
+<!ENTITY accOrgCookiesRadio.accesskey   "o">
+
+<!ENTITY disableCookies.label           "Disable cookies">
+<!ENTITY disableCookies.accesskey       "r">
+
+<!ENTITY warnAboutCookies.label         "Warn me before storing a cookie">
+<!ENTITY warnAboutCookies.accesskey     "w">
+
+<!ENTITY cookieDetails                  "Cookies are small pieces of information that some web sites ask to store on your computer. If you enable cookies, your browser will accept a web site's cookies automatically when you visit the site. Such cookies are sent back to the web site on future visits.">
+
+<!ENTITY viewCookies.label              "View Stored Cookies">
+<!ENTITY viewCookies.accesskey          "v">
+
+<!ENTITY viewTutorial.label              "More Information">
+<!ENTITY viewTutorial.accesskey          "m">
+
+
diff --git a/extensions/cookie/resources/locale/en-US/pref-images.dtd b/extensions/cookie/resources/locale/en-US/pref-images.dtd
new file mode 100644
index 000000000000..e106287feb6d
--- /dev/null
+++ b/extensions/cookie/resources/locale/en-US/pref-images.dtd
@@ -0,0 +1,22 @@
+<!ENTITY window.title                   "Images">
+<!ENTITY lHeader                        "Images">
+
+<!ENTITY imageBlocking.label            "Image Blocking">
+
+<!--LOCALIZATION NOTE (onStartLegend.label): Don't translate "&brandShortName;".
+    Place "&brandShortName;" in the phrase where the name of the application should
+	 appear
+-->
+<!ENTITY imageDetails                   "Specify how &brandShortName; handles images on web pages.">
+
+<!ENTITY accAllImagesRadio.label        "Accept all images">
+<!ENTITY accAllImagesRadio.accesskey    "i">
+<!ENTITY accOrgImagesRadio.label        "Accept images that come from the originating server only">
+<!ENTITY accOrgImagesRadio.accesskey    "n">
+<!ENTITY disableImages.label            "Do not load any images">
+<!ENTITY disableImages.accesskey        "y">
+<!ENTITY warnAboutImages.label          "Alert me before downloading an image">
+<!ENTITY warnAboutImages.accesskey      "e">
+<!ENTITY viewImagesExplanation.label    "View list of sites about which image acceptance information is stored">
+<!ENTITY viewImages.label               "View Image Permissions">
+<!ENTITY viewImages.accesskey           "p">
diff --git a/xpfe/components/cookie/locale/en-US/contents.rdf b/xpfe/components/cookie/locale/en-US/contents.rdf
new file mode 100644
index 000000000000..1c921de236e6
--- /dev/null
+++ b/xpfe/components/cookie/locale/en-US/contents.rdf
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:en-US"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:en-US"
+                   chrome:displayName="English (US)"
+                   chrome:author="mozilla.org"
+                   chrome:name="en-US">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
+        <RDF:li resource="urn:mozilla:locale:en-US:cookie"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+</RDF:RDF>
diff --git a/xpfe/components/permissions/content/cookieTasksOverlay.xul b/xpfe/components/permissions/content/cookieTasksOverlay.xul
new file mode 100644
index 000000000000..e80587632d35
--- /dev/null
+++ b/xpfe/components/permissions/content/cookieTasksOverlay.xul
@@ -0,0 +1,138 @@
+<?xml version="1.0"?>
+
+<!--
+   The contents of this file are subject to the Netscape Public
+   License Version 1.1 (the "License"); you may not use this file
+   except in compliance with the License. You may obtain a copy of
+   the License at http://www.mozilla.org/NPL/
+    
+   Software distributed under the License is distributed on an "AS
+   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   implied. See the License for the specific language governing
+   rights and limitations under the License.
+    
+   The Original Code is Mozilla Communicator client code, released
+   March 31, 1998.
+   
+   The Initial Developer of the Original Code is Netscape
+   Communications Corporation. Portions created by Netscape are
+   Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   Rights Reserved.
+   
+   Contributor(s): 
+  -->
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/cookie/cookieTasksOverlay.dtd">
+
+<overlay id="cookieTasksOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script language="javascript" src="chrome://communicator/content/cookie/cookieOverlay.js"/>
+
+  <script language="JavaScript">
+  <![CDATA[
+
+    // Remove the image entries from the task menu
+    function HideImage() {
+      var element;
+      element = document.getElementById("image");
+      element.setAttribute("style","display: none;" );
+      element.setAttribute("disabled","true" );
+    }
+
+    // determine if we need to remove the image entries from the task menu
+    function CheckForImage()
+    {
+      // remove image functions (unless overruled by the "imageblocker.enabled" pref)
+      try {
+        if (!this.pref.GetBoolPref("imageblocker.enabled")) {
+          HideImage();
+        }
+      } catch(e) {
+	HideImage();
+        dump("imageblocker.enabled pref is missing from all.js\n");
+      }
+    }
+
+    // perform a Cookie or Image action
+    function CookieImageAction(action) {
+
+      var cookieViewer =
+        Components.classes["@mozilla.org/cookieviewer/cookieviewer-world;1"]
+          .createInstance(Components.interfaces["nsICookieViewer"]);
+
+      var COOKIEPERMISSION = 0;
+      var IMAGEPERMISSION = 1;
+
+      switch (action) {
+        case "cookieAllow":
+          cookieViewer.AddPermission(window._content, true, COOKIEPERMISSION);
+          element = document.getElementById("AllowCookies");
+          alert(element.getAttribute("msg"));
+          break;
+        case "cookieBlock":
+          cookieViewer.AddPermission(window._content, false, COOKIEPERMISSION);
+          element = document.getElementById("BlockCookies");
+          alert(element.getAttribute("msg"));
+          break;
+        case "imageAllow":
+          cookieViewer.AddPermission(window._content, true, IMAGEPERMISSION);
+          element = document.getElementById("AllowImages");
+          alert(element.getAttribute("msg"));
+          break;
+        case "imageBlock":
+          cookieViewer.AddPermission(window._content, false, IMAGEPERMISSION);
+          element = document.getElementById("BlockImages");
+          alert(element.getAttribute("msg"));
+          break;
+        default:
+      }
+    }  
+
+  ]]>
+  </script>         
+
+  <!-- tasksOverlay menu items -->
+  <menupopup  id="personalManagers"> 
+    <menu value="&cookieCookieManager.label;"
+                accesskey="&cookieCookieManager.accesskey;"
+                position="1">
+      <menupopup>
+        <menuitem value="&cookieDisplayCookiesCmd.label;"
+                  accesskey="&cookieDisplayCookiesCmd.accesskey;" 
+                  oncommand="viewCookies();"/> 
+        <menuitem id="AllowCookies" value="&cookieAllowCookiesCmd.label;"
+                  accesskey="&cookieAllowCookiesCmd.accesskey;" 
+                  msg="&cookieAllowCookiesMsg.label;"
+                  oncommand="CookieImageAction('cookieAllow');"/> 
+        <menuitem id="BlockCookies" value="&cookieBlockCookiesCmd.label;"
+                  accesskey="&cookieBlockCookiesCmd.accesskey;" 
+                  msg="&cookieBlockCookiesMsg.label;"
+                  oncommand="CookieImageAction('cookieBlock');"/> 
+      </menupopup>
+    </menu>
+    <menu value="&cookieImageManager.label;"
+          accesskey="&cookieImageManager.accesskey;" id="image"
+          position="2">
+      <menupopup oncreate="CheckForImage()">
+        <menuitem value="&cookieDisplayImagesCmd.label;"
+                  accesskey="&cookieDisplayImagesCmd.accesskey;" 
+                  oncommand="viewImages();"/> 
+        <menuitem id="AllowImages" value="&cookieAllowImagesCmd.label;"
+                  accesskey="&cookieAllowImagesCmd.accesskey;" 
+                  msg="&cookieAllowImagesMsg.label;"
+                  oncommand="CookieImageAction('imageAllow');"/> 
+        <menuitem id="BlockImages" value="&cookieBlockImagesCmd.label;"
+                  accesskey="&cookieBlockImagesCmd.accesskey;" 
+                  msg="&cookieBlockImagesMsg.label;"
+                  oncommand="CookieImageAction('imageBlock');"/> 
+      </menupopup>
+    </menu>
+    <menuseparator insertbefore="lastInPersonalManagers"/>
+    <menuitem value="&cookieTutorialCmd.label;"
+              accesskey="&cookieTutorialCmd.accesskey;"
+              oncommand="viewTutorial();"
+              insertbefore="lastInPersonalManagers"/>
+  </menupopup>
+
+</overlay>
diff --git a/xpfe/components/permissions/content/imageContextOverlay.xul b/xpfe/components/permissions/content/imageContextOverlay.xul
new file mode 100644
index 000000000000..59c9a0a0f22e
--- /dev/null
+++ b/xpfe/components/permissions/content/imageContextOverlay.xul
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+
+<!--
+   The contents of this file are subject to the Netscape Public
+   License Version 1.1 (the "License"); you may not use this file
+   except in compliance with the License. You may obtain a copy of
+   the License at http://www.mozilla.org/NPL/
+    
+   Software distributed under the License is distributed on an "AS
+   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   implied. See the License for the specific language governing
+   rights and limitations under the License.
+    
+   The Original Code is Mozilla Communicator client code, released
+   March 31, 1998.
+   
+   The Initial Developer of the Original Code is Netscape
+   Communications Corporation. Portions created by Netscape are
+   Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   Rights Reserved.
+   
+   Contributor(s): 
+  -->
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/cookie/cookieContextOverlay.dtd">
+
+<overlay id="cookieContextOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script language="javascript" src="chrome://communicator/content/cookie/cookieOverlay.js"/>
+
+  <script language="JavaScript">
+  <![CDATA[
+
+    // Code from nsContextMenu.js. Note that we extend the prototype here, rather 
+    // than making these methods on a new object, as some methods require access
+    // to data maintained by nsContextMenu.  
+
+    var cookieContextMenu = {
+
+      // Determine if "Block Image" is to appear in the menu.
+      // Return true if "imageBlocker.enabled" pref is set and image is not already blocked.
+      isBlockingImages : function () {
+        /* determine if "imageBlocker.enabled" pref is set */
+        var pref = contextMenu.getService('@mozilla.org/preferences;1', 'nsIPref');
+        var result = false;
+        try {
+          result = pref.GetBoolPref( "imageblocker.enabled" );
+        } catch(e) {
+        }
+        if (!result) {
+          /* pref is not set so return false */
+          return false;
+        }
+  
+        /* determine if image is already being blocked */
+        var cookieViewer = contextMenu.createInstance
+          ("@mozilla.org/cookieviewer/cookieviewer-world;1", "nsICookieViewer");
+        var list = cookieViewer.GetPermissionValue(1);
+        var permissionList  = list.split(list[0]);
+        for(var i = 1; i < permissionList.length; i+=2) {
+          var permStr = permissionList[i+1];
+          var type = permStr.substring(0,1);
+          if (type == "-") {
+            /* some host is being blocked, need to find out if it's our image's host */
+            var host = permStr.substring(1,permStr.length);
+            if (host && contextMenu.imageURL.search(host) != -1) {
+              /* it's our image's host that's being blocked */
+
+              return false;
+            }
+          }
+        }  
+        /* image is not already being blocked, so "Block Image" can appear on the menu */
+        return true;
+      },
+
+      // Block image from loading in the future.
+      blockImage : function () {
+        var cookieViewer =
+          contextMenu.createInstance("@mozilla.org/cookieviewer/cookieviewer-world;1",
+                                     "nsICookieViewer" );
+        cookieViewer.BlockImage(this.imageURL);
+      },
+
+      initImageBlocking : function () {
+        // Block image depends on whether an image was clicked on, and,
+        // whether the user pref is enabled.
+        contextMenu.showItem
+          ("context-blockimage",
+           contextMenu.onImage && cookieContextMenu.isBlockingImages());
+      },
+
+      addContextMenuItemListeners : function (aEvent) {
+        var contextPopup = document.getElementById("contentAreaContextSet");
+        contextPopup.addEventListener("create", cookieContextMenu.initImageBlocking, false);
+      }
+    }
+
+    window.addEventListener("load", cookieContextMenu.addContextMenuItemListeners, false);
+
+    // For some unexplainable reason, this overlay is loaded twice as can be demonstrated
+    // by uncommenting the following "dump" statement which will get displayed twice
+    //    dump("$$$$$$$$$$ HERE WE ARE IN cookieContextOverlay.xul $$$$$$$$$$\n");
+    // As a consequence, the block-image item appears twice in the context menu.  To
+    // prevent that from happening, the "display:none" was added to the menuitem below
+
+   ]]>
+  </script>         
+
+  <!-- context menu -->
+  <popup id="contentAreaContextMenu">
+    <menuitem id="context-blockimage"
+              value="&blockImageCmd.label;"
+              accesskey=""
+              oncommand="contextMenu.blockImage();"
+              style="display:none;"
+              insertafter="context-viewimage"/>
+  </popup>
+</overlay>
diff --git a/xpfe/components/permissions/content/permissionsOverlay.js b/xpfe/components/permissions/content/permissionsOverlay.js
new file mode 100644
index 000000000000..656d67a15f89
--- /dev/null
+++ b/xpfe/components/permissions/content/permissionsOverlay.js
@@ -0,0 +1,33 @@
+/* -*- Mode: Java; tab-width: 4; c-basic-offset: 4; -*-
+ * 
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributor(s):
+ */
+
+function viewImages() {
+  window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul","",
+                    "modal=yes,chrome,resizable=yes", 2 );
+}
+
+function viewCookies() {
+  window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul","","modal=yes,chrome,resizable=yes", 0);
+}  
+
+function viewTutorial() {
+  window.openDialog
+    ("chrome://communicator/content/wallet/privacy.xul","","modal=yes,chrome,resizable=yes,height=400,width=600", 0);
+}  
diff --git a/xpfe/components/permissions/locale/en-US/cookieTasksOverlay.dtd b/xpfe/components/permissions/locale/en-US/cookieTasksOverlay.dtd
new file mode 100644
index 000000000000..ae0752c4e83a
--- /dev/null
+++ b/xpfe/components/permissions/locale/en-US/cookieTasksOverlay.dtd
@@ -0,0 +1,22 @@
+<!ENTITY cookieDisplayCookiesCmd.label "View Stored Cookies">
+<!ENTITY cookieDisplayCookiesCmd.accesskey "v">
+<!ENTITY cookieAllowCookiesCmd.label "Unblock Cookies from this Site">
+<!ENTITY cookieAllowCookiesCmd.accesskey "u">
+<!ENTITY cookieAllowCookiesMsg.label "Cookies from this site will not be blocked">
+<!ENTITY cookieBlockCookiesCmd.label "Block Cookies from this Site">
+<!ENTITY cookieBlockCookiesCmd.accesskey "b">
+<!ENTITY cookieBlockCookiesMsg.label "Cookies from this site will always be rejected">
+<!ENTITY cookieDisplayImagesCmd.label "View Sites that can/cannot Display Images">
+<!ENTITY cookieDisplayImagesCmd.accesskey "v">
+<!ENTITY cookieAllowImagesCmd.label "Unblock Images from this Site">
+<!ENTITY cookieAllowImagesCmd.accesskey "u">
+<!ENTITY cookieAllowImagesMsg.label "Images from this site will always be downloaded">
+<!ENTITY cookieBlockImagesCmd.label "Block Images from this Site">
+<!ENTITY cookieBlockImagesCmd.accesskey "b">
+<!ENTITY cookieBlockImagesMsg.label "Images from this site will never be downloaded">
+<!ENTITY cookieTutorialCmd.label "Understanding Privacy">
+<!ENTITY cookieTutorialCmd.accesskey "u">
+<!ENTITY cookieCookieManager.label "Cookie Manager">
+<!ENTITY cookieCookieManager.accesskey "c">
+<!ENTITY cookieImageManager.label "Image Manager">
+<!ENTITY cookieImageManager.accesskey "i">
diff --git a/xpfe/components/permissions/locale/en-US/imageContextOverlay.dtd b/xpfe/components/permissions/locale/en-US/imageContextOverlay.dtd
new file mode 100644
index 000000000000..ac966201d64e
--- /dev/null
+++ b/xpfe/components/permissions/locale/en-US/imageContextOverlay.dtd
@@ -0,0 +1,2 @@
+<!ENTITY blockImageCmd.label          "Block Image from Loading">
+<!ENTITY blockImageCmd.accesskey      "k">
diff --git a/xpfe/components/prefwindow/resources/content/cookiePrefsOverlay.xul b/xpfe/components/prefwindow/resources/content/cookiePrefsOverlay.xul
new file mode 100644
index 000000000000..01b5b368ed8b
--- /dev/null
+++ b/xpfe/components/prefwindow/resources/content/cookiePrefsOverlay.xul
@@ -0,0 +1,47 @@
+<?xml version="1.0"?> 
+
+<!-- The contents of this file are subject to the Netscape Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/NPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corporation. Portions created by Netscape are
+   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -->
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/cookie/cookiePrefsOverlay.dtd" >
+
+<overlay id="cookiePrefsOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <treechildren id="advancedChildren">
+    <treeitem position="1">
+      <treerow>
+        <treecell class="treecell-indent"
+                  url="chrome://communicator/content/cookie/pref-cookies.xul"
+                  value="&cookies.label;"
+                  id="cookiesCell"/> 
+      </treerow>
+    </treeitem>
+    <treeitem position="2">
+      <treerow>
+        <treecell class="treecell-indent"
+                  url="chrome://communicator/content/cookie/pref-images.xul"
+                  value="&images.label;"/> 
+      </treerow>
+    </treeitem>
+  </treechildren>
+    
+</overlay>
diff --git a/xpfe/components/prefwindow/resources/content/permissionsPrefsOverlay.xul b/xpfe/components/prefwindow/resources/content/permissionsPrefsOverlay.xul
new file mode 100644
index 000000000000..01b5b368ed8b
--- /dev/null
+++ b/xpfe/components/prefwindow/resources/content/permissionsPrefsOverlay.xul
@@ -0,0 +1,47 @@
+<?xml version="1.0"?> 
+
+<!-- The contents of this file are subject to the Netscape Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/NPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corporation. Portions created by Netscape are
+   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -->
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/cookie/cookiePrefsOverlay.dtd" >
+
+<overlay id="cookiePrefsOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <treechildren id="advancedChildren">
+    <treeitem position="1">
+      <treerow>
+        <treecell class="treecell-indent"
+                  url="chrome://communicator/content/cookie/pref-cookies.xul"
+                  value="&cookies.label;"
+                  id="cookiesCell"/> 
+      </treerow>
+    </treeitem>
+    <treeitem position="2">
+      <treerow>
+        <treecell class="treecell-indent"
+                  url="chrome://communicator/content/cookie/pref-images.xul"
+                  value="&images.label;"/> 
+      </treerow>
+    </treeitem>
+  </treechildren>
+    
+</overlay>
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/cookiePrefsOverlay.dtd b/xpfe/components/prefwindow/resources/locale/en-US/cookiePrefsOverlay.dtd
new file mode 100644
index 000000000000..8fc78a118b4e
--- /dev/null
+++ b/xpfe/components/prefwindow/resources/locale/en-US/cookiePrefsOverlay.dtd
@@ -0,0 +1,2 @@
+<!ENTITY cookies.label "Cookies">
+<!ENTITY images.label "Images">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/permissionsPrefsOverlay.dtd b/xpfe/components/prefwindow/resources/locale/en-US/permissionsPrefsOverlay.dtd
new file mode 100644
index 000000000000..8fc78a118b4e
--- /dev/null
+++ b/xpfe/components/prefwindow/resources/locale/en-US/permissionsPrefsOverlay.dtd
@@ -0,0 +1,2 @@
+<!ENTITY cookies.label "Cookies">
+<!ENTITY images.label "Images">