Forking bookmarks, adding QS.

browser/components/Makefile.in

@@ -42,6 +42,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = prefwindow history
+DIRS = prefwindow history bookmarks
 
 include $(topsrcdir)/config/rules.mk

browser/components/bookmarks/.cvsignore

@@ -0,0 +1 @@
+Makefile

browser/components/bookmarks/Makefile.in

@@ -0,0 +1,30 @@
+#
+# 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.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+

browser/components/bookmarks/content/MANIFEST-content

@@ -0,0 +1,9 @@
+bm-find.js
+bm-find.xul
+bm-panel.js
+bm-panel.xul
+bm-props.js
+bm-props.xul
+bookmarks.js
+bookmarksDD.js
+bookmarks.xul

browser/components/bookmarks/content/Makefile.in

@@ -0,0 +1,30 @@
+#
+# 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.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+

browser/components/bookmarks/content/addBookmark.js

@@ -0,0 +1,341 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * Add Bookmark Dialog. 
+ * ====================
+ * 
+ * This is a generic bookmark dialog that allows for bookmark addition
+ * and folder selection. It can be opened with various parameters that 
+ * result in appearance/purpose differences and initial state. 
+ * 
+ * Use: Open with 'openDialog', with the flags 
+ *        'centerscreen,chrome,dialog=no,resizable=yes'
+ * 
+ * Parameters: 
+ *   Apart from the standard openDialog parameters, this dialog can 
+ *   be passed additional information, which gets mapped to the 
+ *   window.arguments array:
+ * 
+ *   window.arguments[0]: Bookmark Name. The value to be prefilled
+ *                        into the "Name: " field (if visible).
+ *   window.arguments[1]: Bookmark URL: The location of the bookmark.
+ *                        The value to be filled in the "Location: "
+ *                        field (if visible).
+ *   window.arguments[2]: Bookmark Folder. The RDF Resource URI of the
+ *                        folder that this bookmark should be created in.
+ *   window.arguments[3]: Bookmark Charset. The charset that should be
+ *                        used when adding a bookmark to the specified
+ *                        URL. (Usually the charset of the current 
+ *                        document when launching this window). 
+ *   window.arguments[4]: The mode of operation. See notes for details.
+ *   window.arguments[5]: If the mode is "addGroup", this is an array
+ *                        of objects with name, URL and charset
+ *                        properties, one for each group member.
+ *
+ * Mode of Operation Notes:
+ * ------------------------
+ * This dialog can be opened in four different ways by using a parameter
+ * passed through the call to openDialog. The 'mode' of operation
+ * of the window is expressed in window.arguments[4]. The valid modes are:
+ *
+ * 1) <default> (no fifth open parameter).
+ *      Opens this dialog with the bookmark Name, URL and folder selection
+ *      components visible. 
+ * 2) "newBookmark" (fifth open parameter = String("newBookmark"))
+ *      Opens the dialog as in (1) above except the folder selection tree
+ *      is hidden. This type of mode is useful when the creation folder 
+ *      is pre-determined.
+ * 3) "selectFolder" (fifth open parameter = String("selectFolder"))
+ *      Opens the dialog as in (1) above except the Name/Location section
+ *      is hidden, and the dialog takes on the utility of a Folder chooser.
+ *      Used when the user must select a Folder for some purpose. 
+ * 4) "addGroup" (fifth open parameter = String("addGroup"))
+ *      Opens the dialog like <default>, with a checkbox to select between
+ *      filing a single bookmark or a group. For the single bookmark the
+ *      values are taken from the name, URL and charset arguments.
+ *      For the group, the values are taken from the sixth argument.
+ *      This parameter can also be String("addGroup,group") where "group"
+ *      specifies that the dialog starts in filing as a group.
+ */
+
+var gFld_Name   = null;
+var gFld_URL    = null; 
+var gFolderTree = null;
+var gCB_AddGroup = null;
+
+var gBookmarkCharset = null;
+
+const kRDFSContractID = "@mozilla.org/rdf/rdf-service;1";
+const kRDFSIID = Components.interfaces.nsIRDFService;
+const kRDF = Components.classes[kRDFSContractID].getService(kRDFSIID);
+
+var gSelectItemObserver = null;
+
+var gCreateInFolder = "NC:NewBookmarkFolder";
+
+function Startup()
+{
+  gFld_Name = document.getElementById("name");
+  gFld_URL = document.getElementById("url");
+  gCB_AddGroup = document.getElementById("addgroup");
+  var bookmarkView = document.getElementById("bookmarks-view");
+
+  var shouldSetOKButton = true;
+  var dialogElement = document.documentElement;
+  if ("arguments" in window) {
+    var ind;
+    var folderItem = null;
+    var arg;
+    if (window.arguments.length < 5)
+      arg = null;
+    else
+      arg = window.arguments[4];
+    switch (arg) {
+    case "selectFolder":
+      // If we're being opened as a folder selection window
+      document.getElementById("bookmarknamegrid").setAttribute("hidden", "true");
+      document.getElementById("createinseparator").setAttribute("hidden", "true");
+      document.getElementById("nameseparator").setAttribute("hidden", "true");
+      sizeToContent();
+      dialogElement.setAttribute("title", dialogElement.getAttribute("title-selectFolder"));
+      shouldSetOKButton = false;
+      if (window.arguments[2])
+        folderItem = bookmarkView.rdf.GetResource(window.arguments[2]);
+      if (folderItem) {
+        ind = bookmarkView.treeBuilder.getIndexOfResource(folderItem);
+        bookmarkView.treeBoxObject.selection.select(ind);
+      }
+      break;
+    case "newBookmark":
+      setupFields();
+      if (window.arguments[2])
+        gCreateInFolder = window.arguments[2];
+      document.getElementById("folderbox").setAttribute("hidden", "true");
+      sizeToFit();
+      break;
+    case "addGroup":
+      document.getElementById("showaddgroup").setAttribute("hidden", "false");
+      setupFields();
+      sizeToFit();
+      break;
+    case "addGroup,group":
+      document.getElementById("showaddgroup").setAttribute("hidden", "false");
+      gCB_AddGroup.setAttribute("checked", "true");
+      setupFields();
+      toggleGroup();
+      sizeToFit();
+      break;
+    default:
+      // Regular Add Bookmark
+      setupFields();
+      if (window.arguments[2]) {
+        gCreateInFolder = window.arguments[2];
+        folderItem = bookmarkView.rdf.GetResource(gCreateInFolder);
+        if (folderItem) {
+          ind = bookmarkView.treeBuilder.getIndexOfResource(folderItem);
+          bookmarkView.treeBoxObject.selection.select(ind);
+        }
+      }
+    }
+  }
+  
+  if (shouldSetOKButton)
+    onFieldInput();
+  if (document.getElementById("bookmarknamegrid").hasAttribute("hidden")) {
+    bookmarkView.tree.focus();
+    if (bookmarkView.currentIndex == -1)
+      bookmarkView.treeBoxObject.selection.select(0);
+  }
+  else {
+    gFld_Name.select();
+    gFld_Name.focus();
+  }
+} 
+
+function sizeToFit()
+{
+  var dialogElement = document.documentElement;
+  dialogElement.removeAttribute("persist");
+  dialogElement.removeAttribute("height");
+  dialogElement.removeAttribute("width");
+  dialogElement.setAttribute("style", dialogElement.getAttribute("style"));
+  sizeToContent();
+}
+
+function setupFields()
+{
+  // New bookmark in predetermined folder. 
+  gFld_Name.value = window.arguments[0] || "";
+  gFld_URL.value = window.arguments[1] || "";
+  onFieldInput();
+  gFld_Name.select();
+  gFld_Name.focus();
+  gBookmarkCharset = window.arguments[3] || null;
+}
+
+function onFieldInput()
+{
+  const ok = document.documentElement.getButton("accept");
+  ok.disabled = gFld_URL.value == "" && !addingGroup() ||
+                gFld_Name.value == "";
+}    
+
+function onOK()
+{
+  if (!document.getElementById("folderbox").hasAttribute("hidden")) {
+    var bookmarkView = document.getElementById("bookmarks-view");
+    var currentIndex = bookmarkView.currentIndex;
+    if (currentIndex != -1)
+      gCreateInFolder = bookmarkView.treeBuilder.getResourceAtIndex(currentIndex).Value;
+  }
+  // In Select Folder Mode, do nothing but tell our caller what
+  // folder was selected. 
+  if (window.arguments.length > 4 && window.arguments[4] == "selectFolder")
+    window.arguments[5].selectedFolder = gCreateInFolder;
+  else {
+    // Otherwise add a bookmark to the selected folder. 
+
+    const kBMDS = kRDF.GetDataSource("rdf:bookmarks");
+    const kBMSContractID = "@mozilla.org/browser/bookmarks-service;1";
+    const kBMSIID = Components.interfaces.nsIBookmarksService;
+    const kBMS = Components.classes[kBMSContractID].getService(kBMSIID);
+    var rFolder = kRDF.GetResource(gCreateInFolder, true);
+    const kRDFCContractID = "@mozilla.org/rdf/container;1";
+    const kRDFIID = Components.interfaces.nsIRDFContainer;
+    const kRDFC = Components.classes[kRDFCContractID].getService(kRDFIID);
+    try {
+      kRDFC.Init(kBMDS, rFolder);
+    }
+    catch (e) {
+      // No "NC:NewBookmarkFolder" exists, just append to the root.
+      rFolder = kRDF.GetResource("NC:BookmarksRoot", true);
+      kRDFC.Init(kBMDS, rFolder);
+    }
+
+    // if no URL was provided and we're not filing as a group, do nothing
+    if (!gFld_URL.value && !addingGroup())
+      return;
+
+    var url;
+    if (addingGroup()) {
+      const group = kBMS.createGroup(gFld_Name.value, rFolder);
+      const groups = window.arguments[5];
+      for (var i = 0; i < groups.length; ++i) {
+        url = getNormalizedURL(groups[i].url);
+        kBMS.createBookmarkWithDetails(groups[i].name, url,
+                                       groups[i].charset, group, -1);
+      }
+    } else {
+      url = getNormalizedURL(gFld_URL.value);
+      var newBookmark = kBMS.createBookmarkWithDetails(gFld_Name.value, url, gBookmarkCharset, rFolder, -1);
+      if (window.arguments.length > 4 && window.arguments[4] == "newBookmark") {
+        window.arguments[5].newBookmark = newBookmark;
+      }
+    }
+  }
+}
+
+function getNormalizedURL(url)
+{
+  // Check to see if the item is a local directory path, and if so, convert
+  // to a file URL so that aggregation with rdf:files works
+  try {
+    const kLF = Components.classes["@mozilla.org/file/local;1"]
+                          .createInstance(Components.interfaces.nsILocalFile);
+    kLF.initWithPath(url);
+    if (kLF.exists()) {
+      var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+                                .getService(Components.classes.nsIIOService);
+
+      url = ioService.getURLSpecFromFile(kLF);
+    }
+  }
+  catch (e) {
+  }
+
+  return url;
+}
+
+var gBookmarksShell = null;
+function createNewFolder ()
+{
+  var bookmarksView = document.getElementById("bookmarks-view");
+  bookmarksView.createNewFolder();
+}
+
+function useDefaultFolder ()
+{
+  var bookmarkView = document.getElementById("bookmarks-view");
+  var folder = BookmarksUtils.getNewBookmarkFolder();
+  var ind = bookmarkView.treeBuilder.getIndexOfResource(folder);
+  if (ind != -1) {
+    bookmarkView.tree.focus();
+    bookmarkView.treeBoxObject.selection.select(ind);
+  } else {
+    bookmarkView.treeBoxObject.selection.clearSelection();
+  }
+  gCreateInFolder = folder.Value;
+}
+
+var gOldNameValue = "";
+var gOldURLValue = "";
+
+function toggleGroup()
+{
+  // swap between single bookmark and group name
+  var temp = gOldNameValue;
+  gOldNameValue = gFld_Name.value;
+  gFld_Name.value = temp;
+
+  // swap between single bookmark and group url
+  temp = gOldURLValue;
+  gOldURLValue = gFld_URL.value;
+  gFld_URL.value = temp;
+  gFld_URL.disabled = gCB_AddGroup.getAttribute("checked") == "true";
+
+  gFld_Name.select();
+  gFld_Name.focus();
+  onFieldInput();
+}
+
+function addingGroup()
+{
+  const showAddGroup = document.getElementById("showaddgroup");
+  return showAddGroup.getAttribute("hidden") != "true" && gCB_AddGroup.getAttribute("checked") == "true";
+}

browser/components/bookmarks/content/addBookmark.xul

@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<!-- -*- Mode: HTML; indent-tabs-mode: nil; -*- -->
+<!--
+
+  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.org code.
+ 
+  The Initial Developer of the Original Code is Netscape
+  Communications Corporation.  Portions created by Netscape are
+  Copyright (C) 1998 Netscape Communications Corporation. All
+  Rights Reserved.
+ 
+  Contributor(s): 
+    Ben Goodger <ben@netscape.com> (Original Author)
+
+-->
+
+<?xml-stylesheet href="chrome://communicator/skin/"?>
+<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css"?>
+<?xml-stylesheet href="chrome://communicator/content/bookmarks/bookmarks.css" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % addBookmarkDTD SYSTEM "chrome://communicator/locale/bookmarks/addBookmark.dtd">
+%addBookmarkDTD;
+]>
+
+<dialog id="newBookmarkDialog" style="width: 36em;"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        ondialogaccept="return onOK(event)"
+        title="&newBookmark.title;" title-selectFolder="&selectFolder.label;"
+        onload="Startup();"
+        persist="screenX screenY width height"
+        screenX="24" screenY="24">
+   
+  
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksTree.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/addBookmark.js"/>
+
+  <stringbundle id="bookmarksbundle"
+                src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
+
+  <broadcaster id="showaddgroup" hidden="true"/>
+
+  <separator id="nameseparator" class="thin"/>
+  
+  <grid id="bookmarknamegrid">
+    <columns>
+      <column/>
+      <column flex="5"/>
+      <column flex="1"/>
+    </columns>
+    <rows>
+      <row align="center">
+        <label value="&name.label;" accesskey="&name.accesskey;" control="name"/>
+        <textbox id="name" oninput="onFieldInput();"/>
+        <spacer/>
+      </row>
+      <row>
+        <separator class="thin"/>
+        <separator class="thin"/>
+        <spacer/>
+      </row>
+      <row align="center">
+        <label value="&url.label;" accesskey="&url.accesskey;" control="url"/>
+        <textbox id="url" oninput="onFieldInput();"/>
+        <spacer/>
+      </row>
+      <row observes="showaddgroup">
+        <separator class="thin"/>
+        <separator class="thin"/>
+        <spacer/>
+      </row>
+      <row observes="showaddgroup">
+        <spacer/>
+        <hbox pack="start">
+          <checkbox id="addgroup" label="&addGroup.label;"
+                    accesskey="&addGroup.accesskey;" oncommand="toggleGroup();"/>
+        </hbox>
+        <spacer/>
+      </row>
+    </rows>
+  </grid>
+
+  <separator id="createinseparator"/>
+
+  <vbox id="folderbox" flex="1">
+    <separator/>
+    <hbox flex="1">
+      <label id="createinlabel" value="&createin.label;"/>
+      <hbox flex="1">
+        <bookmarks-tree id="bookmarks-view" flex="1" type="folders"/>
+        <vbox>
+          <button label="&button.newfolder.label;" accesskey="&button.newfolder.accesskey;"
+                  oncommand="createNewFolder();"/>
+          <button label="&button.defaultfolder.label;" 
+                  accesskey="&button.defaultfolder.accesskey;"
+                  oncommand="useDefaultFolder();"/>
+        </vbox>
+      </hbox>
+    </hbox>
+  </vbox>
+
+  <separator/>
+
+</dialog>

browser/components/bookmarks/content/bm-panel.xul

@@ -0,0 +1,87 @@
+<?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- --> 
+<!--
+
+  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.org code.
+ 
+  The Initial Developer of the Original Code is Netscape
+  Communications Corporation.  Portions created by Netscape are
+  Copyright (C) 1998 Netscape Communications Corporation. All
+  Rights Reserved.
+ 
+  Contributor(s): 
+    Ben Goodger <ben@netscape.com> (Original Author, v2.0)
+
+-->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/sidebar/sidebarListView.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarksWindow.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/content/bookmarks/bookmarks.css" type="text/css"?>
+
+<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/bookmarks/bookmarksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
+
+<page id="bookmarksPanel"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="Startup();" elementtofocus="bookmarks-view">
+
+  <!-- XXX - would like to cut this dependency out -->
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+
+  <!-- Bookmarks Shell -->
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksPanel.js"/>
+
+  <!-- Drag and Drop -->
+  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksDD.js"/>
+
+
+  <!-- context menu, tooltips, etc -->
+  <popupset id="bookmarksPopupset"/>
+  
+  <!-- bookmarks string bundle -->
+  <stringbundleset id="stringbundleset"/>
+  
+  <!-- bookmarks & edit commands -->
+  <commands id="commands">
+    <commandset id="CommandUpdate_Bookmarks"
+                commandupdater="true"
+                events="click,focus"
+                oncommandupdate="document.getElementById('bookmarks-view').onCommandUpdate();">
+    </commandset>                
+    <commandset id="bookmarksItems"/>
+  </commands>
+  
+  <hbox id="panel-bar" class="toolbar">
+    <toolbarbutton id="btnAddBookmark" label="&command.addBookmark.label;"
+            oncommand="addBookmark();"/>
+    <toolbarbutton id="btnManageBookmarks" label="&command.manageBookmarks.label;"
+            oncommand="manageBookmarks();"/>
+    <spacer flex="1"/>
+    <toolbarseparator/>
+    <toolbarbutton id="btnFindBookmarks" label="&command.findBookmarks.label;"
+            oncommand="document.getElementById('bookmarks-view').openFindDialog();"/>
+  </hbox>
+  
+  <bookmarks-tree id="bookmarks-view" class="sidebar" type="single-column" flex="1"/>
+
+</page>

browser/components/bookmarks/content/bm-props.js

@@ -0,0 +1,408 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var NC_NAMESPACE_URI = "http://home.netscape.com/NC-rdf#";
+
+// XXX MAKE SURE that the "url" field is LAST!
+// This is important for what happens if/when the URL itself is changed.
+// Ask rjc@netscape.com if you want to know why exactly this is.
+
+// This is the set of fields that are visible in the window.
+var gFields     = ["name", "shortcut", "description", "url"];
+
+// ...and this is a parallel array that contains the RDF properties
+// that they are associated with.
+var gProperties = [NC_NAMESPACE_URI + "Name",
+                   NC_NAMESPACE_URI + "ShortcutURL",
+                   NC_NAMESPACE_URI + "Description",
+                   NC_NAMESPACE_URI + "URL"];
+
+var RDF = Components.classes["@mozilla.org/rdf/rdf-service;1"]
+                    .getService(Components.interfaces.nsIRDFService);
+
+var RDFCU = Components.classes["@mozilla.org/rdf/container-utils;1"]
+                      .getService(Components.interfaces.nsIRDFContainerUtils);
+
+var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
+
+var gBookmarkURL = "";
+
+function Init()
+{
+  var x;
+  gBookmarkURL = window.arguments[0];
+  var resource = RDF.GetResource(gBookmarkURL);
+
+  // Check the description
+  var primaryType = BookmarksUtils.resolveType(resource).split("#")[1];
+  if (primaryType == "Folder") {
+    if (resource.Value == "NC:PersonalToolbarFolder")
+      primaryType = "PersonalToolbarFolder";
+    else {
+      var folderGroupArc = RDF.GetResource(NC_NAMESPACE_URI+"FolderGroup");
+      var isFolderGroup  = Bookmarks.GetTarget(resource, folderGroupArc, true);
+      if (isFolderGroup)
+        primaryType = "FolderGroup";
+    }
+  }
+  var description = BookmarksUtils.getLocaleString("description_"+primaryType);
+  
+  var newBookmarkFolder = BookmarksUtils.getNewBookmarkFolder();
+  var newSearchFolder   = BookmarksUtils.getNewSearchFolder();
+
+  if (resource == newBookmarkFolder && resource == newSearchFolder)
+    description = description+" "+BookmarksUtils.getLocaleString("description_NewBookmarkAndSearchFolder")
+  else if (resource == newBookmarkFolder )
+    description = description+" "+BookmarksUtils.getLocaleString("description_NewBookmarkFolder")
+  else if (resource == newSearchFolder)
+    description = description+" "+BookmarksUtils.getLocaleString("description_NewSearchFolder");
+
+  var textNode = document.createTextNode(description);
+  document.getElementById("bookmarkDescription").appendChild(textNode);
+
+  // Initialize the properties panel by copying the values from the
+  // RDF graph into the fields on screen.
+
+  for (var i = 0; i < gFields.length; ++i) {
+    var field = document.getElementById(gFields[i]);
+
+    var value = Bookmarks.GetTarget(resource, RDF.GetResource(gProperties[i]), true);
+
+    if (value)
+      value = value.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+
+    if (value) //make sure were aren't stuffing null into any fields
+      field.value = value;
+  }
+
+  var propsWindow = document.getElementById("bmPropsWindow");
+  var nameNode = document.getElementById("name");
+  var title = propsWindow.getAttribute("title");
+  title = title.replace(/\*\*bm_title\*\*/gi, nameNode.value);
+  propsWindow.setAttribute("title", title);
+
+  // check bookmark schedule
+  var scheduleArc = RDF.GetResource("http://home.netscape.com/WEB-rdf#Schedule");
+  value = Bookmarks.GetTarget(resource, scheduleArc, true);
+
+  if (value) {
+    value = value.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+
+    if (value) {
+      var values = value.split("|");
+      if (values.length == 4) {
+        // get day range
+        var days = values[0];
+        var dayNode = document.getElementById("dayRange");
+        var dayItems = dayNode.childNodes[0].childNodes;
+        for (x=0; x < dayItems.length; ++x) {
+          if (dayItems[x].getAttribute("value") == days) {
+            dayNode.selectedItem = dayItems[x];
+            break;
+          }
+        }
+
+        // get hour range
+        var hours = values[1].split("-");
+        var startHour = "";
+        var endHour = "";
+
+        if (hours.length == 2) {
+          startHour = hours[0];
+          endHour = hours[1];
+        }
+
+        // set start hour
+        var startHourNode = document.getElementById("startHourRange");
+        var startHourItems = startHourNode.childNodes[0].childNodes;
+        for (x=0; x < startHourItems.length; ++x) {
+          if (startHourItems[x].getAttribute("value") == startHour) {
+            startHourNode.selectedItem = startHourItems[x];
+            break;
+          }
+        }
+
+        // set end hour
+        var endHourNode = document.getElementById("endHourRange");
+        var endHourItems = endHourNode.childNodes[0].childNodes;
+        for (x=0; x < endHourItems.length; ++x) {
+          if (endHourItems[x].getAttribute("value") == endHour) {
+            endHourNode.selectedItem = endHourItems[x];
+            break;
+          }
+        }
+
+        // get duration
+        var duration = values[2];
+        var durationNode = document.getElementById("duration");
+        durationNode.value = duration;
+
+        // get notification method
+        var method = values[3];
+        if (method.indexOf("icon") >= 0)
+          document.getElementById("bookmarkIcon").checked = true;
+
+        if (method.indexOf("sound") >= 0)
+          document.getElementById("playSound").checked = true;
+
+        if (method.indexOf("alert") >= 0)
+          document.getElementById("showAlert").checked = true;
+
+        if (method.indexOf("open") >= 0)
+          document.getElementById("openWindow").checked = true;
+      }
+    }
+  }
+
+  // if its a container, disable some things
+  var isContainerFlag = RDFCU.IsContainer(Bookmarks, RDF.GetResource(gBookmarkURL));
+  if (!isContainerFlag) {
+    // XXX To do: the "RDFCU.IsContainer" call above only works for RDF sequences;
+    //            if its not a RDF sequence, we should to more checking to see if
+    //            the item in question is really a container of not.  A good example
+    //            of this is the "File System" container.
+  }
+
+  if (isContainerFlag) {
+    // If it is a folder, it has no URL or Keyword
+    document.getElementById("locationrow").setAttribute("hidden", "true");
+    document.getElementById("shortcutrow").setAttribute("hidden", "true");
+  }
+
+  if (gBookmarkURL.substr(0, 7).toLowerCase() != "http://" &&
+      gBookmarkURL.substr(0, 8).toLowerCase() != "https://") {
+    // only allow scheduling of http/https URLs
+    document.getElementById("ScheduleTab").setAttribute("hidden", "true");
+    document.getElementById("NotifyTab").setAttribute("hidden", "true");
+  }
+
+  sizeToContent();
+  
+  // Set up the enabled of controls on the scheduling panels
+  dayRangeChange(document.getElementById("dayRange"));
+
+  // set initial focus
+  nameNode.focus();
+  nameNode.select();
+
+}
+
+
+function Commit()
+{
+  var changed = false;
+
+  // Grovel through the fields to see if any of the values have
+  // changed. If so, update the RDF graph and force them to be saved
+  // to disk.
+  for (var i = 0; i < gFields.length; ++i) {
+    var field = document.getElementById(gFields[i]);
+
+    if (field) {
+      // Get the new value as a literal, using 'null' if the value is empty.
+      var newvalue = field.value;
+
+      var oldvalue = Bookmarks.GetTarget(RDF.GetResource(gBookmarkURL),
+                                         RDF.GetResource(gProperties[i]),
+                                         true);
+
+      if (oldvalue)
+        oldvalue = oldvalue.QueryInterface(Components.interfaces.nsIRDFLiteral);
+
+      if (newvalue && gProperties[i] == (NC_NAMESPACE_URI + "ShortcutURL")) {
+        // shortcuts are always lowercased internally
+        newvalue = newvalue.toLowerCase();
+      }
+      else if (newvalue && gProperties[i] == (NC_NAMESPACE_URI + "URL")) {
+        // we're dealing with the URL attribute;
+        // if a scheme isn't specified, use "http://"
+        if (newvalue.indexOf(":") < 0)
+          newvalue = "http://" + newvalue;
+      }
+
+      if (newvalue)
+        newvalue = RDF.GetLiteral(newvalue);
+
+      if (updateAttribute(gProperties[i], oldvalue, newvalue)) {
+        // Update gBookmarkURL if the url changed
+        if (newvalue && gProperties[i] == NC_NAMESPACE_URI + "URL")
+          gBookmarkURL = newvalue.Value;
+
+        changed = true;
+      }
+    }
+  }
+
+  // Update bookmark schedule if necessary;
+  // if the tab was removed, just skip it
+  var scheduleTab = document.getElementById("ScheduleTab");
+  if (scheduleTab) {
+    var scheduleRes = "http://home.netscape.com/WEB-rdf#Schedule";
+    oldvalue = Bookmarks.GetTarget(RDF.GetResource(gBookmarkURL),
+                                   RDF.GetResource(scheduleRes), true);
+    newvalue = "";
+    var dayRangeNode = document.getElementById("dayRange");
+    var dayRange = dayRangeNode.selectedItem.getAttribute("value");
+
+    if (dayRange) {
+      var startHourRangeNode = document.getElementById("startHourRange");
+      var startHourRange = startHourRangeNode.selectedItem.getAttribute("value");
+
+      var endHourRangeNode = document.getElementById("endHourRange");
+      var endHourRange = endHourRangeNode.selectedItem.getAttribute("value");
+
+      if (parseInt(startHourRange) > parseInt(endHourRange)) {
+        var temp = startHourRange;
+        startHourRange = endHourRange;
+        endHourRange = temp;
+      }
+
+      var duration = document.getElementById("duration").value;
+      if (!duration) {
+        alert(BookmarksUtils.getLocaleString("pleaseEnterADuration"));
+        return false;
+      }
+
+      var methods = [];
+      if (document.getElementById("bookmarkIcon").checked)
+        methods.push("icon");
+      if (document.getElementById("playSound").checked)
+        methods.push("sound");
+      if (document.getElementById("showAlert").checked)
+        methods.push("alert");
+      if (document.getElementById("openWindow").checked)
+        methods.push("open");
+
+      if (methods.length == 0) {
+        alert(BookmarksUtils.getLocaleString("pleaseSelectANotification"));
+        return false;
+      }
+
+      var method = methods.join(); // join string in array with ","
+
+      newvalue = dayRange + "|" + startHourRange + "-" + endHourRange + "|" + duration + "|" + method;
+    }
+
+    if (newvalue)
+      newvalue = RDF.GetLiteral(newvalue);
+
+    if (updateAttribute(scheduleRes, oldvalue, newvalue))
+      changed = true;
+  }
+
+  if (changed) {
+    var remote = Bookmarks.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+    if (remote)
+      remote.Flush();
+  }
+
+  window.close();
+  return true;
+}
+
+function updateAttribute(prop, oldvalue, newvalue)
+{
+  var changed = false;
+
+  if (prop && (oldvalue || newvalue) && oldvalue != newvalue) {
+
+    if (oldvalue && !newvalue) {
+      Bookmarks.Unassert(RDF.GetResource(gBookmarkURL),
+                         RDF.GetResource(prop),
+                         oldvalue);
+    }
+    else if (!oldvalue && newvalue) {
+      Bookmarks.Assert(RDF.GetResource(gBookmarkURL),
+                       RDF.GetResource(prop),
+                       newvalue,
+                       true);
+    }
+    else /* if (oldvalue && newvalue) */ {
+      Bookmarks.Change(RDF.GetResource(gBookmarkURL),
+                       RDF.GetResource(prop),
+                       oldvalue,
+                       newvalue);
+    }
+
+    changed = true;
+  }
+
+  return changed;
+}
+
+function setEndHourRange()
+{
+  // Get the values of the start-time and end-time as ints
+  var startHourRangeNode = document.getElementById("startHourRange");
+  var startHourRange = startHourRangeNode.selectedItem.getAttribute("value");
+  var startHourRangeInt = parseInt(startHourRange);
+
+  var endHourRangeNode = document.getElementById("endHourRange");
+  var endHourRange = endHourRangeNode.selectedItem.getAttribute("value");
+  var endHourRangeInt = parseInt(endHourRange);
+
+  var endHourItemNode = endHourRangeNode.firstChild.firstChild;
+
+  var index = 0;
+
+  // disable all those end-times before the start-time
+  for (; index < startHourRangeInt; ++index) {
+    endHourItemNode.setAttribute("disabled", "true");
+    endHourItemNode = endHourItemNode.nextSibling;
+  }
+
+  // update the selected value if it's out of the allowed range
+  if (startHourRangeInt >= endHourRangeInt)
+    endHourRangeNode.selectedItem = endHourItemNode;
+
+  // make sure all the end-times after the start-time are enabled
+  for (; index < 24; ++index) {
+    endHourItemNode.removeAttribute("disabled");
+    endHourItemNode = endHourItemNode.nextSibling;
+  }
+}
+
+function dayRangeChange (aMenuList)
+{
+  var controls = ["startHourRange", "endHourRange", "duration", "bookmarkIcon", 
+                  "showAlert", "openWindow", "playSound", "durationSubLabel", 
+                  "durationLabel", "startHourRangeLabel", "endHourRangeLabel"];
+  for (var i = 0; i < controls.length; ++i)
+    document.getElementById(controls[i]).disabled = !aMenuList.value;
+}
+
+

browser/components/bookmarks/content/bm-props.xul

@@ -0,0 +1,239 @@
+<?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- -->
+<!--
+
+  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.org code.
+ 
+  The Initial Developer of the Original Code is Netscape
+  Communications Corporation.  Portions created by Netscape are
+  Copyright (C) 1998 Netscape Communications Corporation. All
+  Rights Reserved.
+ 
+  Contributor(s): 
+
+-->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % bmpropsDTD SYSTEM "chrome://communicator/locale/bookmarks/bm-props.dtd">
+%bmpropsDTD;
+]>
+
+<dialog id="bmPropsWindow" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&bookmarks.windowtitle.label;"
+        onload="Init()" style="width: 30em;"
+        ondialogaccept="return Commit();">
+ 
+  <stringbundleset>
+    <stringbundle id="bundle_bookmarks" src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
+    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+  </stringbundleset>
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bm-props.js"/>
+ 
+  <keyset id="keyset"/>  
+    
+  <tabbox>
+    <tabs>
+      <tab label="&generalInfo.label;" accesskey="&generalInfo.accesskey;"/>
+      <tab id="ScheduleTab" label="&schedule.label;" accesskey="&schedule.accesskey;"/>
+      <tab id="NotifyTab" label="&notification.label;" accesskey="&notification.accesskey;"/>
+    </tabs>
+    <tabpanels>
+      <vbox>
+        <separator class="thin"/>
+        <hbox align="start">
+          <image class="message-icon"/>
+          <separator class="thin" orient="vertical"/>
+          <description id="bookmarkDescription" flex="1"/>
+        </hbox>
+   
+        <separator class="thin"/>
+        
+        <vbox class="box-padded">    
+          <grid>
+            <columns>
+              <column />
+              <column flex="1"/>
+            </columns>
+            <rows>
+              <row align="center">
+                <label value="&bookmarks.name.label;" control="name"/>
+                <textbox id="name"/>
+              </row>
+              <row id="locationrow" align="center">
+                <label value="&bookmarks.location.label;" control="url"/>
+          			<textbox id="url" />
+              </row>
+              <row id="shortcutrow" align="center">
+                <label value="&bookmarks.shortcut.label;" control="shortcut"/>
+    		      	<textbox id="shortcut" />
+              </row>
+              <row>
+                <label value="&bookmarks.description.label;" control="description"/>
+                <textbox multiline="true" wrap="virtual" id="description" flex="1"/>
+              </row>
+            </rows>
+          </grid>
+          <separator/>
+        </vbox>
+      </vbox>
+      
+      <vbox>
+        <separator class="thin"/>
+        <hbox align="center">
+          <image id="schedule-icon"/>
+          <separator class="thin" orient="vertical"/>
+          <description flex="1">&schedule.description;</description>
+        </hbox>
+        <separator class="thin"/>
+        <hbox class="box-padded">
+          <spacer flex="1"/>
+          <groupbox>
+            <caption label="&checkforupdates.legend.label;"/>
+            <grid flex="1">
+              <columns>
+                <column/>
+                <column flex="1"/>
+              </columns>
+              <rows>
+                <row align="center">
+                  <label value="&when.label;" control="dayRange"/>
+                  <hbox>
+                    <menulist id="dayRange" oncommand="dayRangeChange(this);">
+                      <menupopup>
+                        <menuitem value="" label="&checknever.label;"/>
+                        <menuseparator />
+                        <menuitem value="0123456" label="&checkeveryday.label;"/>
+                        <menuitem value="12345" label="&checkweekdays.label;"/>
+                        <menuitem value="06" label="&checkweekends.label;"/>
+                        <menuitem value="1" label="&checkmondays.label;"/>
+                        <menuitem value="2" label="&checktuesdays.label;"/>
+                        <menuitem value="3" label="&checkwednesdays.label;"/>
+                        <menuitem value="4" label="&checkthursdays.label;"/>
+                        <menuitem value="5" label="&checkfridays.label;"/>
+                        <menuitem value="6" label="&checksaturdays.label;"/>
+                        <menuitem value="0" label="&checksundays.label;"/>
+                      </menupopup>
+                    </menulist>
+                  </hbox>
+                </row>
+                <row align="center">
+                  <label id="startHourRangeLabel" 
+                        value="&from.label;" control="startHourRange"/>
+                  <hbox align="center">
+                    <menulist id="startHourRange" oncommand="setEndHourRange()">
+                      <menupopup>
+                        <menuitem value="0" label="&midnight.label;"/>
+                        <menuitem value="1" label="&AMone.label;"/>
+                        <menuitem value="2" label="&AMtwo.label;"/>
+                        <menuitem value="3" label="&AMthree.label;"/>
+                        <menuitem value="4" label="&AMfour.label;"/>
+                        <menuitem value="5" label="&AMfive.label;"/>
+                        <menuitem value="6" label="&AMsix.label;"/>
+                        <menuitem value="7" label="&AMseven.label;"/>
+                        <menuitem value="8" label="&AMeight.label;"/>
+                        <menuitem value="9" label="&AMnine.label;"/>
+                        <menuitem value="10" label="&AMten.label;"/>
+                        <menuitem value="11" label="&AMeleven.label;"/>
+                        <menuitem value="12" label="&noon.label;"/>
+                        <menuitem value="13" label="&PMone.label;"/>
+                        <menuitem value="14" label="&PMtwo.label;"/>
+                        <menuitem value="15" label="&PMthree.label;"/>
+                        <menuitem value="16" label="&PMfour.label;"/>
+                        <menuitem value="17" label="&PMfive.label;"/>
+                        <menuitem value="18" label="&PMsix.label;"/>
+                        <menuitem value="19" label="&PMseven.label;"/>
+                        <menuitem value="20" label="&PMeight.label;"/>
+                        <menuitem value="21" label="&PMnine.label;"/>
+                        <menuitem value="22" label="&PMten.label;"/>
+                        <menuitem value="23" label="&PMeleven.label;"/>
+                      </menupopup>
+                    </menulist>
+                    <label id="endHourRangeLabel" 
+                          value="&to.label;" control="endHourRange"/>
+                    <menulist id="endHourRange">
+                      <menupopup onpopupshowing="setEndHourRange()">
+                        <menuitem value="1" label="&AMone.label;"/>
+                        <menuitem value="2" label="&AMtwo.label;"/>
+                        <menuitem value="3" label="&AMthree.label;"/>
+                        <menuitem value="4" label="&AMfour.label;"/>
+                        <menuitem value="5" label="&AMfive.label;"/>
+                        <menuitem value="6" label="&AMsix.label;"/>
+                        <menuitem value="7" label="&AMseven.label;"/>
+                        <menuitem value="8" label="&AMeight.label;"/>
+                        <menuitem value="9" label="&AMnine.label;"/>
+                        <menuitem value="10" label="&AMten.label;"/>
+                        <menuitem value="11" label="&AMeleven.label;"/>
+                        <menuitem value="12" label="&noon.label;"/>
+                        <menuitem value="13" label="&PMone.label;"/>
+                        <menuitem value="14" label="&PMtwo.label;"/>
+                        <menuitem value="15" label="&PMthree.label;"/>
+                        <menuitem value="16" label="&PMfour.label;"/>
+                        <menuitem value="17" label="&PMfive.label;"/>
+                        <menuitem value="18" label="&PMsix.label;"/>
+                        <menuitem value="19" label="&PMseven.label;"/>
+                        <menuitem value="20" label="&PMeight.label;"/>
+                        <menuitem value="21" label="&PMnine.label;"/>
+                        <menuitem value="22" label="&PMten.label;"/>
+                        <menuitem value="23" label="&PMeleven.label;"/>
+                        <menuitem value="24" label="&midnight.label;"/>
+                      </menupopup>
+                    </menulist>
+                  </hbox>
+                </row>
+                <row align="center">
+                  <label id="durationLabel" 
+                        value="&every.label;" control="duration"/>
+                  <hbox align="center">
+              	    <textbox id="duration" size="4" value="60" />
+                    <label id="durationSubLabel" value="&minutes.label;" />
+                  </hbox>
+                </row>
+              </rows>
+            </grid>
+            <separator class="thin"/>
+          </groupbox>
+          <spacer flex="1"/>
+        </hbox>
+      </vbox>
+          
+      <vbox>
+        <separator class="thin"/>
+        <hbox align="start">
+          <image id="notification-icon"/>
+          <separator class="thin" orient="vertical"/>
+          <description flex="1">&notification.description;</description>
+        </hbox>
+        <separator class="thin"/>
+        <hbox class="box-padded">
+          <spacer flex="1"/>
+          <groupbox>
+            <caption label="&notifications.legend.label;" />
+            <vbox align="start">
+              <checkbox id="bookmarkIcon" label="&notification.icon.label;" />
+              <checkbox id="showAlert" label="&notification.alert.label;" />
+              <checkbox id="openWindow" label="&notification.window.label;" />
+              <checkbox id="playSound" label="&notification.sound.label;" />
+            </vbox>
+          </groupbox>
+          <spacer flex="1"/>
+        </hbox>
+      </vbox>
+    </tabpanels>
+  </tabbox> 
+</dialog>

browser/components/bookmarks/content/bookmarks-temp.js

@@ -0,0 +1,854 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+  This is the old bookmarks code, included here for the sake of the bookmarks sidebar panel,
+  which will be fixed to use my new code in .9. In the mean time, this file provides a
+  life line to various functionality.
+ */
+
+
+
+var NC_NS  = "http://home.netscape.com/NC-rdf#";
+var RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+
+function Init() {
+    var tree = document.getElementById("bookmarksTree");
+    tree.controllers.appendController(BookmarksController);
+    var children = document.getElementById('treechildren-bookmarks');
+    tree.selectItem(children.firstChild);
+    tree.focus();
+
+    RefreshSort();
+}
+
+var BookmarksController = {
+    supportsCommand: function(command)
+    {
+        switch(command)
+        {
+            case "cmd_undo":
+            case "cmd_redo":
+                return false;
+            case "cmd_cut":
+            case "cmd_copy":
+            case "cmd_paste":
+            case "cmd_delete":
+            case "cmd_selectAll":
+                return true;
+            default:
+                return false;
+        }
+    },
+    isCommandEnabled: function(command)
+    {
+        switch(command)
+        {
+            case "cmd_undo":
+            case "cmd_redo":
+                return false;
+            case "cmd_cut":
+            case "cmd_copy":
+            case "cmd_paste":
+            case "cmd_delete":
+            case "cmd_selectAll":
+                return true;
+            default:
+                return false;
+        }
+    },
+    doCommand: function(command)
+    {
+        switch(command)
+        {
+            case "cmd_undo":
+            case "cmd_redo":
+                break;
+            case "cmd_cut":
+                doCut();
+                break;
+            case "cmd_copy":
+                doCopy();
+                break;
+            case "cmd_paste":
+                doPaste();
+                break;
+            case "cmd_delete":
+                doDelete();
+                break;
+            case "cmd_selectAll":
+                doSelectAll();
+                break;
+        }
+    },
+    onEvent: function(event)
+    {
+        // On blur events set the menu item texts back to the normal values
+        /*if (event == 'blur' )
+          {
+          goSetMenuValue('cmd_undo', 'valueDefault');
+          goSetMenuValue('cmd_redo', 'valueDefault');
+          }*/
+    }
+};
+
+function CommandUpdate_Bookmarks()
+{
+    //goUpdateCommand('button_delete');
+    // get selection info from dir pane
+    /*
+    var oneAddressBookSelected = false;
+    if ( dirTree && dirTree.selectedItems && (dirTree.selectedItems.length == 1) )
+        oneAddressBookSelected = true;
+
+    // get selection info from results pane
+    var selectedCards = GetSelectedAddresses();
+    var oneOrMoreCardsSelected = false;
+    if ( selectedCards )
+        oneOrMoreCardsSelected = true;
+    */
+    // set commands to enabled / disabled
+    //goSetCommandEnabled('cmd_PrintCard', oneAddressBookSelected);
+    goSetCommandEnabled('bm_cmd_find', true/*oneAddressBookSelected*/);
+}
+
+function copySelectionToClipboard()
+{
+    var treeNode = document.getElementById("bookmarksTree");
+    if (!treeNode) return false;
+    var select_list = treeNode.selectedItems;
+    if (!select_list) return false;
+    if (select_list.length < 1) return false;
+
+    var rdf_uri = "@mozilla.org/rdf/rdf-service;1"
+    var RDF = Components.classes[rdf_uri].getService();
+    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
+    if (!RDF) return false;
+
+    var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
+    if (!Bookmarks) return false;
+
+    var nameRes = RDF.GetResource(NC_NS + "Name");
+    if (!nameRes) return false;
+
+    // Build a url that encodes all the select nodes
+    // as well as their parent nodes
+    var url = "";
+    var text = "";
+    var html = "";
+
+    for (var nodeIndex = 0; nodeIndex < select_list.length; nodeIndex++)
+    {
+        var node = select_list[nodeIndex];
+        if (!node) continue;
+
+        var ID = getAbsoluteID("bookmarksTree", node);
+        if (!ID) continue;
+
+        var IDRes = RDF.GetResource(ID);
+        if (!IDRes) continue;
+        var nameNode = Bookmarks.GetTarget(IDRes, nameRes, true);
+        var theName = "";
+        if (nameNode)
+            nameNode =
+                nameNode.QueryInterface(Components.interfaces.nsIRDFLiteral);
+        if (nameNode) theName = nameNode.Value;
+
+        url += "ID:{" + ID + "};";
+        url += "NAME:{" + theName + "};";
+
+        if (node.getAttribute("container") == "true")
+        {
+            var type = node.getAttribute("type");
+            if (type == NC_NS + "BookmarkSeparator")
+            {
+                // Note: can't encode separators in text, just html
+                html += "<hr><p>";
+            }
+            else
+            {
+                text += ID + "\r";
+
+                html += "<a href='" + ID + "'>";
+                if (theName != "")
+                {
+                    html += theName;
+                }
+                html += "</a><p>";
+            }
+        }
+    }
+
+    if (url == "") return false;
+
+    // get some useful components
+    var trans_uri = "@mozilla.org/widget/transferable;1";
+    var trans = Components.classes[trans_uri].createInstance();
+    if (trans) trans = trans.QueryInterface(Components.interfaces.nsITransferable);
+    if (!trans) return false;
+
+    var clip_uri = "@mozilla.org/widget/clipboard;1";
+    var clip = Components.classes[clip_uri].getService();
+    if (clip) clip = clip.QueryInterface(Components.interfaces.nsIClipboard);
+    if (!clip) return false;
+    clip.emptyClipboard(Components.interfaces.nsIClipboard.kGlobalClipboard);
+
+    // save bookmark's ID
+    trans.addDataFlavor("moz/bookmarkclipboarditem");
+    var data_uri = "@mozilla.org/supports-string;1";
+    var data = Components.classes[data_uri].createInstance();
+    if (data) {
+        data = data.QueryInterface(Components.interfaces.nsISupportsString);
+    }
+    if (!data) return false;
+    data.data = url;
+    // double byte data
+    trans.setTransferData("moz/bookmarkclipboarditem", data, url.length*2);
+
+    if (text != "")
+    {
+        trans.addDataFlavor("text/unicode");
+
+        var textData_uri = "@mozilla.org/supports-string;1";
+        var textData = Components.classes[textData_uri].createInstance();
+        if (textData) textData = textData.QueryInterface(Components.interfaces.nsISupportsString);
+        if (!textData) return false;
+        textData.data = text;
+        // double byte data
+        trans.setTransferData("text/unicode", textData, text.length*2);
+    }
+    if (html != "")
+    {
+        trans.addDataFlavor("text/html");
+
+        var wstring_uri = "@mozilla.org/supports-string;1";
+        var htmlData = Components.classes[wstring_uri].createInstance();
+        if (htmlData) {
+            var wstring_interface = Components.interfaces.nsISupportsString;
+            htmlData = htmlData.QueryInterface(wstring_interface);
+        }
+        if (!htmlData) return false;
+        htmlData.data = html;
+        // double byte data
+        trans.setTransferData("text/html", htmlData, html.length*2);
+    }
+    clip.setData(trans, null,
+                 Components.interfaces.nsIClipboard.kGlobalClipboard);
+    return true;
+}
+
+function doCut()
+{
+    if (copySelectionToClipboard() == true) {
+        doDelete(false);
+    }
+    return true;
+}
+
+function doCopy()
+{
+    copySelectionToClipboard();
+    return true;
+}
+
+function doPaste()
+{
+    var treeNode = document.getElementById("bookmarksTree");
+    if (!treeNode) return false;
+    var select_list = treeNode.selectedItems;
+    if (!select_list) return false;
+    if (select_list.length != 1) return false;
+
+    var pasteNodeID = select_list[0].getAttribute("id");
+    var isContainerFlag = (select_list[0].getAttribute("container") == "true");
+
+    var clip_uri = "@mozilla.org/widget/clipboard;1";
+    var clip = Components.classes[clip_uri].getService();
+    if (clip) clip = clip.QueryInterface(Components.interfaces.nsIClipboard);
+    if (!clip) return false;
+
+    var trans_uri = "@mozilla.org/widget/transferable;1";
+    var trans = Components.classes[trans_uri].createInstance();
+    if (trans) {
+        trans = trans.QueryInterface(Components.interfaces.nsITransferable);
+    }
+    if (!trans) return false;
+    trans.addDataFlavor("moz/bookmarkclipboarditem");
+
+    clip.getData(trans, Components.interfaces.nsIClipboard.kGlobalClipboard);
+    var data = new Object();
+    var dataLen = new Object();
+    trans.getTransferData("moz/bookmarkclipboarditem", data, dataLen);
+    if (data) {
+        var data_interface = Components.interfaces.nsISupportsString
+        data = data.value.QueryInterface(data_interface);
+    }
+    var url = null;
+   // double byte data
+    if (data) url = data.data.substring(0, dataLen.value / 2);
+    if (!url) return false;
+
+    var strings = url.split(";");
+    if (!strings) return false;
+
+    var rdf_uri = "@mozilla.org/rdf/rdf-service;1";
+    var RDF = Components.classes[rdf_uri].getService();
+    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
+    if (!RDF) return false;
+    var rdfc_uri = "@mozilla.org/rdf/container;1";
+    var RDFC = Components.classes[rdfc_uri].getService();
+    RDFC = RDFC.QueryInterface(Components.interfaces.nsIRDFContainer);
+    if (!RDFC) return false;
+    var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
+    if (!Bookmarks) return false;
+
+    var nameRes = RDF.GetResource(NC_NS + "Name");
+    if (!nameRes) return false;
+
+    pasteNodeRes = RDF.GetResource(pasteNodeID);
+    if (!pasteNodeRes) return false;
+    var pasteContainerRes = null;
+    var pasteNodeIndex = -1;
+    if (isContainerFlag == true)
+    {
+        pasteContainerRes = pasteNodeRes;
+    }
+    else
+    {
+        var parID = select_list[0].parentNode.parentNode.getAttribute("ref");
+        if (!parID) {
+            parID = select_list[0].parentNode.parentNode.getAttribute("id");
+        }
+        if (!parID) return false;
+        pasteContainerRes = RDF.GetResource(parID);
+        if (!pasteContainerRes) return false;
+    }
+    RDFC.Init(Bookmarks, pasteContainerRes);
+
+    if (isContainerFlag == false)
+    {
+        pasteNodeIndex = RDFC.IndexOf(pasteNodeRes);
+        if (pasteNodeIndex < 0) return false; // how did that happen?
+    }
+
+    var typeRes = RDF.GetResource(RDF_NS + "type");
+    if (!typeRes) return false;
+    var bmTypeRes = RDF.GetResource(NC_NS + "Bookmark");
+    if (!bmTypeRes) return false;
+
+    var dirty = false;
+    for (var x=0; x<strings.length; x=x+2)
+    {
+        var theID = strings[x];
+        var theName = strings[x+1];
+        if ((theID.indexOf("ID:{") == 0) && (theName.indexOf("NAME:{") == 0))
+        {
+            theID = theID.substr(4, theID.length-5);
+            theName = theName.substr(6, theName.length-7);
+
+            var IDRes = RDF.GetResource(theID);
+            if (!IDRes) continue;
+
+            if (RDFC.IndexOf(IDRes) > 0)
+                continue;
+
+            if (theName != "")
+            {
+                var NameLiteral = RDF.GetLiteral(theName);
+                if (NameLiteral)
+                {
+                    Bookmarks.Assert(IDRes, nameRes, NameLiteral, true);
+                    dirty = true;
+                }
+            }
+            if (isContainerFlag == true)
+              RDFC.AppendElement(IDRes);
+            else
+              RDFC.InsertElementAt(IDRes, pasteNodeIndex++, true);
+            dirty = true;
+
+            // make sure appropriate bookmark type is set
+            var bmTypeNode = Bookmarks.GetTarget( IDRes, typeRes, true );
+            if (!bmTypeNode)
+            {
+                // set default bookmark type
+                Bookmarks.Assert(IDRes, typeRes, bmTypeRes, true);
+            }
+        }
+    }
+    if (dirty == true)
+    {
+        var rdf_ds_interface = Components.interfaces.nsIRDFRemoteDataSource;
+        var remote = Bookmarks.QueryInterface(rdf_ds_interface);
+        if (remote)
+          remote.Flush();
+    }
+    return true;
+}
+
+function doDelete(promptFlag)
+{
+    var treeNode = document.getElementById("bookmarksTree");
+    if (!treeNode) return false;
+    var select_list = treeNode.selectedItems;
+    if (!select_list) return false;
+    if (select_list.length < 1) return false;
+
+    if (promptFlag == true)
+    {
+        var deleteStr = '';
+        if (select_list.length == 1) {
+            deleteStr = get_localized_string("DeleteItem");
+        } else {
+            deleteStr = get_localized_string("DeleteItems");
+        }
+        var ok = confirm(deleteStr);
+        if (!ok) return false;
+    }
+
+    var RDF_uri = "@mozilla.org/rdf/rdf-service;1";
+    var RDF = Components.classes[RDF_uri].getService();
+    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
+    if (!RDF) return false;
+
+    var RDFC_uri = "@mozilla.org/rdf/container;1";
+    var RDFC = Components.classes[RDFC_uri].getService();
+    RDFC = RDFC.QueryInterface(Components.interfaces.nsIRDFContainer);
+    if (!RDFC) return false;
+
+    var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
+    if (!Bookmarks) return false;
+
+    var dirty = false;
+
+    // note: backwards delete so that we handle odd deletion cases such as
+    //       deleting a child of a folder as well as the folder itself
+    for (var nodeIndex=select_list.length-1; nodeIndex>=0; nodeIndex--)
+    {
+        var node = select_list[nodeIndex];
+        if (!node) continue;
+        var ID = node.getAttribute("id");
+        if (!ID) continue;
+
+        // don't allow deletion of various "special" folders
+        if ((ID == "NC:BookmarksRoot") || (ID == "NC:IEFavoritesRoot"))
+        {
+            continue;
+        }
+
+        var parentID = node.parentNode.parentNode.getAttribute("ref");
+        if (!parentID) parentID = node.parentNode.parentNode.getAttribute("id");
+        if (!parentID) continue;
+
+        var IDRes = RDF.GetResource(ID);
+        if (!IDRes) continue;
+        var parentIDRes = RDF.GetResource(parentID);
+        if (!parentIDRes) continue;
+
+        RDFC.Init(Bookmarks, parentIDRes);
+        RDFC.RemoveElement(IDRes, true);
+        dirty = true;
+    }
+
+    if (dirty == true)
+    {
+        var remote = Bookmarks.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+        if (remote)
+          remote.Flush();
+    }
+
+    return true;
+}
+
+function doSelectAll()
+{
+    var treeNode = document.getElementById("bookmarksTree");
+    if (!treeNode) return false;
+    treeNode.selectAll();
+    return true;
+}
+
+function doUnload()
+{
+    // Get the current window position/size.
+    var x = window.screenX;
+    var y = window.screenY;
+    var h = window.outerHeight;
+    var w = window.outerWidth;
+
+    // Store these into the window attributes (for persistence).
+    var win = document.getElementById("bookmark-window");
+    win.setAttribute("x", x);
+    win.setAttribute("y", y);
+    win.setAttribute("height", h);
+    win.setAttribute("width", w);
+}
+
+function BookmarkProperties()
+{
+    var treeNode = document.getElementById('bookmarksTree');
+    var select_list = treeNode.selectedItems;
+
+    if (select_list.length >= 1) {
+        // don't bother showing properties on bookmark separators
+        var type = select_list[0].getAttribute('type');
+        if (type != NC_NS + "BookmarkSeparator") {
+            window.openDialog("chrome://communicator/content/bookmarks/bm-props.xul",
+                              "_blank", "centerscreen,chrome,menubar",
+                              select_list[0].getAttribute("id"));
+        }
+    }
+    return true;
+}
+
+
+
+function OpenBookmarksFind()
+{
+    window.openDialog("chrome://communicator/content/bookmarks/bm-find.xul",
+                      "FindBookmarksWindow",
+                      "dialog=no,close,chrome,resizable", "bookmarks");
+    return true;
+}
+
+
+
+function getAbsoluteID(root, node)
+{
+    var url = node.getAttribute("ref");
+    if ((url == null) || (url == ""))
+    {
+        url = node.getAttribute("id");
+    }
+    try
+    {
+        var rootNode = document.getElementById(root);
+        var ds = null;
+        if (rootNode)
+        {
+            ds = rootNode.database;
+        }
+
+        // add support for anonymous resources such as Internet Search results,
+        // IE favorites under Win32, and NetPositive URLs under BeOS
+        var rdf_uri = "@mozilla.org/rdf/rdf-service;1";
+        var rdf = Components.classes[rdf_uri].getService();
+        if (rdf) rdf = rdf.QueryInterface(Components.interfaces.nsIRDFService);
+        if (rdf && ds)
+        {
+            var src = rdf.GetResource(url, true);
+            var prop = rdf.GetResource(NC_NS + "URL",
+                                       true);
+            var target = ds.GetTarget(src, prop, true);
+            if (target) target = target.QueryInterface(Components.interfaces.nsIRDFLiteral);
+            if (target) target = target.Value;
+            if (target) url = target;
+        }
+    }
+    catch(ex)
+    {
+    }
+    return url;
+}
+
+function OpenURL(event, node, root)
+{
+    if ((event.button != 0) || (event.detail != 2)
+        || (node.nodeName != "treeitem"))
+        return false;
+
+    if (node.getAttribute("container") == "true")
+        return false;
+
+    var url = getAbsoluteID(root, node);
+
+    // Ignore "NC:" urls.
+    if (url.substring(0, 3) == "NC:")
+        return false;
+
+    if (event.altKey)
+    {
+        BookmarkProperties();
+    }
+    else
+    {
+        // get right sized window
+        window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", url);
+    }
+    return true;
+}
+
+const nsIFilePicker = Components.interfaces.nsIFilePicker;
+
+function doContextCmd(cmdName)
+{
+    // Do some prompting/confirmation for various bookmark
+    // commands that we know about.
+    // If we have values to pass it, they are added to the arguments array
+
+    var nameVal = "";
+    var urlVal = "";
+    var promptStr;
+
+    var picker_uri;
+    var filePicker;
+
+    if (cmdName == NC_NS + "command?cmd=newbookmark")
+    {
+        while (true)
+        {
+            promptStr = get_localized_string("NewBookmarkURLPrompt");
+            urlVal = prompt(promptStr, "");
+            if (!urlVal || urlVal=="") return false;
+
+            // ensure we get a fully qualified URL (protocol colon address)
+            var colonOffset = urlVal.indexOf(":");
+            if (colonOffset > 0) break;
+            alert(get_localized_string("NeedValidURL"));
+        }
+
+        promptStr = get_localized_string("NewBookmarkNamePrompt");
+        nameVal = prompt(promptStr, "");
+        if (!nameVal || nameVal=="") return false;
+    }
+    else if (cmdName == NC_NS + "command?cmd=newfolder")
+    {
+        promptStr = get_localized_string("NewFolderNamePrompt");
+        nameVal = prompt(promptStr, "");
+        if (!nameVal || nameVal=="") return false;
+    }
+    else if ((cmdName == NC_NS + "command?cmd=deletebookmark") ||
+         (cmdName == NC_NS + "command?cmd=deletebookmarkfolder") ||
+         (cmdName == NC_NS + "command?cmd=deletebookmarkseparator"))
+    {
+        return doDelete(true);
+        //var promptStr = get_localized_string("DeleteItems");
+        //if (!confirm(promptStr)) return false;
+    }
+    else if (cmdName == NC_NS + "command?cmd=import")
+    {
+        try
+        {
+            picker_uri = "@mozilla.org/filepicker;1";
+            filePicker = Components.classes[picker_uri].createInstance(nsIFilePicker);
+            if (!filePicker) return false;
+
+            promptStr = get_localized_string("SelectImport");
+            filePicker.init(window, promptStr, nsIFilePicker.modeOpen);
+            filePicker.appendFilters(nsIFilePicker.filterHTML | nsIFilePicker.filterAll);
+            if (filePicker.show() != nsIFilePicker.returnCancel)
+              var filename = filePicker.fileURL.spec;
+            if ((!filename) || (filename == "")) return false;
+
+            urlVal = filename;
+        }
+        catch(ex)
+        {
+            return false;
+        }
+    }
+    else if (cmdName == NC_NS + "command?cmd=export")
+    {
+        try
+        {
+            picker_uri = "@mozilla.org/filepicker;1";
+            filePicker = Components.classes[picker_uri].createInstance(nsIFilePicker);
+            if (!filePicker) return false;
+
+            promptStr = get_localized_string("EnterExport");
+            filePicker.init(window, promptStr, nsIFilePicker.modeSave);
+            filePicker.defaultString = "bookmarks.html";
+            filePicker.appendFilters(nsIFilePicker.filterHTML | nsIFilePicker.filterAll);
+            if (filePicker.show() != nsIFilePicker.returnCancel &&
+                filePicker.fileURL.spec &&
+                filePicker.fileURL.spec.length > 0) {
+              urlVal = filePicker.fileURL.spec;
+            } else {
+              return false;
+            }
+        }
+        catch(ex)
+        {
+            return false;
+        }
+    }
+
+    var treeNode = document.getElementById("bookmarksTree");
+    if (!treeNode) return false;
+    var db = treeNode.database;
+    if (!db) return false;
+
+    var compositeDB = db.QueryInterface(Components.interfaces.nsIRDFDataSource);
+    if (!compositeDB) return false;
+
+    var isupports_uri = "@mozilla.org/rdf/rdf-service;1";
+    var isupports = Components.classes[isupports_uri].getService();
+    if (!isupports) return false;
+    var rdf = isupports.QueryInterface(Components.interfaces.nsIRDFService);
+    if (!rdf) return false;
+
+    // need a resource for the command
+    var cmdResource = rdf.GetResource(cmdName);
+    if (!cmdResource) return false;
+    cmdResource = cmdResource.QueryInterface(Components.interfaces.nsIRDFResource);
+    if (!cmdResource) return false;
+
+    // set up selection nsISupportsArray
+    var selection_uri = "@mozilla.org/supports-array;1";
+    var selectionInstance = Components.classes[selection_uri].createInstance();
+    var selectionArray = selectionInstance.QueryInterface(Components.interfaces.nsISupportsArray);
+
+    // set up arguments nsISupportsArray
+    var arguments_uri = "@mozilla.org/supports-array;1";
+    var argumentsInstance = Components.classes[arguments_uri].createInstance();
+    var argumentsArray = argumentsInstance.QueryInterface(Components.interfaces.nsISupportsArray);
+
+    // get various arguments (parent, name)
+    var parentArc = rdf.GetResource(NC_NS + "parent");
+    if (!parentArc) return false;
+    var nameArc = rdf.GetResource(NC_NS + "Name");
+    if (!nameArc) return false;
+    var urlArc = rdf.GetResource(NC_NS + "URL");
+    if (!urlArc) return false;
+
+    var select_list = treeNode.selectedItems;
+
+    var uri;
+    var rdfNode;
+
+    if (select_list.length < 1)
+    {
+        // if nothing is selected, default to using the "ref"
+        // on the root of the tree
+        uri = treeNode.getAttribute("ref");
+        if (!uri || uri=="") return false;
+        rdfNode = rdf.GetResource(uri);
+        // add node into selection array
+        if (rdfNode)
+        {
+            selectionArray.AppendElement(rdfNode);
+        }
+
+        // add singular arguments into arguments array
+        if ((nameVal) && (nameVal != ""))
+        {
+            var nameLiteral = rdf.GetLiteral(nameVal);
+            if (!nameLiteral) return false;
+            argumentsArray.AppendElement(nameArc);
+            argumentsArray.AppendElement(nameLiteral);
+        }
+        if ((urlVal) && (urlVal != ""))
+        {
+            var urlLiteral = rdf.GetLiteral(urlVal);
+            if (!urlLiteral) return false;
+            argumentsArray.AppendElement(urlArc);
+            argumentsArray.AppendElement(urlLiteral);
+        }
+    }
+    else for (var nodeIndex=0; nodeIndex<select_list.length; nodeIndex++)
+    {
+        var node = select_list[nodeIndex];
+        if (!node) break;
+        uri = node.getAttribute("ref");
+        if ((uri) || (uri == ""))
+        {
+            uri = node.getAttribute("id");
+        }
+        if (!uri) return false;
+
+        rdfNode = rdf.GetResource(uri);
+        if (!rdfNode) break;
+
+        // add node into selection array
+        selectionArray.AppendElement(rdfNode);
+
+        // get the parent's URI
+        var parentURI = "";
+        var theParent = node.parentNode.parentNode;
+        parentURI = theParent.getAttribute("ref");
+        if ((!parentURI) || (parentURI == ""))
+        {
+                parentURI = theParent.getAttribute("id");
+        }
+        if (parentURI == "") return false;
+
+        var parentNode = rdf.GetResource(parentURI, true);
+        if (!parentNode) return false;
+
+        // add multiple arguments into arguments array
+        argumentsArray.AppendElement(parentArc);
+        argumentsArray.AppendElement(parentNode);
+
+        if ((nameVal) && (nameVal != ""))
+        {
+            var nameLiteral2 = rdf.GetLiteral(nameVal);
+            if (!nameLiteral2) return false;
+            argumentsArray.AppendElement(nameArc);
+            argumentsArray.AppendElement(nameLiteral2);
+        }
+        if ((urlVal) && (urlVal != ""))
+        {
+            var urlLiteral2 = rdf.GetLiteral(urlVal);
+            if (!urlLiteral2) return false;
+            argumentsArray.AppendElement(urlArc);
+            argumentsArray.AppendElement(urlLiteral2);
+        }
+    }
+
+    // do the command
+    compositeDB.DoCommand(selectionArray, cmdResource, argumentsArray);
+    return true;
+}
+
+function bookmarkSelect()
+{
+    var tree = document.getElementById("bookmarksTree");
+    var status = document.getElementById("statusbar-text");
+    var val = "";
+    if (tree.selectedItems.length == 1)
+    {
+        val = getAbsoluteID("bookmarksTree", tree.selectedItems[0]);
+
+        // Ignore "NC:" urls.
+        if (val.substring(0, 3) == "NC:")
+        {
+            val = "";
+        }
+    }
+    status.label = val;
+    return true;
+}

browser/components/bookmarks/content/bookmarks.css

@@ -0,0 +1,14 @@
+bookmarks-tree, bookmarks-tree[type="multi-column"]
+  {
+    -moz-binding          : url("chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-tree-full");
+  }
+  
+bookmarks-tree[type="single-column"]
+  {
+    -moz-binding          : url("chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-tree-name");
+  }
+
+bookmarks-tree[type="folders"]
+  {
+    -moz-binding          : url("chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-tree-folders");
+  }

browser/components/bookmarks/content/bookmarks.js

@@ -0,0 +1,231 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- 
+ *
+ * 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.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author, v3.0)
+ */
+
+var gSearchBox;
+////////////////////////////////////////////////////////////////////////////////
+// Initialize the command controllers, set focus, tree root, 
+// window title state, etc. 
+function Startup()
+{
+  const windowNode = document.getElementById("bookmark-window");
+  const bookmarksView = document.getElementById("bookmarks-view");
+  gSearchBox = document.getElementById("search-box");
+  var titleString;
+
+  // If we've been opened with a parameter, root the tree on it.
+  if ("arguments" in window && window.arguments[0]) {
+    var title;
+    var uri = window.arguments[0];
+    bookmarksView.tree.setAttribute("ref", uri);
+    if (uri.substring(0,5) == "find:") {
+      title = bookmarksView._bundle.GetStringFromName("search_results_title");
+      // Update the windowtype so that future searches are directed 
+      // there and the window is not re-used for bookmarks. 
+      windowNode.setAttribute("windowtype", "bookmarks:searchresults");
+    }
+    else {
+      const krNameArc = bookmarksView.rdf.GetResource(NC_NS + "Name");
+      const krRoot = bookmarksView.rdf.GetResource(window.arguments[0]);
+      var rName = bookmarksView.db.GetTarget(krRoot, krNameArc, true);
+      title = rName.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+    }
+    titleString = bookmarksView._bundle.GetStringFromName("window_title");
+    titleString = titleString.replace(/%folder_name%/gi, title);
+    windowNode.setAttribute("title", titleString);
+  }
+  else {
+    const kProfileContractID = "@mozilla.org/profile/manager;1";
+    const kProfileIID = Components.interfaces.nsIProfile;
+    const kProfile = Components.classes[kProfileContractID].getService(kProfileIID);
+    var length = {value:0};
+    var profileList = kProfile.getProfileList(length);
+    // unset the default BM title if the user has more than one profile
+    // or if he/she has changed the name of the default one.
+    // the profile "default" is not localizable.
+    if (length.value > 1 || kProfile.currentProfile.toLowerCase() != "default") {
+      titleString = bookmarksView._bundle.GetStringFromName("bookmarks_root");
+      titleString = titleString.replace(/%user_name%/, kProfile.currentProfile);
+      windowNode.setAttribute("title", titleString);
+    }
+  }
+ 
+  bookmarksView.treeBoxObject.selection.select(0);
+  bookmarksView.tree.focus();
+}
+
+function Shutdown ()
+{
+  // Store current window position and size in window attributes (for persistence).
+  var win = document.getElementById("bookmark-window");
+  win.setAttribute("x", screenX);
+  win.setAttribute("y", screenY);
+  win.setAttribute("height", outerHeight);
+  win.setAttribute("width", outerWidth);
+
+  var bookmarksView = document.getElementById("bookmarks-view");
+  bookmarksView.flushBMDatasource();
+}
+
+var gConstructedViewMenuSortItems = false;
+function fillViewMenu(aEvent)
+{
+  var adjacentElement = document.getElementById("fill-before-this-node");
+  var popupElement = aEvent.target;
+  
+  var bookmarksView = document.getElementById("bookmarks-view");
+  var columns = bookmarksView.columns;
+
+  if (!gConstructedViewMenuSortItems) {
+    for (var i = 0; i < columns.length; ++i) {
+      var name = columns[i].name;
+      var accesskey = columns[i].accesskey;
+      
+      var menuitem = document.createElement("menuitem");
+      var nameTemplate = bookmarksView._bundle.GetStringFromName("SortMenuItem");
+      name = nameTemplate.replace(/%NAME%/g, columns[i].label);
+      menuitem.setAttribute("label", name);
+      menuitem.setAttribute("accesskey", columns[i].accesskey);
+      menuitem.setAttribute("resource", columns[i].resource);
+      menuitem.setAttribute("id", "sortMenuItem:" + columns[i].resource);
+      menuitem.setAttribute("checked", columns[i].sortActive);
+      menuitem.setAttribute("name", "sortSet");
+      menuitem.setAttribute("type", "radio");
+      
+      popupElement.insertBefore(menuitem, adjacentElement);
+    }
+    
+    gConstructedViewMenuSortItems = true;
+  }  
+
+  const kPrefSvcContractID = "@mozilla.org/preferences;1";
+  const kPrefSvcIID = Components.interfaces.nsIPrefService;
+  var prefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID);
+  var bookmarksSortPrefs = prefSvc.getBranch("browser.bookmarks.sort.");
+
+  if (gConstructedViewMenuSortItems) {
+    var resource = bookmarksSortPrefs.getCharPref("resource");
+    var element = document.getElementById("sortMenuItem:" + resource);
+    if (element)
+      element.setAttribute("checked", "true");
+  }  
+
+  var sortAscendingMenu = document.getElementById("ascending");
+  var sortDescendingMenu = document.getElementById("descending");
+  var noSortMenu = document.getElementById("natural");
+  
+  sortAscendingMenu.setAttribute("checked", "false");
+  sortDescendingMenu.setAttribute("checked", "false");
+  noSortMenu.setAttribute("checked", "false");
+  var direction = bookmarksSortPrefs.getCharPref("direction");
+  if (direction == "natural")
+    sortAscendingMenu.setAttribute("checked", "true");
+  else if (direction == "ascending") 
+    sortDescendingMenu.setAttribute("checked", "true");
+  else
+    noSortMenu.setAttribute("checked", "true");
+}
+
+function onViewMenuSortItemSelected(aEvent)
+{
+  var resource = aEvent.target.getAttribute("resource");
+  
+  const kPrefSvcContractID = "@mozilla.org/preferences;1";
+  const kPrefSvcIID = Components.interfaces.nsIPrefService;
+  var prefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID);
+  var bookmarksSortPrefs = prefSvc.getBranch("browser.bookmarks.sort.");
+
+  switch (resource) {
+  case "":
+    break;
+  case "direction":
+    var dirn = bookmarksSortPrefs.getCharPref("direction");
+    if (aEvent.target.id == "ascending")
+      bookmarksSortPrefs.setCharPref("direction", "natural");
+    else if (aEvent.target.id == "descending")
+      bookmarksSortPrefs.setCharPref("direction", "ascending");
+    else
+      bookmarksSortPrefs.setCharPref("direction", "descending");
+    break;
+  default:
+    bookmarksSortPrefs.setCharPref("resource", resource);
+    var direction = bookmarksSortPrefs.getCharPref("direction");
+    if (direction == "descending")
+      bookmarksSortPrefs.setCharPref("direction", "natural");
+    break;
+  }
+
+  aEvent.preventCapture();
+}  
+
+var gConstructedColumnsMenuItems = false;
+function fillColumnsMenu(aEvent) 
+{
+  var bookmarksView = document.getElementById("bookmarks-view");
+  var columns = bookmarksView.columns;
+  var i;
+
+  if (!gConstructedColumnsMenuItems) {
+    for (i = 0; i < columns.length; ++i) {
+      var menuitem = document.createElement("menuitem");
+      menuitem.setAttribute("label", columns[i].label);
+      menuitem.setAttribute("resource", columns[i].resource);
+      menuitem.setAttribute("id", "columnMenuItem:" + columns[i].resource);
+      menuitem.setAttribute("type", "checkbox");
+      menuitem.setAttribute("checked", columns[i].hidden != "true");
+      aEvent.target.appendChild(menuitem);
+    }
+
+    gConstructedColumnsMenuItems = true;
+  }
+  else {
+    for (i = 0; i < columns.length; ++i) {
+      var element = document.getElementById("columnMenuItem:" + columns[i].resource);
+      if (element && columns[i].hidden != "true")
+        element.setAttribute("checked", "true");
+    }
+  }
+  
+  aEvent.preventBubble();
+}
+
+function onViewMenuColumnItemSelected(aEvent)
+{
+  var resource = aEvent.target.getAttribute("resource");
+  if (resource != "") {
+    var bookmarksView = document.getElementById("bookmarks-view");
+    bookmarksView.toggleColumnVisibility(resource);
+  }  
+
+  aEvent.preventBubble();
+}
+
+function searchBookmarks(aInput)
+{
+  var bookmarksView = document.getElementById("bookmarks-view");
+  if (!aInput) 
+    bookmarksView.tree.setAttribute("ref", "NC:BookmarksRoot");
+  else
+    bookmarksView.tree.setAttribute("ref",
+                               "find:datasource=rdf:bookmarks&match=http://home.netscape.com/NC-rdf#Name&method=contains&text=" + escape(aInput));
+ }
+

browser/components/bookmarks/content/bookmarks.xul

@@ -0,0 +1,237 @@
+<?xml version="1.0"?>  
+
+<!-- -*- Mode: HTML; indent-tabs-mode: nil; -*- -->
+<!--
+
+  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.org code.
+ 
+  The Initial Developer of the Original Code is Netscape
+  Communications Corporation.  Portions created by Netscape are
+  Copyright (C) 1998 Netscape Communications Corporation. All
+  Rights Reserved.
+ 
+  Contributor(s): 
+    Ben Goodger <ben@netscape.com>
+    Blake Ross <blakeross@telocity.com>
+    Dean Tessman <dean_tessman@hotmail.com>
+
+-->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarksWindow.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/content/bookmarks/bookmarks.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://browser/content/bookmarks/bookmarksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
+
+<!DOCTYPE window [
+<!ENTITY % utilDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd" >
+%utilDTD;
+<!ENTITY % bmDTD SYSTEM "chrome://browser/locale/bookmarks/bookmarks.dtd">
+%bmDTD;
+]>
+
+<window id="bookmark-window" windowtype="bookmarks:manager"
+        title="&bookmarksWindowTitle.label;" 
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:web="http://home.netscape.com/WEB-rdf#"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        width="630" height="400" screenX="20" screenY="20"
+        persist="width height screenX screenY sizemode"
+        onload="Startup();" onunload="Shutdown();">
+
+  <!-- The order of loading of these script files is IMPORTANT -->
+
+  <!-- Shared Libraries -->
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"></script>
+
+  <!-- XXX - This should SO become an XBL widget -->
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"></script>
+  
+  <!-- Shared Bookmarks Utility Library -->
+  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksOverlay.js"/>
+  <!-- Tree-based Bookmarks UI Utility Library -->
+  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksTree.js"/>
+  <!-- Bookmarks Window -->
+  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarks.js"/>
+
+  <!-- Bookmarks Window Drag & Drop -->
+  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksDD.js"/>
+
+  <popupset id="bookmarksPopupset"/>
+
+  <commands id="commands">
+    <commandset id="CommandUpdate_Bookmarks"
+                commandupdater="true"
+                events="focus,tree-select"
+                oncommandupdate="document.getElementById('bookmarks-view').onCommandUpdate();">
+    </commandset>                
+
+    <commandset id="tasksCommands"/> 
+
+    <!-- File Menu -->
+    <command id="cmd_close" oncommand="close()"/>
+    <!-- Edit Menu -->
+    <command id="cmd_undo"/>
+  </commands>
+
+  <stringbundleset id="stringbundleset"/>
+
+  <keyset id="tasksKeys">
+    <!-- File Menu -->
+    <key id="key_close"/>
+    <key id="key_quit"/>
+    <!-- Edit Menu -->
+    <key id="key_undo"/>
+
+    <!-- These keybindings do not have a command specified in the overlay, 
+         which is good, but we need to specify it ourselves here -->
+    <key id="key_cut" command="cmd_bm_cut"/>
+    <key id="key_copy" command="cmd_bm_copy"/>
+    <key id="key_paste" command="cmd_bm_paste"/>
+    <key id="key_selectAll" command="cmd_bm_selectAll"/>
+
+    <!-- We need to provide our own delete key binding because the key_delete
+         handler in platformGlobalOverlay.xul maps command to "cmd_delete" which
+         is NOT what we want! -->
+    <key id="key_bm_delete" keycode="VK_DELETE" command="cmd_bm_delete"/>
+
+    <key id="bm_key_find"  
+         key="&edit.find.keybinding;"  
+         command="cmd_bm_find" modifiers="accel"/>
+    <key id="bm_key_properties" 
+         key="&edit.properties.keybinding;"  
+         command="cmd_bm_properties" modifiers="accel"/>
+  </keyset>
+  
+  <toolbox id="bookmarks-toolbox">
+    <menubar id="main-menubar" grippytooltiptext="&menuBar.tooltip;">
+      <menu label="&fileMenu.label;" accesskey="&fileMenu.accesskey;">
+        <menupopup>
+          <menuitem label="&menuitem.newBookmark.label;" 
+                    accesskey="&command.newBookmark.accesskey;"
+                    observes="cmd_bm_newbookmark"/>
+          <menuitem label="&button.newFolder.label;" 
+                    accesskey="&command.newFolder.accesskey;"
+                    observes="cmd_bm_newfolder"/>
+          <menuitem label="&button.newSeparator.label;"
+                    accesskey="&command.newSeparator.accesskey;"
+                    observes="cmd_bm_newseparator"/>
+          <menuseparator/>
+          <menuitem id="menu_close"/>
+        </menupopup>
+      </menu>
+      <menu id="menu_Edit">
+        <menupopup>
+          <menuitem id="menu_undo" disabled="true"/>
+          <menuseparator/>
+          <menuitem id="menu_bm_cut"    
+                    label="&cutCmd.label;" accesskey="&cutCmd.accesskey;" 
+          key="key_cut" command="cmd_bm_cut"/>
+          <menuitem id="menu_bm_copy"
+                    label="&copyCmd.label;" accesskey="&copyCmd.accesskey;"
+                    key="key_copy" command="cmd_bm_copy"/>
+          <menuitem id="menu_bm_paste"  
+                    label="&pasteCmd.label;" accesskey="&pasteCmd.accesskey;"     
+                    key="key_paste" command="cmd_bm_paste"/>
+          <menuitem id="menu_bm_delete" 
+                    label="&deleteCmd.label;" accesskey="&deleteCmd.label;"     
+                    key="key_bm_delete" command="cmd_bm_delete"/>
+          <menuseparator/>
+          <menuitem id="menu_bm_selectAll" 
+                label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;"
+                    key="key_selectAll" command="cmd_bm_selectAll"/>
+          <menuseparator/>
+          <menuitem label="&command.fileBookmark.label;"
+                    accesskey="&command.fileBookmark.accesskey;"
+                    command="cmd_bm_fileBookmark"/>
+          <menuseparator/>
+            <menuitem observes="cmd_bm_properties" key="bm_key_properties" 
+                      label="&command.properties.label;" 
+                      accesskey="&command.properties.accesskey;" />
+        </menupopup>
+      </menu>
+  
+      <menu id="menu_View">
+        <menupopup onpopupshowing="fillViewMenu(event)"
+                   oncommand="onViewMenuSortItemSelected(event);">
+          <menuitem id="viewCommandToolbar" type="checkbox" class="menuitem-iconic"
+                    label="&menuitem.view.command.toolbar.label;"
+                    accesskey="&menuitem.view.command.toolbar.accesskey;"
+                    oncommand="goToggleToolbar('command-toolbar', 'viewCommandToolbar'); event.preventBubble();"
+                    persist="checked"/>
+          <menuseparator id="fill-after-this-node"/>
+          <menuitem id="natural" label="&menuitem.view.unsorted.label;"
+                    accesskey="&menuitem.view.unsorted.accesskey;"
+                    type="radio"
+                    resource="direction" name="sortSet"/>
+          <menuseparator id="fill-before-this-node"/>
+          <menuitem id="ascending" label="&menuitem.view.ascending.label;"
+                    accesskey="&menuitem.view.ascending.accesskey;"
+                    type="radio"
+                    resource="direction" name="sortDirectionSet"/>
+          <menuitem id="descending" label="&menuitem.view.descending.label;"
+                    accesskey="&menuitem.view.descending.accesskey;"
+                    type="radio"
+                    resource="direction" name="sortDirectionSet"/>
+          <menuseparator/>
+          <menu id="descending" label="&menuitem.view.show_columns.label;"
+                accesskey="&menuitem.view.show_columns.accesskey;">
+            <menupopup id="columnsPopup" onpopupshowing="fillColumnsMenu(event);"
+                       oncommand="onViewMenuColumnItemSelected(event);"/>
+          </menu>
+          <menuseparator/>
+          <menuitem label="&menuitem.newbookmarkfolder.label;" 
+                    command="cmd_bm_setnewbookmarkfolder"
+                    accesskey="&menuitem.newbookmarkfolder.accesskey;"/>
+          <menuitem label="&menuitem.newinternetsearchfolder.label;"
+                    command="cmd_bm_setnewsearchfolder"
+                    accesskey="&menuitem.newinternetsearchfolder.accesskey;"/>
+          <menuitem label="&menuitem.personaltoolbarfolder.label;"    
+                    command="cmd_bm_setpersonaltoolbarfolder"
+                    accesskey="&menuitem.personaltoolbarfolder.accesskey;"/>
+        </menupopup>
+      </menu>
+      <menu id="menu_Help"/>
+    </menubar>
+
+    <toolbar id="command-toolbar" tbalign="stretch" grippytooltiptext="&bookmarkToolbar.tooltip;">
+      <toolbarbutton id="newfolder" label="&button.newFolder.label;" 
+                     command="cmd_bm_newfolder"/>
+      <toolbarbutton id="newseparator" label="&button.newSeparator.label;" 
+                     command="cmd_bm_newseparator"/>
+      <toolbarseparator/>
+      <toolbarbutton id="fileBookmark" label="&command.fileBookmark.label;"
+                     command="cmd_bm_fileBookmark"/>
+      <toolbarseparator/>
+      <toolbarbutton id="properties" label="&command.properties.label;"
+                     command="cmd_bm_properties"/>
+      <toolbarbutton id="rename" label="&command.rename.label;"
+                     command="cmd_bm_rename"/>
+      <toolbarbutton id="delete" label="&command.delete.label;"
+                     command="cmd_bm_delete"/>
+    </toolbar>
+    <toolbar align="center" pack="center">
+      <label value="&find.label;" accesskey="&find.accesskey;" control="search-box"/>
+      <textbox id="search-box" flex="1"
+               type="timed" timeout="500"
+               callback="searchBookmarks(gSearchBox.value);"/>
+    </toolbar>
+  </toolbox>
+  
+  <bookmarks-tree id="bookmarks-view" flex="1"/>
+
+</window>
+

browser/components/bookmarks/content/bookmarksDD-temp.js

@@ -0,0 +1,508 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+  This is the old bookmarks code, included here for the sake of the bookmarks sidebar panel,
+  which will be fixed to use my new code in .9. In the mean time, this file provides a 
+  life line to various functionality. 
+ */ 
+ 
+ 
+var NC_NS  = "http://home.netscape.com/NC-rdf#";
+var RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+
+
+
+function TopLevelDrag ( event )
+{
+  return(true);
+}
+
+
+function BeginDragTree ( event )
+{
+  //XXX we rely on a capturer to already have determined which item the mouse was over
+  //XXX and have set an attribute.
+    
+  // if the click is on the tree proper, ignore it. We only care about clicks on items.
+
+  var tree = document.getElementById("bookmarksTree");
+  if ( event.target == tree || event.target.localName == "treechildren" )
+    return(true);         // continue propagating the event
+    
+  var childWithDatabase = tree;
+  if ( ! childWithDatabase )
+    return(false);
+    
+  var dragStarted = false;
+
+  var trans = 
+    Components.classes["@mozilla.org/widget/transferable;1"].createInstance(Components.interfaces.nsITransferable);
+  if ( !trans ) return(false);
+
+  var genData = 
+    Components.classes["@mozilla.org/supports-string;1"].createInstance(Components.interfaces.nsISupportsString);
+  if (!genData) return(false);
+
+  var genDataURL = 
+    Components.classes["@mozilla.org/supports-string;1"].createInstance(Components.interfaces.nsISupportsString);
+  if (!genDataURL) return(false);
+
+  trans.addDataFlavor("text/unicode");
+  trans.addDataFlavor("moz/rdfitem");
+        
+  // ref/id (url) is on the <treeitem> which is two levels above the <treecell> which is
+  // the target of the event.
+  var id = event.target.parentNode.parentNode.getAttribute("ref");
+  if (!id || id=="")
+  {
+	id = event.target.parentNode.parentNode.getAttribute("id");
+  }
+
+  var parentID = event.target.parentNode.parentNode.parentNode.parentNode.getAttribute("ref");
+  if (!parentID || parentID == "")
+  {
+	parentID = event.target.parentNode.parentNode.parentNode.parentNode.getAttribute("id");
+  }
+
+  var trueID = id;
+  if (parentID != null)
+  {
+  	trueID += "\n" + parentID;
+  }
+  genData.data = trueID;
+  genDataURL.data = id;
+
+  var database = childWithDatabase.database;
+  var rdf = 
+    Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+  if ((!rdf) || (!database))  { dump("CAN'T GET DATABASE\n"); return(false); }
+
+  // make sure its a bookmark, bookmark separator, or bookmark folder
+  var src = rdf.GetResource(id, true);
+  var prop = rdf.GetResource(RDF_NS + "type", true);
+  var target = database.GetTarget(src, prop, true);
+
+  if (target) target = target.QueryInterface(Components.interfaces.nsIRDFResource);
+  if (target) target = target.Value;
+  if ((!target) || (target == "")) {dump("BAD\n"); return(false);}
+
+  if ((target != NC_NS + "BookmarkSeparator") &&
+    (target != NC_NS + "Bookmark") &&
+    (target != NC_NS + "Folder")) return(false);
+
+  trans.setTransferData ( "moz/rdfitem", genData, genData.data.length * 2);  // double byte data
+  trans.setTransferData ( "text/unicode", genDataURL, genDataURL.data.length * 2);  // double byte data
+
+  var transArray = 
+    Components.classes["@mozilla.org/supports-array;1"].createInstance(Components.interfaces.nsISupportsArray);
+  if ( !transArray )  return(false);
+
+  // put it into the transferable as an |nsISupports|
+  var genTrans = trans.QueryInterface(Components.interfaces.nsISupports);
+  transArray.AppendElement(genTrans);
+  
+  var dragService = 
+    Components.classes["@mozilla.org/widget/dragservice;1"].getService(Components.interfaces.nsIDragService);
+  if ( !dragService ) return(false);
+
+  var nsIDragService = Components.interfaces.nsIDragService;
+  dragService.invokeDragSession ( event.target, transArray, null, nsIDragService.DRAGDROP_ACTION_COPY + 
+                                     nsIDragService.DRAGDROP_ACTION_MOVE );
+  dragStarted = true;
+
+  return(!dragStarted);
+}
+
+
+
+function DragOverTree ( event )
+{
+  var validFlavor = false;
+  var dragSession = null;
+  var retVal = true;
+
+  var dragService = 
+    Components.classes["@mozilla.org/widget/dragservice;1"].getService(Components.interfaces.nsIDragService);
+  if ( !dragService ) return(false);
+
+  dragSession = dragService.getCurrentSession();
+  if ( !dragSession ) return(false);
+
+  if ( dragSession.isDataFlavorSupported("moz/rdfitem") ) validFlavor = true;
+  else if ( dragSession.isDataFlavorSupported("text/unicode") ) validFlavor = true;
+  //XXX other flavors here...
+
+  // touch the attribute on the rowgroup to trigger the repaint with the drop feedback.
+  if ( validFlavor )
+  {
+    var treeRoot = document.getElementById("bookmarksTree");
+    if (!treeRoot)  return(false);
+    var treeDatabase = treeRoot.database;
+    if (!treeDatabase)  return(false);
+
+    //XXX this is really slow and likes to refresh N times per second.
+    var rowGroup = event.target.parentNode.parentNode;
+    var sortActive = treeRoot.getAttribute("sortActive");
+    if (sortActive == "true")
+      rowGroup.setAttribute ( "dd-triggerrepaintsorted", 0 );
+    else
+      rowGroup.setAttribute ( "dd-triggerrepaint", 0 );
+
+    dragSession.canDrop = true;
+    // necessary??
+    retVal = false;
+  }
+  return(retVal);
+}
+
+
+
+function DropOnTree ( event )
+{
+  var treeRoot = document.getElementById("bookmarksTree");
+  if (!treeRoot)  return(false);
+  var treeDatabase = treeRoot.database;
+  if (!treeDatabase)  return(false);
+
+  // for beta1, don't allow D&D if sorting is active
+  var sortActive = treeRoot.getAttribute("sortActive");
+  if (sortActive == "true")
+  {
+  	dump("Sorry, drag&drop is currently disabled when sorting is active.\n");
+  	return(false);
+  }
+
+  var RDF = 
+    Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+  if (!RDF) return(false);
+  var RDFC =
+    Components.classes["@mozilla.org/rdf/container;1"].getService(Components.interfaces.nsIRDFContainer);
+  if (!RDFC)  return(false);
+
+  var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
+  if (!Bookmarks) return(false);
+
+  // target is the <treecell>, and "ref/id" is on the <treeitem> two levels above
+  var treeItem = event.target.parentNode.parentNode;
+  if (!treeItem)  return(false);
+
+  // get drop hint attributes
+  var dropBefore = treeItem.getAttribute("dd-droplocation");
+  var dropOn = treeItem.getAttribute("dd-dropon");
+
+  // calculate drop action
+  var dropAction;
+  if (dropBefore == "true") dropAction = "before";
+  else if (dropOn == "true")  dropAction = "on";
+  else        dropAction = "after";
+
+  // calculate parent container node
+  var containerItem = treeItem;
+  if (dropAction != "on")
+  {
+    containerItem = treeItem.parentNode.parentNode;
+  }
+
+	// magical fix for bug # 33546: handle dropping after open container
+	if (treeItem.getAttribute("container") == "true")
+	{
+		if (treeItem.getAttribute("open") == "true")
+		{
+			if (dropAction == "after")
+			{
+				dropAction = "before";
+				containerItem = treeItem;
+
+				// find <treechildren>, drop before first child
+				var treeChildren = treeItem;
+				treeItem = null;
+				for (var x = 0; x < treeChildren.childNodes.length; x++)
+				{
+					if (treeChildren.childNodes[x].tagName == "treechildren")
+					{
+						treeItem = treeChildren.childNodes[x].childNodes[0];
+						break;
+					}
+				}
+
+				if (!treeItem)
+				{
+					dropAction = "on";
+					containerItem = treeItem.parentNode.parentNode;
+				}
+			}
+		}
+	}
+
+  var targetID = getAbsoluteID("bookmarksTree", treeItem);
+  if (!targetID)  return(false);
+  var targetNode = RDF.GetResource(targetID, true);
+  if (!targetNode)  return(false);
+
+  var containerID = getAbsoluteID("bookmarksTree", containerItem);
+  if (!containerID) return(false);
+  var containerNode = RDF.GetResource(containerID);
+  if (!containerNode) return(false);
+
+  var dragService = 
+    Components.classes["@mozilla.org/widget/dragservice;1"].getService(Components.interfaces.nsIDragService);
+  if ( !dragService ) return(false);
+  
+  var dragSession = dragService.getCurrentSession();
+  if ( !dragSession ) return(false);
+
+  var trans = 
+    Components.classes["@mozilla.org/widget/transferable;1"].createInstance(Components.interfaces.nsITransferable);
+  if ( !trans )   return(false);
+  trans.addDataFlavor("moz/rdfitem");
+  trans.addDataFlavor("text/x-moz-url");
+  trans.addDataFlavor("text/unicode");
+
+    var typeRes = RDF.GetResource(RDF_NS + "type");
+    if (!typeRes) return false;
+    var bmTypeRes = RDF.GetResource(NC_NS + "Bookmark");
+    if (!bmTypeRes) return false;
+
+  var dirty = false;
+
+  for ( var i = 0; i < dragSession.numDropItems; ++i )
+  {
+    dragSession.getData ( trans, i );
+    var dataObj = new Object();
+    var bestFlavor = new Object();
+    var len = new Object();
+    trans.getAnyTransferData ( bestFlavor, dataObj, len );
+    if ( dataObj )  dataObj = dataObj.value.QueryInterface(Components.interfaces.nsISupportsString);
+    if ( !dataObj ) continue;
+
+    var sourceID = null;
+    var parentID = null;
+    var checkNameHack = false;
+    var name=null;
+
+    if (bestFlavor.value == "moz/rdfitem")
+    {
+	    // pull the URL out of the data object
+	    var data = dataObj.data.substring(0, len.value / 2);
+
+        // moz/rdfitem allows parent ID specified on next line; check for it
+	    var cr = data.indexOf("\n");
+	    if (cr >= 0)
+	    {
+	    	sourceID = data.substr(0, cr);
+	    	parentID = data.substr(cr+1);
+	    }
+	    else
+	    {
+	        sourceID = data;
+	    }
+    }
+    else if (bestFlavor.value == "text/x-moz-url")
+    {
+	    // pull the URL out of the data object
+	    data = dataObj.data.substring(0, len.value / 2);
+	    sourceID = data;
+
+    	// we may need to synthesize a name (just use the URL)
+    	checkNameHack = true;
+    }
+    else if (bestFlavor.value == "text/unicode")
+    {
+    	sourceID = dataObj.data;
+
+    	// we may need to synthesize a name (just use the URL)
+    	checkNameHack = true;
+    }
+    else
+    {
+        // unknown flavor, skip
+        continue;
+    }
+
+    // pull the (optional) name out of the URL
+    var separator = sourceID.indexOf("\n");
+    if (separator >= 0)
+    {
+        name = sourceID.substr(separator+1);
+        sourceID = sourceID.substr(0, separator);
+    }
+
+    var sourceNode = RDF.GetResource(sourceID, true);
+    if (!sourceNode)  continue;
+
+    var parentNode = null;
+    if (parentID != null)
+    {
+    	parentNode = RDF.GetResource(parentID, true);
+    }
+    
+    // Prevent dropping of a node before, after, or on itself
+    if (sourceNode == targetNode) continue;
+    // Prevent dropping of a node onto its parent container
+    if ((dropAction == "on") && (containerID) && (containerID == parentID))	continue;
+
+    RDFC.Init(Bookmarks, containerNode);
+
+    // make sure appropriate bookmark type is set
+    var bmTypeNode = Bookmarks.GetTarget( sourceNode, typeRes, true );
+    if (!bmTypeNode)
+    {
+        // set default bookmark type
+        Bookmarks.Assert(sourceNode, typeRes, bmTypeRes, true);
+    }
+
+    if ((dropAction == "before") || (dropAction == "after"))
+    {
+      // drop before or after
+      var nodeIndex;
+
+      nodeIndex = RDFC.IndexOf(sourceNode);
+
+      if (nodeIndex >= 1)
+      {
+        // moving a node around inside of the container
+        // so remove, then re-add the node
+        RDFC.RemoveElementAt(nodeIndex, true, sourceNode);
+      }
+      
+      nodeIndex = RDFC.IndexOf(targetNode);
+
+      if (nodeIndex < 1)  return(false);
+      if (dropAction == "after")  ++nodeIndex;
+
+      RDFC.InsertElementAt(sourceNode, nodeIndex, true);
+
+	// select the newly added node
+	if (parentID)
+	{
+	      selectDroppedItems(treeRoot, containerID, sourceID);
+	}	     
+
+      dirty = true;
+    }
+    else
+    {
+      // drop on
+      RDFC.AppendElement(sourceNode);
+
+	// select the newly added node
+	if (parentID)
+	{
+	      selectDroppedItems(treeRoot, containerID, sourceID);
+	}	     
+
+      dirty = true;
+    }
+
+    if ((checkNameHack == true) || (name != null))
+    {
+    	var srcArc = RDF.GetResource(sourceID, true);
+    	var propArc = RDF.GetResource(NC_NS + "Name", true);
+    	if (srcArc && propArc && Bookmarks)
+    	{
+    		var targetArc = Bookmarks.GetTarget(srcArc, propArc, true);
+    		if (!targetArc)
+    		{
+    		    // if no name, fallback to using the URL as the name
+    			var defaultNameArc = RDF.GetLiteral((name != null && name != "") ? name : sourceID);
+    			if (defaultNameArc)
+    			{
+    				Bookmarks.Assert(srcArc, propArc, defaultNameArc, true); 
+    			}
+    		}
+    	}
+    }
+  }
+
+	// should we move the node? (i.e. take it out of the source container?)
+	if ((parentNode != null) && (containerNode != parentNode))
+	{
+	    try
+	    {
+    		RDFC.Init(Bookmarks, parentNode);
+    		nodeIndex = RDFC.IndexOf(sourceNode);
+
+    		if (nodeIndex >= 1)
+    		{
+    			RDFC.RemoveElementAt(nodeIndex, true, sourceNode);
+    		}
+        }
+        catch(ex)
+        {
+        }
+	}
+
+  if (dirty == true)
+  {
+    var remote = Bookmarks.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+    if (remote)
+    {
+      remote.Flush();
+    }
+  }
+
+  return(false);
+}
+
+
+
+function selectDroppedItems(treeRoot, containerID, targetID)
+{
+	var select_list = treeRoot.getElementsByAttribute("id", targetID);
+	for (var x=0; x<select_list.length; x++)
+	{
+		var node = select_list[x];
+		if (!node)	continue;
+
+		var parent = node.parentNode.parentNode;
+		if (!parent)	continue;
+
+		var id = parent.getAttribute("ref");
+		if (!id || id=="")
+		{
+			id = parent.getAttribute("id");
+		}
+		if (!id || id=="")	continue;
+
+		if (id == containerID)
+		{
+			treeRoot.selectItem(node);
+			break;
+		}
+	}
+}

browser/components/bookmarks/content/bookmarksDD.js

@@ -0,0 +1,397 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author, v2.0)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var NC_NS  = "http://home.netscape.com/NC-rdf#";
+var RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+
+var gSpringLoadTracker = {
+  timeout: 0,
+  element: null,
+  
+  open: function (aRDFNode) 
+  {
+    if (this.element)
+      this.element.setAttribute("open", "true");
+    clearTimeout(this.timeout);
+  }
+};
+
+var bookmarksDNDObserver = {
+  _RDF: null,
+  get RDF ()
+  {
+    if (!this._RDF) {
+      const kRDFContractID = "@mozilla.org/rdf/rdf-service;1";
+      const kRDFIID = Components.interfaces.nsIRDFService;
+      this._RDF = Components.classes[kRDFContractID].getService(kRDFIID);
+    }
+    return this._RDF;
+  },
+
+  // XXX I belong somewhere shared. 
+  getResource: function(aString)
+  {
+    return this.RDF.GetResource(aString, true);
+  },
+  
+  getTarget: function(aDS, aSourceID, aPropertyID)
+  {
+    var source = this.getResource(aSourceID);
+    var property = this.getResource(aPropertyID);
+    return aDS.GetTarget(source, property, true);
+  },
+  
+  onDragStart: function (aEvent, aXferData, aDragAction)
+  {
+    var bookmarksTree = document.getElementById("bookmarksTree");
+    if (aEvent.target == bookmarksTree || aEvent.target.localName == "treechildren" || 
+        aEvent.target.localName == "splitter" || aEvent.target.localName == "menu")
+      throw Components.results.NS_OK; // not a draggable item.
+    if (aEvent.target.parentNode && aEvent.target.parentNode.parentNode &&
+        aEvent.target.parentNode.parentNode.localName == "treehead")
+      throw Components.results.NS_OK; // don't drag treehead cells.
+    if (bookmarksTree.getAttribute("sortActive") == "true")
+      throw Components.results.NS_OK; 
+          
+    var selItems = null;
+    if (bookmarksTree.selectedItems.length <= 0)
+      selItems = [aEvent.target.parentNode.parentNode];
+    else 
+      selItems = bookmarksTree.selectedItems;
+    aXferData.data = new TransferDataSet();
+    for (var i = 0; i < selItems.length; ++i) {
+      var currItem = selItems[i];
+      var currURI = NODE_ID(currItem);
+    
+      var parentItem = currItem.parentNode.parentNode;
+      var parentURI = NODE_ID(parentItem);
+    
+      var type = this.getTarget(bookmarksTree.database, currURI, RDF_NS + "type");
+      type = type.QueryInterface(Components.interfaces.nsIRDFResource).Value;
+      if (!type || (type != (NC_NS + "BookmarkSeparator") && 
+                    type != (NC_NS + "Bookmark") && 
+                    type != (NC_NS + "Folder"))) 
+        throw Components.results.NS_OK;
+      var name = this.getTarget(bookmarksTree.database, currURI, NC_NS + "Name");        
+      var data = new TransferData();
+      if (name) {
+        name = name.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+        data.addDataForFlavour("text/x-moz-url", currURI + "\n" + name);
+      }
+      else {
+        data.addDataForFlavour("text/x-moz-url", currURI);
+      }
+      data.addDataForFlavour("moz/rdfitem", currURI + "\n" + parentURI);
+
+      data.addDataForFlavour("text/unicode", currURI);
+      aXferData.data.push(data);
+    }
+
+    if (aEvent.ctrlKey) {
+      const kDSIID = Components.interfaces.nsIDragService;
+      aDragAction.action = kDSIID.DRAGDROP_ACTION_COPY + kDSIID.DRAGDROP_ACTION_LINK;
+    }
+  },
+  
+  onDragOver: function (aEvent, aFlavour, aDragSession)
+  {
+    var bookmarksTree = document.getElementById("bookmarksTree");
+    var rowGroup = aEvent.target.parentNode.parentNode;
+    if (rowGroup)
+      rowGroup.setAttribute("dd-triggerrepaint" + 
+                            (bookmarksTree.getAttribute("sortActive") == "true" ? "sorted" : ""), 0);
+    
+    var rdfNode = gBookmarksShell.findRDFNode(aEvent.target, true);
+    var rdfParent = rdfNode.parentNode.parentNode;
+    var isContainer = false;
+    if (rdfParent && rdfParent.getAttribute("container") == "true") {
+      var rDragOverContainer = this.RDF.GetResource(NODE_ID(rdfParent));
+
+      const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+      const kRDFCUtilsContractID = "@mozilla.org/rdf/container-utils;1";
+      const kRDFCUtilsIID = Components.interfaces.nsIRDFContainerUtils;
+      const kRDFCUtils = Components.classes[kRDFCUtilsContractID].getService(kRDFCUtilsIID);
+      isContainer = kRDFCUtils.IsContainer(kBMDS, rDragOverContainer);
+    }     
+    
+    if (!isContainer || rowGroup.id == "headRow") {
+      // Not a container, or dropping onto something that isn't designed to take drops 
+      // (e.g. the tree header) 
+      aDragSession.canDrop = false;
+      return;
+    }        
+    
+    // Springloaded folders.
+    /* XXX - not yet. 
+    if (rdfNode && rdfNode.getAttribute("container") == "true" &&
+        rdfNode.getAttribute("open") != "true") {
+      if (!gSpringLoadTracker.element || gSpringLoadTracker.element.id != rdfNode.id) {
+        // XXX - this is not good enough. We need to keep track of nesting and close up
+        // folders after the user has dragged out of them otherwise we end up with 
+        // everything open and a big mess!
+        if (gSpringLoadTracker.timeout)
+          clearTimeout(gSpringLoadTracker.timeout);
+        gSpringLoadTracker.element = rdfNode;
+        gSpringLoadTracker.timeout = setTimeout("gSpringLoadTracker.open()", 100);
+      }
+    }
+    */
+  },  
+  
+  _flavourSet: null,
+  getSupportedFlavours: function ()
+  {
+    if (!this._flavourSet) {
+      this._flavourSet = new FlavourSet();
+      this._flavourSet.appendFlavour("moz/rdfitem");
+      this._flavourSet.appendFlavour("text/x-moz-url");
+      this._flavourSet.appendFlavour("text/unicode");
+    }
+    return this._flavourSet;
+  },
+  
+  canHandleMultipleItems: true,
+  
+  onDrop: function (aEvent, aXferData, aDragSession)
+  {
+    var bookmarksTree = document.getElementById("bookmarksTree");
+    // XXX lame
+    if (bookmarksTree.getAttribute("sortActive") == "true") return;
+
+    const kRDFCContractID = "@mozilla.org/rdf/container;1";
+    const kRDFIID = Components.interfaces.nsIRDFContainer;
+    var RDFC = Components.classes[kRDFCContractID].getService(kRDFIID);
+    
+    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    
+    var dropItem = aEvent.target.parentNode.parentNode;
+    if (aEvent.target.localName == "treechildren") 
+      dropItem = aEvent.target.parentNode; // handle drop on blank space. 
+
+    // In the default view, the root node is the NC root, and we don't want to append
+    // to that. Adjust accordingly...
+    if (NODE_ID(dropItem) == "NC:NavCenter")
+      dropItem = document.getElementById("treechildren-bookmarks").firstChild;
+    
+    // Don't allow drops on the header row & prevent catastrophe
+    if (dropItem.id == "headRow" || !dropItem) return;
+      
+    // XXX we could probably compute this ourselves, but let the tree do this 
+    //     automagically for now.
+    var dropBefore = dropItem.getAttribute("dd-droplocation");
+    var dropOn = dropItem.getAttribute("dd-dropon");
+
+    var dropAction = dropBefore == "true" ? "before" : dropOn == "true" ? "on" : "after";
+    if (aEvent.target.localName == "treechildren")  
+      dropAction = "on"; // handle drop on blank space. 
+    var containerItem = dropAction == "on" ? dropItem : dropItem.parentNode.parentNode;
+
+  	// XXX magical fix for bug # 33546: handle dropping after open container
+    if (dropItem.getAttribute("container") && dropItem.getAttribute("open") &&
+        dropAction == "after") {    
+      dropAction = "before";
+      containerItem = dropItem;
+
+      dropItem = null;
+      for (var i = 0; i < containerItem.childNodes.length; ++i) {
+        if (containerItem.childNodes[i].localName == "treechildren") {
+          dropItem = containerItem.childNodes[i].firstChild;
+          break;
+        }
+      }
+      if (!dropItem) {
+        dropAction = "on";
+        dropItem = containerItem.parentNode.parentNode;
+      }
+    }
+    
+    var rTarget = this.getResource(NODE_ID(dropItem));
+    var rContainer = this.getResource(NODE_ID(containerItem));    
+
+    const kRDFCUtilsContractID = "@mozilla.org/rdf/container-utils;1";
+    const kRDFCUtilsIID = Components.interfaces.nsIRDFContainerUtils;
+    const kRDFCUtils = Components.classes[kRDFCUtilsContractID].getService(kRDFCUtilsIID);
+    var isContainer = kRDFCUtils.IsContainer(kBMDS, rContainer);
+
+    // XXX
+    var rType = this.getResource(RDF_NS + "type");
+    var rBookmark = this.getResource(NC_NS + "Bookmark");
+    
+    var dirty = false;
+    var additiveFlag = false;
+    var numObjects = aXferData.dataList.length;
+    /*
+    if (numObjects > 1) {
+      var bo = bookmarksTree.boxObject.QueryInterface(Components.interfaces.nsITreeBoxObject);
+      bo.beginBatch();
+    }
+    */
+
+    var sourceID = [], parentID = [], nameRequired = [], name = [];
+    var flavourData;
+    for (i = 0; i < numObjects; ++i) {
+      flavourData = aXferData.dataList[i].first;
+      nameRequired[i] = false;
+      name[i] = null;
+      var data = flavourData.data;
+      switch (flavourData.flavour.contentType) {
+      case "moz/rdfitem":
+        var ix = data.indexOf("\n");
+        sourceID[i] = ix >= 0 ? (parentID[i] = data.substr(ix+1), data.substr(0, ix)) : data;
+        break;
+      case "text/x-moz-url":
+        ix = data.indexOf("\n");
+        sourceID[i] = ix >= 0 ? (name[i] = data.substr(ix+1), data.substr(0, ix)) : data;
+        break;
+      case "text/unicode":
+        sourceID[i] = data;
+        nameRequired[i] = true;
+        break;
+      default: 
+        continue;
+      }
+      
+      var rSource = this.getResource(sourceID[i]);
+      var rParent = parentID[i] ? this.getResource(parentID[i]) : null;
+
+      // Prevent dropping node on itself, before or after itself, on its parent 
+      // container, or a weird situation when an open container is dropped into
+      // itself (which results in data loss!).
+      // Also prevent dropping into a folder that isn't actually a container 
+      // (and is thus probably a pseudo-container from an aggregated datasource,
+      //  see bug 68656 fir details).
+      if (rSource == rTarget || (dropAction == "on" && rContainer == rParent) ||
+          rContainer == rSource || !isContainer)
+        return;
+
+      // Prevent dropping node into one of its own subfolders
+      var dropItem2 = dropItem;
+      do {
+        var targetAncestor = NODE_ID(dropItem2);
+        dropItem2 = dropItem2.parentNode;
+      } while (targetAncestor != "NC:BookmarksRoot" && targetAncestor != sourceID[i]);
+      if (targetAncestor == sourceID[i]) {
+        return;
+      }
+    }
+
+    for (i = 0; i < numObjects; ++i) {
+      flavourData = aXferData.dataList[i].first;
+      rSource = this.getResource(sourceID[i]);
+      rParent = parentID[i] ? this.getResource(parentID[i]) : null;
+
+      // XXX if any of the following fails, the nodes are gone for good!
+      const kDSIID = Components.interfaces.nsIDragService;
+      const kCopyAction = kDSIID.DRAGDROP_ACTION_COPY + kDSIID.DRAGDROP_ACTION_LINK;
+      if (rParent) {
+        if (!(aDragSession.dragAction & kCopyAction)) {
+          try {
+            RDFC.Init(kBMDS, rParent);
+            ix = RDFC.IndexOf(rSource);
+            if (ix >= 1) 
+              RDFC.RemoveElementAt(ix, true);
+          }
+          catch (ex) { }
+        }
+      }
+
+      RDFC.Init(kBMDS, rContainer);
+      
+      // If this item already exists in this container, don't paste, as 
+      // this will result in the creation of multiple copies in the datasource
+      // but will not result in an update of the UI. (In Short: we don't
+      // handle multiple bookmarks well)
+      ix = RDFC.IndexOf(rSource);
+      if (ix != -1)
+        continue;
+      
+      var bmType = this.getTarget(bookmarksTree.database, sourceID[i], RDF_NS + "type");
+      if (!bmType) 
+        kBMDS.Assert(rSource, rType, rBookmark, true);
+      if (bmType == NC_NS + "Folder") {
+        // If we're going to copy a folder type, we need to clone the folder 
+        // rather than just asserting the new node as a child of the drop folder.
+        if (aDragSession.dragAction & kCopyAction)
+          rSource = BookmarksUtils.cloneFolder(rSource, rContainer, rTarget);
+      }
+      
+      if (dropAction == "before" || dropAction == "after") {
+        var dropIx = RDFC.IndexOf(rTarget);
+        RDFC.InsertElementAt(rSource, dropAction == "after" ? ++dropIx : dropIx, true);
+      }
+      else
+        RDFC.AppendElement(rSource); // drop on
+
+      dirty = true;
+
+      if (rParent) {
+        gBookmarksShell.selectFolderItem(rContainer.Value, sourceID[i], additiveFlag);
+        if (!additiveFlag) additiveFlag = true;
+      }
+
+      // If a name is supplied, we want to assert this information into the 
+      // graph. E.g. user drags an internet shortcut to the app, we want to 
+      // preserve not only the URL but the name of the shortcut. The other case
+      // where we need to assert a name is when the node does not already exist
+      // in the graph, in this case we'll just use the URL as the name.
+      if (name[i] || nameRequired[i]) {
+        var currentName = this.getTarget(bookmarksTree.database, sourceID[i], NC_NS + "Name");
+        if (!currentName) {
+          var rDefaultName = this.RDF.GetLiteral(name[i] || sourceID[i]);
+          if (rDefaultName) {
+            var rName = this.RDF.GetResource(NC_NS + "Name");
+            kBMDS.Assert(rSource, rName, rDefaultName, true);
+          }
+        }
+      }
+    }
+
+    /*
+    if (numObjects > 1) {
+      var bo = bookmarksTree.boxObject.QueryInterface(Components.interfaces.nsITreeBoxObject);
+      bo.endBatch();
+    }
+    */
+    
+    if (dirty) {
+      var remoteDS = kBMDS.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+      remoteDS.Flush();
+    }    
+  }
+}
+

browser/components/bookmarks/content/bookmarksOverlay.xul

@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+
+<!-- -*- Mode: HTML; indent-tabs-mode: nil; -*- -->
+<!--
+
+  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.org code.
+ 
+  The Initial Developer of the Original Code is Netscape
+  Communications Corporation.  Portions created by Netscape are
+  Copyright (C) 1998 Netscape Communications Corporation. All
+  Rights Reserved.
+ 
+  Contributor(s): 
+    Ben Goodger <ben@netscape.com> (Original Author) 
+-->
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarksOverlay.dtd">
+
+<overlay id="bookmarksOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <stringbundleset id="stringbundleset">
+    <stringbundle id="bundle_bookmarks" src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
+    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+  </stringbundleset>
+         
+  <popupset id="bookmarksPopupset">
+    <popup id="bmContext" 
+           onpopupshowing="gBookmarksShell.createContextMenu(event);"/>
+  </popupset>
+
+  <commands id="commands">
+    <commandset id="bookmarksItems">
+      <command id="cmd_bm_open"                      oncommand="goDoCommand('cmd_bm_open');"/>
+      <command id="cmd_bm_openfolder"                oncommand="goDoCommand('cmd_bm_openfolder');"/>
+      <command id="cmd_bm_newfolder"                 oncommand="goDoCommand('cmd_bm_newfolder');"/>
+      <command id="cmd_bm_newbookmark"               oncommand="goDoCommand('cmd_bm_newbookmark');"/>
+      <command id="cmd_bm_newseparator"              oncommand="goDoCommand('cmd_bm_newseparator');"/>
+      <command id="cmd_bm_find"                      oncommand="goDoCommand('cmd_bm_find');"/>
+      <command id="cmd_bm_setnewbookmarkfolder"      oncommand="goDoCommand('cmd_bm_setnewbookmarkfolder');"/>
+      <command id="cmd_bm_setpersonaltoolbarfolder"  oncommand="goDoCommand('cmd_bm_setpersonaltoolbarfolder');"/>
+      <command id="cmd_bm_setnewsearchfolder"        oncommand="goDoCommand('cmd_bm_setnewsearchfolder');"/>
+      <command id="cmd_bm_properties"                oncommand="goDoCommand('cmd_bm_properties');"/>
+      <command id="cmd_bm_rename"                    oncommand="goDoCommand('cmd_bm_rename');"/>
+      <command id="cmd_bm_openinnewwindow"           oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
+      <command id="cmd_bm_import"                    oncommand="goDoCommand('cmd_bm_import');"/>
+      <command id="cmd_bm_export"                    oncommand="goDoCommand('cmd_bm_export');"/>
+      <command id="cmd_bm_fileBookmark"           oncommand="goDoCommand('cmd_bm_fileBookmark');"/>
+
+      <command id="cmd_bm_cut"                    oncommand="goDoCommand('cmd_bm_cut');"/>
+      <command id="cmd_bm_copy"                   oncommand="goDoCommand('cmd_bm_copy');"/>
+      <command id="cmd_bm_paste"                  oncommand="goDoCommand('cmd_bm_paste');"/>
+      <command id="cmd_bm_delete"                 oncommand="goDoCommand('cmd_bm_delete');"/>
+      <command id="cmd_bm_selectAll"              oncommand="goDoCommand('cmd_bm_selectAll');"/>
+    </commandset>
+    <commandset id="selectEditMenuItems"/>
+    <commandset id="globalEditMenuItems"/>
+  </commands>
+
+</overlay>

browser/components/bookmarks/content/bookmarksPanel.js

@@ -0,0 +1,64 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Get the two bookmarks utility libraries running, attach controllers, focus
+// tree widget, etc. 
+function Startup() 
+{
+  var bookmarksView = document.getElementById("bookmarks-view");  
+  bookmarksView.treeBoxObject.selection.select(0);
+}
+
+function manageBookmarks() {
+  openDialog("chrome://communicator/content/bookmarks/bookmarks.xul", "", "chrome,dialog=no,resizable=yes");
+}
+
+function addBookmark() {
+  var contentArea = top.document.getElementById('content');                   
+  if (contentArea) {
+    const browsers = contentArea.browsers;
+    if (browsers.length > 1)
+      BookmarksUtils.addBookmarkForTabBrowser(contentArea);
+    else
+      BookmarksUtils.addBookmarkForBrowser(contentArea.webNavigation, true);    
+  }
+  else
+    BookmarksUtils.addBookmark(null, null, undefined, true);
+}

browser/components/bookmarks/content/bookmarksTree.js

@@ -0,0 +1,759 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var gBookmarksShell = null;
+
+///////////////////////////////////////////////////////////////////////////////
+// Tracks the selected item, the cell last clicked on, and the number of clicks
+// given to it. Used to activate inline edit mode.
+var gSelectionTracker = { currentItem: null, currentCell: null, clickCount: 0 };
+
+///////////////////////////////////////////////////////////////////////////////
+// Class which defines methods for a bookmarks UI implementation based around
+// a treeview. Subclasses BookmarksBase in bookmarksOverlay.js. Some methods
+// are required by the base class, others are for event handling. Window specific
+// glue code should go into the BookmarksWindow class in bookmarks.js
+function BookmarksTree (aID)
+{
+  this.id = aID;
+}
+
+BookmarksTree.prototype = {
+  __proto__: BookmarksUIElement.prototype,
+
+  // XXX - change this to .element and move into base. 
+  get tree ()
+  {
+    return document.getElementById(this.id);
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // This method constructs a menuitem for a context menu for the given command.
+  // This is implemented by the client so that it can intercept menuitem naming
+  // as appropriate.
+  createMenuItem: function (aDisplayName, aCommandName, aItemNode)
+  {
+    const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+    var xulElement = document.createElementNS(kXULNS, "menuitem");
+    xulElement.setAttribute("cmd", aCommandName);
+    xulElement.setAttribute("command", "cmd_" + aCommandName.substring(NC_NS_CMD.length));
+
+    switch (aCommandName) {
+    case NC_NS_CMD + "open":
+      xulElement.setAttribute("label", aDisplayName);
+      xulElement.setAttribute("default", "true");
+      break;
+    case NC_NS_CMD + "openfolder":
+      aDisplayName = aItemNode.getAttribute("open") == "true" ? this.getLocaleString("cmd_openfolder2") : aDisplayName;
+      xulElement.setAttribute("label", aDisplayName);
+      xulElement.setAttribute("default", "true");
+      break;
+    case NC_NS_CMD + "renamebookmark":
+      if (!document.popupNode.hasAttribute("type")) {
+        xulElement.setAttribute("label", this.getLocaleString("cmd_renamebookmark2"));
+        xulElement.setAttribute("cmd", (NC_NS_CMD + "editurl"));
+      }
+      else
+        xulElement.setAttribute("label", aDisplayName);
+      break;
+    default:
+      xulElement.setAttribute("label", aDisplayName);
+      break;
+    }
+    return xulElement;
+  },
+
+  // XXX - ideally this would be in the base. this.tree needs to change to 
+  // this.element and then we can do just that. 
+  setRoot: function (aRoot)
+  {
+    this.tree.setAttribute("ref", aRoot);
+  },
+
+  // Command implementation
+  commands: {
+    openFolder: function (aSelectedItem)
+    {
+      if (aSelectedItem.getAttribute("open") == "true")
+        aSelectedItem.removeAttribute("open");
+      else
+        aSelectedItem.setAttribute("open", "true");
+    },
+
+    // Things Needed to Satisfy Mac Weenies:
+    // 1) need to implement timed single click edit. This could be Hard.
+    // 2) need to implement some other method of key access apart from F2.
+    //    mpt claims that 'Cmd+U' is the excel equivalent.
+    editCell: function (aSelectedItem, aCell)
+    {
+      // XXX throw up properties dialog with name selected so user can rename
+      //     that way, until tree conversion allows us to use IL again. 
+      goDoCommand("cmd_properties");
+      return; // Disable inline edit for now.
+
+      var editCell = aSelectedItem.firstChild.childNodes[aCell];
+      if (editCell.getAttribute("editable") != "true")
+        return;
+      
+      // Cause the inline edit cell binding to be used.
+      editCell.setAttribute("class", "treecell-indent treecell-editable");
+      var editColGroup = document.getElementById("theColumns");
+      var count = 0;
+      var property = "";
+      for (var i = 0; i < editColGroup.childNodes.length; ++i) {
+        var currCol = editColGroup.childNodes[i];
+        if (currCol.getAttribute("hidden") == "true")
+          return;
+        if (count == aCell) {
+          property = currCol.getAttribute("resource");
+          break;
+        }
+        ++count;
+
+        // Deal with interleaved column resizer splitters
+        if (currCol.nextSibling.localName == "splitter") ++i;
+      }
+
+      if (property) {
+        editCell.setMode("edit");
+        editCell.addObserver(this.postModifyCallback, "accept",
+                             [editCell, aSelectedItem, property]);
+      }
+    },
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Called after an inline-edit cell has left inline-edit mode, and data
+    // needs to be modified in the datasource.
+    postModifyCallback: function (aParams)
+    {
+      var selItemURI = NODE_ID(aParams[1]);
+      gBookmarksShell.propertySet(selItemURI, aParams[2], aParams[3]);
+      gBookmarksShell.selectFolderItem(NODE_ID(gBookmarksShell.findRDFNode(aParams[1], false)),
+                                       selItemURI, false);
+      gBookmarksShell.tree.focus();
+      gSelectionTracker.clickCount = 0;
+      
+      // Set the cell back to use the standard treecell binding.
+      var editCell = aParams[0];
+      editCell.setAttribute("class", "treecell-indent");
+    },
+
+    ///////////////////////////////////////////////////////////////////////////
+    // New Folder Creation
+    // Strategy: create a dummy row with edit fields to harvest information
+    //           from the user, then destroy these rows and create an item
+    //           in its place.
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Edit folder name & update the datasource if name is valid
+    onEditFolderName: function (aParams, aTopic)
+    {
+      var name = aParams[3];
+      var shell = gBookmarksShell.commands; // suck
+      var dummyItem = aParams[2];
+      var relativeNode = aParams[1];
+      var parentNode = relativeNode ? gBookmarksShell.findRDFNode(relativeNode, false) : gBookmarksShell.tree;
+
+      dummyItem.parentNode.removeChild(dummyItem);
+
+      if (!shell.validateNameAndTopic(name, aTopic, relativeNode, dummyItem)) {
+        gBookmarksShell.tree.selectItem(relativeNode);
+        gBookmarksShell.tree.focus();
+        return;
+      }
+
+      if (relativeNode) {
+        // If we're attempting to create a folder as a subfolder of an open folder,
+        // we need to set the parentFolder to be relativeNode, which will be the
+        // parent of the new folder, rather than the parent of the relativeNode,
+        // which will result in the folder being created in an incorrect position
+        // (adjacent to the relativeNode).
+        var selKids = ContentUtils.childByLocalName(relativeNode, "treechildren");
+        if (selKids && selKids.hasChildNodes() && selKids.lastChild == dummyItem)
+          parentNode = relativeNode;
+      }
+
+      var args = [{ property: NC_NS + "parent",
+                    resource: NODE_ID(parentNode) },
+                  { property: NC_NS + "Name",
+                    literal:  name }];
+
+      const kBMDS = gBookmarksShell.RDF.GetDataSource("rdf:bookmarks");
+      kBMDS.AddObserver(newFolderRDFObserver);
+      var relId = relativeNode ? NODE_ID(relativeNode) : "NC:BookmarksRoot";
+      BookmarksUtils.doBookmarksCommand(relId, NC_NS_CMD + "newfolder", args);
+      kBMDS.RemoveObserver(newFolderRDFObserver);
+      var newFolderItem = document.getElementById(newFolderRDFObserver._newFolderURI);
+      gBookmarksShell.tree.focus();
+      gBookmarksShell.tree.selectItem(newFolderItem);
+      // Can't use newFolderItem because it may not have been created yet. Hack, huh?
+      var index = gBookmarksShell.tree.getIndexOfItem(relativeNode);
+      gBookmarksShell.tree.ensureIndexIsVisible(index+1);
+      gSelectionTracker.clickCount = 0;
+    },
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Performs simple validation on what the user has entered:
+    //  1) prevents entering an empty string
+    //  2) in the case of a canceled operation, remove the dummy item and
+    //     restore selection.
+    validateNameAndTopic: function (aName, aTopic, aOldSelectedItem, aDummyItem)
+    {
+      // Don't allow user to enter an empty string "";
+      if (!aName) return false;
+
+      // If the user hit escape, go no further.
+      if (aTopic == "reject") {
+        if (aOldSelectedItem)
+          gBookmarksShell.tree.selectItem(aOldSelectedItem);
+        return false;
+      }
+      return true;
+    },
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Creates a dummy item that can be placed in edit mode to retrieve data
+    // to create new bookmarks/folders.
+    createBookmarkItem: function (aMode, aSelectedItem)
+    {
+      /////////////////////////////////////////////////////////////////////////
+      // HACK HACK HACK HACK HACK         
+      // Disable Inline-Edit for now and just use a dialog. 
+      
+      // XXX - most of this is just copy-pasted from the other two folder
+      //       creation functions. Yes it's ugly, but it'll do the trick for 
+      //       now as this is in no way intended to be a long-term solution.
+
+      const kPromptSvcContractID = "@mozilla.org/embedcomp/prompt-service;1";
+      const kPromptSvcIID = Components.interfaces.nsIPromptService;
+      const kPromptSvc = Components.classes[kPromptSvcContractID].getService(kPromptSvcIID);
+      
+      var defaultValue  = gBookmarksShell.getLocaleString("ile_newfolder");
+      var dialogTitle   = gBookmarksShell.getLocaleString("newfolder_dialog_title");
+      var dialogMsg     = gBookmarksShell.getLocaleString("newfolder_dialog_msg");
+      var stringValue   = { value: defaultValue };
+      if (kPromptSvc.prompt(window, dialogTitle, dialogMsg, stringValue, null, { value: 0 })) {
+        var relativeNode = gBookmarksShell.tree;
+        var parentNode;
+        if (aSelectedItem && aSelectedItem.localName != "tree") {
+          // By default, create adjacent to the selected item
+          relativeNode = aSelectedItem;
+          if (relativeNode.getAttribute("container") == "true" && 
+              relativeNode.getAttribute("open") == "true") {
+            // But if it's an open container, the relative node should be the last child. 
+            var treechildren = ContentUtils.childByLocalName(relativeNode, "treechildren");
+            if (treechildren && treechildren.hasChildNodes())
+              relativeNode = treechildren.lastChild; // folder non-empty, set relativeNode
+            parentNode = aSelectedItem; // no matter what, folder is open, so make it parent
+          } else {
+            parentNode = relativeNode ? gBookmarksShell.findRDFNode(relativeNode, false) : gBookmarksShell.tree;
+          }
+        }
+
+        var args = [{ property: NC_NS + "parent",
+                      resource: NODE_ID(parentNode) },
+                    { property: NC_NS + "Name",
+                      literal:  stringValue.value }];
+        
+        const kBMDS = gBookmarksShell.RDF.GetDataSource("rdf:bookmarks");
+        kBMDS.AddObserver(newFolderRDFObserver);
+        var relId = relativeNode ? NODE_ID(relativeNode) : "NC:BookmarksRoot";
+        BookmarksUtils.doBookmarksCommand(relId, NC_NS_CMD + "newfolder", args);
+        kBMDS.RemoveObserver(newFolderRDFObserver);
+        var newFolderItem = document.getElementById(newFolderRDFObserver._newFolderURI);
+        gBookmarksShell.tree.focus();
+        gBookmarksShell.tree.selectItem(newFolderItem);
+        // Can't use newFolderItem because it may not have been created yet. Hack, huh?
+        var index = gBookmarksShell.tree.getIndexOfItem(relativeNode);
+        gBookmarksShell.tree.ensureIndexIsVisible(index+1);
+      }
+      
+      return; 
+      
+      // HACK HACK HACK HACK HACK         
+      /////////////////////////////////////////////////////////////////////////
+
+      /* Disable inline edit for now
+      const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+      var dummyItem = document.createElementNS(kXULNS, "treeitem");
+      dummyItem = gBookmarksShell.createBookmarkFolderDecorations(dummyItem);
+      dummyItem.setAttribute("class", "bookmark-item");
+
+      var dummyRow    = document.createElementNS(kXULNS, "treerow");
+      var dummyCell   = document.createElementNS(kXULNS, "treecell");
+      var dummyCell2  = document.createElementNS(kXULNS, "treecell");
+      dummyCell.setAttribute("label", gBookmarksShell.getLocaleString("ile_newfolder") + "  ");
+      dummyCell.setAttribute("type", NC_NS + "Folder");
+      dummyCell.setAttribute("editable", "true");
+      dummyCell.setAttribute("class", "treecell-indent treecell-editable");
+      dummyRow.appendChild(dummyCell);
+      dummyItem.appendChild(dummyRow);
+      
+      var relativeNode = null;
+
+      // If there are selected items, try to create the dummy item relative to the 
+      // best item, and position the bookmark there when created. Otherwise just
+      // append to the root. 
+      if (aSelectedItem && aSelectedItem.localName != "tree") {
+        // By default, create adjacent to the selected item
+        relativeNode = aSelectedItem;
+        if (relativeNode.getAttribute("container") == "true" && 
+            relativeNode.getAttribute("open") == "true") {
+          // But if it's an open container, the relative node should be the last child. 
+          var treechildren = ContentUtils.childByLocalName(relativeNode, "treechildren");
+          if (treechildren && treechildren.hasChildNodes()) 
+            relativeNode = treechildren.lastChild;
+        }
+
+        if (aSelectedItem.getAttribute("container") == "true") {
+          if (aSelectedItem.getAttribute("open") == "true") {
+            var treechildren = ContentUtils.childByLocalName(aSelectedItem, "treechildren");
+            if (!treechildren) {
+              treechildren = document.createElementNS(kXULNS, "treechildren");
+              aSelectedItem.appendChild(treechildren);
+            }
+            // Insert new item after last item.
+            treechildren.appendChild(dummyItem);
+          }
+          else {
+            if (aSelectedItem.nextSibling)
+              aSelectedItem.parentNode.insertBefore(dummyItem, aSelectedItem.nextSibling);
+            else
+              aSelectedItem.parentNode.appendChild(dummyItem);
+          }
+          var index = gBookmarksShell.tree.getIndexOfItem(dummyItem);
+          gBookmarksShell.tree.ensureIndexIsVisible(index);
+        }
+        else {
+          if (aSelectedItem.nextSibling)
+            aSelectedItem.parentNode.insertBefore(dummyItem, aSelectedItem.nextSibling);
+          else
+            aSelectedItem.parentNode.appendChild(dummyItem);
+        }
+      }
+      else {
+        // No items in the tree. Append to the root. 
+        var rootKids = document.getElementById("treechildren-bookmarks");
+        rootKids.appendChild(dummyItem);
+      }
+
+      dummyCell.setMode("edit");
+      dummyCell.addObserver(this.onEditFolderName, "accept", [dummyCell, relativeNode, dummyItem]);
+      dummyCell.addObserver(this.onEditFolderName, "reject", [dummyCell, relativeNode, dummyItem]);
+      */
+    }
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Evaluates an event to determine whether or not it affords opening a tree
+  // item. Typically, this is when the left mouse button is used, and provided
+  // the click-rate matches that specified by our owning tree class. For example,
+  // some trees open an item when double clicked (bookmarks/history windows) and
+  // others on a single click (sidebar panels).
+  isValidOpenEvent: function (aEvent)
+  {
+    return !(aEvent.type == "click" && 
+             (aEvent.button != 0 || aEvent.detail != this.openClickCount))
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // For the given selection, selects the best adjacent element. This method is
+  // useful when an action such as a cut or a deletion is performed on a
+  // selection, and focus/selection needs to be restored after the operation
+  // is performed.
+  getNextElement: function (aElement)
+  {
+    if (aElement.nextSibling)
+      return aElement.nextSibling;
+    else if (aElement.previousSibling)
+      return aElement.previousSibling;
+    else
+      return aElement.parentNode.parentNode;
+  },
+
+  selectElement: function (aElement)
+  {
+    this.tree.selectItem(aElement);
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Add the treeitem element specified by aURI to the tree's current selection.
+  addItemToSelection: function (aURI)
+  {
+    var item = document.getElementById(aURI) // XXX flawed for multiple ids
+    this.tree.addItemToSelection(item);
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Return a set of DOM nodes that represent the selection in the tree widget.
+  // This method is takes a node parameter which is the popupNode for the
+  // document. If the popupNode is not contained by the selection, the
+  // popupNode is selected and the new selection returned.
+  getSelection: function ()
+  {
+    // Note that we don't just the selectedItems NodeList here because that
+    // is a reference to a LIVE DOM NODE LIST. We want to maintain control
+    // over what is in the selection array ourselves.
+    return [].concat(this.tree.selectedItems);
+  },
+
+  getBestItem: function ()
+  {
+    var seln = this.getSelection ();
+    if (seln.length < 1) {
+      var kids = ContentUtils.childByLocalName(this.tree, "treechildren");
+      return kids.lastChild || this.tree;
+    }
+    else
+      return seln[0];
+    return this.tree;
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Return a set of DOM nodes that represent the selection in the tree widget.
+  // This method is takes a node parameter which is the popupNode for the
+  // document. If the popupNode is not contained by the selection, the
+  // popupNode is selected and the new selection returned.
+  getContextSelection: function (aItemNode)
+  {
+    // How a context-click works:
+    // if the popup node is contained by the selection, the context menu is
+    // built for that selection. However, if the popup node is invoked on a
+    // non-selected node, unless modifiers are pressed**, the previous
+    // selection is discarded and that node selected.
+    var selectedItems = this.tree.selectedItems;
+    for (var i = 0; i < selectedItems.length; ++i) {
+      if (selectedItems[i] == aItemNode)
+        return selectedItems;
+    }
+    if (aItemNode.localName == "treeitem")
+      this.tree.selectItem(aItemNode);
+    return this.tree.selectedItems.length ? this.tree.selectedItems : [this.tree];
+  },
+
+  getSelectedFolder: function ()
+  {
+    var selectedItem = this.getBestItem();
+    if (!selectedItem) return "NC:BookmarksRoot";
+    while (selectedItem && selectedItem.nodeType == Node.ELEMENT_NODE) {
+      if (selectedItem.getAttribute("container") == "true" && 
+          selectedItem.getAttribute("open") == "true")
+        return NODE_ID(selectedItem);
+      selectedItem = selectedItem.parentNode.parentNode;
+    }
+    return "NC:BookmarksRoot";
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // For a given start DOM element, find the enclosing DOM element that contains
+  // the template builder RDF resource decorations (id, ref, etc).
+  findRDFNode: function (aStartNode, aIncludeStartNodeFlag)
+  {
+    var temp = aIncludeStartNodeFlag ? aStartNode : aStartNode.parentNode;
+    while (temp && temp.localName != "treeitem")
+      temp = temp.parentNode;
+    return temp || this.tree;
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Tree click events. This handles when to go into inline-edit mode for
+  // editable cells.
+  treeClicked: function (aEvent)
+  {
+    // We are disabling Inline Edit for now. It's too buggy in the old XUL tree widget.
+    // A more solid implementation will follow the conversion to tree
+/*
+    if (this.tree.selectedItems.length > 1 || aEvent.detail > 1 || aEvent.button != 0) {
+      gSelectionTracker.clickCount = 0;
+      return;
+    }
+    if (gSelectionTracker.currentItem == this.tree.currentItem &&
+        gSelectionTracker.currentCell == aEvent.target)
+      ++gSelectionTracker.clickCount;
+    else
+      gSelectionTracker.clickCount = 0;
+
+    if (!this.tree.currentItem)
+      return;
+
+    gSelectionTracker.currentItem = this.tree.currentItem;
+    gSelectionTracker.currentCell = aEvent.target;
+
+    if (gSelectionTracker.currentItem.getAttribute("type") != NC_NS + "Bookmark" &&
+        gSelectionTracker.currentItem.getAttribute("type") != NC_NS + "Folder")
+      return;
+
+    var row = gSelectionTracker.currentItem.firstChild;
+    if (row) {
+      for (var i = 0; i < row.childNodes.length; ++i) {
+        if (row.childNodes[i] == gSelectionTracker.currentCell) {
+          // Don't allow inline-edit of cells other than name for folders.
+          // XXX - so so skeezy. Change this to look for NC:Name or some such.
+          if (gSelectionTracker.currentItem.getAttribute("type") != NC_NS + "Bookmark" && i)
+            return;
+          // Don't allow editing of the root folder name
+          if (gSelectionTracker.currentItem.id == "NC:BookmarksRoot")
+            return;
+          if (gSelectionTracker.clickCount == 1 && this.openClickCount > 1)
+            gBookmarksShell.commands.editCell(this.tree.currentItem, i);
+          break;
+        }
+      }
+    }
+*/
+  },
+
+  treeOpen: function (aEvent)
+  {
+    if (this.isValidOpenEvent(aEvent)) {
+      var rdfNode = this.findRDFNode(aEvent.target, true);
+      if (rdfNode.getAttribute("container") != "true")
+        this.open(aEvent, rdfNode);
+    }
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Tree key events. This handles when to go into inline-edit mode for editable
+  // cells, when to load a URL, etc.
+  treeKeyPress: function (aEvent)
+  {
+    if (this.tree.selectedItems.length > 1) return;
+
+ /* Disabling Inline Edit
+    if (aEvent.keyCode == 113 && aEvent.shiftKey) {
+      const kNodeId = NODE_ID(this.tree.currentItem);
+      if (this.resolveType(kNodeId) == NC_NS + "Bookmark")
+        gBookmarksShell.commands.editCell (this.tree.currentItem, 1);
+    }
+    else */
+    if (aEvent.keyCode == 113)
+      goDoCommand("cmd_rename");
+    else if (aEvent.keyCode == 13) // && this.tree.currentItem.firstChild.getAttribute("inline-edit") != "true")
+      goDoCommand(aEvent.altKey ? "cmd_properties" : "cmd_open");
+  },
+
+  selectFolderItem: function (aFolderURI, aItemURI, aAdditiveFlag)
+  {
+    var folder = document.getElementById(aFolderURI);
+    var kids = ContentUtils.childByLocalName(folder, "treechildren");
+    if (!kids) return;
+
+    var item = kids.firstChild;
+    while (item) {
+      if (item.id == aItemURI) break;
+      item = item.nextSibling;
+    }
+    if (!item) return;
+
+    this.tree[aAdditiveFlag ? "addItemToSelection" : "selectItem"](item);
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Command handling & Updating.
+  controller: {
+    supportsCommand: function (aCommand)
+    {
+      switch(aCommand) {
+      case "cmd_undo":
+      case "cmd_redo":
+        return false;
+      case "cmd_bm_cut":
+      case "cmd_bm_copy":
+      case "cmd_bm_paste":
+      case "cmd_bm_delete":
+      case "cmd_bm_selectAll":
+        return true;
+      case "cmd_open":
+      case "cmd_openfolder":
+      case "cmd_openfolderinnewwindow":
+      case "cmd_newbookmark":
+      case "cmd_newfolder":
+      case "cmd_newseparator":
+      case "cmd_find":
+      case "cmd_properties":
+      case "cmd_rename":
+      case "cmd_setnewbookmarkfolder":
+      case "cmd_setpersonaltoolbarfolder":
+      case "cmd_setnewsearchfolder":
+      case "cmd_import":
+      case "cmd_export":
+      case "cmd_bm_fileBookmark":
+        return true;
+      default:
+        return false;
+      }
+    },
+
+    isCommandEnabled: function (aCommand)
+    {
+      var numSelectedItems = gBookmarksShell.tree.selectedItems.length;
+      var seln, firstSelected, folderType, bItemCountCorrect;
+      switch(aCommand) {
+      case "cmd_undo":
+      case "cmd_redo":
+        return false;
+      case "cmd_bm_paste":
+        return gBookmarksShell.canPaste();
+      case "cmd_bm_cut":
+      case "cmd_bm_copy":
+      case "cmd_bm_delete":
+        return numSelectedItems >= 1;
+      case "cmd_bm_selectAll":
+        return true;
+      case "cmd_open":
+         seln = gBookmarksShell.tree.selectedItems;
+        return numSelectedItems == 1 && seln[0].getAttribute("type") == NC_NS + "Bookmark";
+      case "cmd_openfolder":
+      case "cmd_openfolderinnewwindow":
+        seln = gBookmarksShell.tree.selectedItems;
+        return numSelectedItems == 1 && seln[0].getAttribute("type") == NC_NS + "Folder";
+      case "cmd_find":
+      case "cmd_newbookmark":
+      case "cmd_newfolder":
+      case "cmd_newseparator":
+      case "cmd_import":
+      case "cmd_export":
+        return true;
+      case "cmd_properties":
+      case "cmd_rename":
+        seln = gBookmarksShell.tree.selectedItems;
+        return numSelectedItems == 1 && seln[0].getAttribute("type") != NC_NS + "BookmarkSeparator";
+      case "cmd_setnewbookmarkfolder":
+        seln = gBookmarksShell.tree.selectedItems;
+        firstSelected = seln.length ? seln[0] : gBookmarksShell.tree;
+        folderType = firstSelected.getAttribute("type") == (NC_NS + "Folder");
+        bItemCountCorrect = seln.length ? numSelectedItems == 1 : true;
+        return bItemCountCorrect && !(NODE_ID(firstSelected) == "NC:NewBookmarkFolder") && folderType;
+      case "cmd_setpersonaltoolbarfolder":
+        seln = gBookmarksShell.tree.selectedItems;
+        firstSelected = seln.length ? seln[0] : gBookmarksShell.tree;
+        folderType = firstSelected.getAttribute("type") == (NC_NS + "Folder");
+        bItemCountCorrect = seln.length ? numSelectedItems == 1 : true;
+        return bItemCountCorrect && !(NODE_ID(firstSelected) == "NC:PersonalToolbarFolder") && folderType;
+      case "cmd_setnewsearchfolder":
+        seln = gBookmarksShell.tree.selectedItems;
+        firstSelected = seln.length ? seln[0] : gBookmarksShell.tree;
+        folderType = firstSelected.getAttribute("type") == (NC_NS + "Folder");
+        bItemCountCorrect = seln.length ? numSelectedItems == 1 : true;
+        return bItemCountCorrect == 1 && !(NODE_ID(firstSelected) == "NC:NewSearchFolder") && folderType;
+      case "cmd_bm_fileBookmark":
+        seln = gBookmarksShell.tree.selectedItems;
+        return seln.length > 0;
+      default:
+        return false;
+      }
+    },
+
+    doCommand: function (aCommand)
+    {
+      switch(aCommand) {
+      case "cmd_undo":
+      case "cmd_redo":
+        break;
+      case "cmd_bm_paste":
+      case "cmd_bm_copy":
+      case "cmd_bm_cut":
+      case "cmd_bm_delete":
+      case "cmd_newbookmark":
+      case "cmd_newfolder":
+      case "cmd_newseparator":
+      case "cmd_properties":
+      case "cmd_rename":
+      case "cmd_open":
+      case "cmd_openfolder":
+      case "cmd_openfolderinnewwindow":
+      case "cmd_setnewbookmarkfolder":
+      case "cmd_setpersonaltoolbarfolder":
+      case "cmd_setnewsearchfolder":
+      case "cmd_find":
+      case "cmd_import":
+      case "cmd_export":
+      case "cmd_bm_fileBookmark":
+        gBookmarksShell.execCommand(aCommand.substring("cmd_".length));
+        break;
+      case "cmd_bm_selectAll":
+        gBookmarksShell.tree.selectAll();
+        break;
+      }
+    },
+
+    onEvent: function (aEvent)
+    {
+      switch (aEvent) {
+      case "tree-select":
+        this.onCommandUpdate();
+        break;
+      }
+    },
+
+    onCommandUpdate: function ()
+    {
+      var commands = ["cmd_properties", "cmd_rename", "cmd_bm_copy",
+                      "cmd_bm_paste", "cmd_bm_cut", "cmd_bm_delete",
+                      "cmd_setpersonaltoolbarfolder", 
+                      "cmd_setnewbookmarkfolder",
+                      "cmd_setnewsearchfolder", "cmd_bm_fileBookmark", 
+                      "cmd_openfolderinnewwindow", "cmd_openfolder"];
+      for (var i = 0; i < commands.length; ++i)
+        goUpdateCommand(commands[i]);
+    }
+  }
+};
+
+var newFolderRDFObserver = {
+  _newFolderURI: null,
+  onAssert: function (aDS, aSource, aProperty, aValue)
+  {
+    try {
+      var value = aValue.QueryInterface(Components.interfaces.nsIRDFResource);
+      if (aDS.URI == "rdf:bookmarks" && aProperty.Value == RDF_NS + "type" &&
+          value.Value == NC_NS + "Folder")
+        this._newFolderURI = aSource.Value;
+    }
+    catch (e) {
+      // Failures are OK, the value could be a literal instead of a resource.
+    }
+  },
+
+  onUnassert: function (aDS, aSource, aProperty, aTarget) { },
+  onChange: function (aDS, aSource, aProperty, aOldTarget, aNewTarget) { },
+  onMove: function (aDS, aOldSource, aNewSource, aProperty, aTarget) { },
+  beginUpdateBatch: function (aDS) { },
+  endUpdateBatch: function (aDS) { }
+};
+

browser/components/bookmarks/content/findBookmark.js

@@ -0,0 +1,97 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+const BMARKS_CONTRACTID        = "@mozilla.org/browser/bookmarks-service;1";
+const nsIBookmarksService      = Components.interfaces.nsIBookmarksService;
+
+var gOKButton;
+var gSearchField;
+function Startup()
+{
+  var bundle = document.getElementById("bookmarksBundle");
+  gOKButton = document.documentElement.getButton("accept");
+  gOKButton.label = bundle.getString("search_button_label");
+  gOKButton.disabled = true;
+  gSearchField = document.getElementById("searchField");
+  gSearchField.focus();
+}
+var gCreatingNewWindow = false;
+function find()
+{
+  // Build up a find URI from the search fields and open a new window
+  // rooted on the URI. 
+  var match = document.getElementById("matchList");
+  var method = document.getElementById("methodList");
+  var searchURI = "find:datasource=rdf:bookmarks"
+  searchURI += "&match=" + match.selectedItem.value;
+  searchURI += "&method=" + method.selectedItem.value;
+  searchURI += "&text=" + escape(gSearchField.value);
+  var bmWindow = findMostRecentWindow("bookmarks:searchresults", "chrome://communicator/content/bookmarks/bookmarks.xul", searchURI);
+  
+  // Update the root of the tree if we're using an existing search window. 
+  if (!gCreatingNewWindow) 
+    bmWindow.document.getElementById("bookmarks-view").tree.setAttribute("ref", searchURI);
+ 
+  bmWindow.focus();
+
+  if (document.getElementById("saveQuery").checked == true)
+  {
+    var bundle = document.getElementById("bookmarksBundle");
+    var findTitle = bundle.stringBundle.formatStringFromName(
+                      "ShortFindTitle", [gSearchField.value], 1);
+    var bmks = Components.classes[BMARKS_CONTRACTID].getService(nsIBookmarksService);
+    bmks.addBookmarkImmediately(searchURI, findTitle, bmks.BOOKMARK_FIND_TYPE, null);
+  }
+
+  return true;
+}
+
+function findMostRecentWindow(aType, aURI, aParam)
+{
+  var WM = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
+  WM = WM.QueryInterface(Components.interfaces.nsIWindowMediator);
+  var topWindow = WM.getMostRecentWindow(aType);
+  if (!topWindow) gCreatingNewWindow = true;
+  return topWindow || openDialog("chrome://communicator/content/bookmarks/bookmarks.xul", 
+                                 "", "chrome,all,dialog=no", aParam);
+}
+
+function doEnabling()
+{
+  gOKButton.disabled = !gSearchField.value;
+}

browser/components/bookmarks/content/findBookmark.xul

@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+
+<!-- -*- Mode: HTML; indent-tabs-mode: nil; -*- -->
+<!--
+
+  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.org code.
+ 
+  The Initial Developer of the Original Code is Netscape
+  Communications Corporation.  Portions created by Netscape are
+  Copyright (C) 1998 Netscape Communications Corporation. All
+  Rights Reserved.
+ 
+  Contributor(s): 
+    Ben Goodger <ben@netscape.com> (Original Author)
+-->
+
+<!--
+    "Find Bookmarks" window
+  -->
+
+<?xml-stylesheet href="chrome://communicator/skin/"?>
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/findBookmark.dtd">
+
+<dialog id="findBookmarkWindow" style="width: 36em;"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&findBookmark.title;" 
+        onload="Startup();"
+        ondialogaccept="return find();">
+
+  <stringbundle id="bookmarksBundle" src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
+  
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/findBookmark.js"/>
+
+  <label value="&search.for.label;"/>
+  <hbox align="center">
+    <menulist id="matchList" class="menulist-toolbar">
+      <menupopup>
+        <menuitem value="http://home.netscape.com/NC-rdf#Name" label="&search.name.label;"/>
+        <menuitem value="http://home.netscape.com/NC-rdf#URL" label="&search.url.label;"/>
+        <menuitem value="http://home.netscape.com/NC-rdf#Description" label="&search.description.label;"/>
+        <menuitem value="http://home.netscape.com/NC-rdf#ShortcutURL" label="&search.shortcut.label;"/>
+      </menupopup>
+    </menulist>
+    <menulist id="methodList" class="menulist-toolbar">
+      <menupopup>
+        <menuitem value="contains" label="&search.contains.label;"/>
+        <menuitem value="startswith" label="&search.startswith.label;"/>
+        <menuitem value="endswith" label="&search.endswith.label;"/>
+        <menuitem value="is" label="&search.is.label;"/>
+        <menuitem value="isnot" label="&search.isnot.label;"/>
+        <menuitem value="doesntcontain" label="&search.doesntcontain.label;"/>
+      </menupopup>
+    </menulist>
+    <textbox id="searchField" flex="1" oninput="doEnabling();"/>
+  </hbox>
+  <checkbox id="saveQuery" label="&save.query.label;" />
+</dialog>
+

browser/components/bookmarks/content/manifest.jm

@@ -0,0 +1,29 @@
+# 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.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+packages/core.jar:
+	communicator/content/bookmarks/bm-find.js
+	communicator/content/bookmarks/bm-find.xul
+	communicator/content/bookmarks/bm-panel.js
+	communicator/content/bookmarks/bm-panel.xul
+	communicator/content/bookmarks/bm-props.js
+	communicator/content/bookmarks/bm-props.xul
+	communicator/content/bookmarks/bookmarks.js
+	communicator/content/bookmarks/bookmarksDD.js
+	communicator/content/bookmarks/bookmarks.xul

browser/components/bookmarks/content/oTest.css

@@ -0,0 +1,2 @@
+
+

browser/components/bookmarks/content/oTest.xul

@@ -0,0 +1,162 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet href="chrome://communicator/skin/"?>
+<?xml-stylesheet href="chrome://communicator/content/bookmarks/oTest.css"?>
+
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+
+<window id="bookmarksTreeTest" width="640" height="480"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        orient="vertical"
+        onload="Startup();">
+
+
+  <script>
+  <![CDATA[
+    var bookmarksBuilderObserver = {
+      onToggleOpenState: function (aIndex) {
+        dump("*** onToggleOpenState(" + aIndex + ");\n");
+      },
+
+      onCycleHeader: function (aColID, aDOMElement) {
+        dump("*** onCycleHeader(" + aColID + ", " + aDOMElement + ");\n");
+      },
+
+      onCycleCell: function (aIndex, aColID) {
+        dump("*** onCycleCell(" + aIndex + ", " + aColID + ");\n");
+      },
+
+      onSelectionChanged: function () {
+        dump("*** onSelectionChanged\n");
+      },
+
+      isEditable: function (aIndex, aColID) {
+        dump("*** isEditable(" + aIndex + ", " + aColID + ");\n");
+        return aColID == "NameColumn";
+      },
+
+      onSetCellText: function (aIndex, aColID, aValue) {
+        dump("*** onSetCellText(" + aIndex + ", " + aColID + ", " + aValue + ");\n");
+      },
+
+      onPerformAction: function (aAction) {
+        dump("*** onPerformAction(" + aAction + ");\n");
+      },
+
+      onPerformActionOnRow: function (aAction, aIndex) {
+        dump("*** onPerformActionOnRow(" + aAction + ", " + aIndex + ");\n");
+      },
+
+      onPerformActionOnCell: function (aAction, aIndex, aColID) {
+        dump("*** onPerformActionOnCell(" + aAction + ", " + aIndex + ", " + aColID + ");\n");
+      }
+    };
+
+    function Startup()
+    {
+      var tree = document.getElementById("tree");
+      var builder = tree.builder.QueryInterface(Components.interfaces.nsIXULTreeBuilder);
+      builder.addObserver(bookmarksBuilderObserver);
+    }
+
+    function getItemRect(aEvent)
+    {
+      var tree = document.getElementById("tree-proper");
+      var obo = tree.boxObject.QueryInterface(Components.interfaces.nsITreeBoxObject);  
+      var row = { };
+      var col = { };
+      var elt = { };
+      obo.getCellAt(aEvent.clientX, aEvent.clientY, row, col, elt);
+
+      var x = { };
+      var y = { };
+      var w = { };
+      var h = { };
+      var crp = { };
+      obo.getCoordsForCellItem(row.value, col.value, elt.value, x, y, w, h, crp);
+      dump("*** (x,y) = (" + x.value + "," + y.value + "); (w,h) = (" + w.value + "," + h.value + ");\n");
+    }
+
+    const kRDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+    function createContextMenu (aEvent)
+    {
+      var tree = document.getElementById("tree-proper");
+      var obo = tree.boxObject.QueryInterface(Components.interfaces.nsITreeBoxObject);
+      var row = { };
+      var col = { };
+      var elt = { };
+      obo.getCellAt(aEvent.clientX, aEvent.clientY, row, col, elt);
+      dump("*** row.value = " + row.value + "\n") 
+      
+      var treeBody = document.getElementById("tree");
+      var rowResource = treeBody.builder.getResourceAtIndex(row.value);
+      
+      const kRDFSvcContractID = "@mozilla.org/rdf/rdf-service;1";
+      const kRDFSvcIID = Components.interfaces.nsIRDFService;
+      const kRDFSvc = Components.classes[kRDFSvcContractID].getService(kRDFSvcIID);
+      var database = treeBody.database;
+
+      const krType = kRDFSvc.GetResource(kRDF_NS + "type");
+      var typeNode = kDatabase.GetTarget(rowResource, krType, true);
+      typeNode = typeNode.QueryInterface(Components.interfaces.nsIRDFResource);
+      dump("*** typeNode = " + typeNode.Value + "\n");
+      aEvent.preventBubble();
+    }
+  ]]>
+  </script>
+
+  <popupset id="contextSet">
+    <popup id="bookmarkContextMenu" onpopupshowing="createContextMenu(event);"/>
+  </popupset>
+
+  <toolbox>
+    <toolbar>
+      <button class="button-toolbar-2" label="Foopy Noopy" oncommand="alert('hi');"/>
+    </toolbar>
+  </toolbox>
+
+  <stack>
+    <button label="Foopy Noopy" flex="1"/>
+    <bulletinboard flex="1">
+      <textbox value="NerpNerp" left="10" top="50" onblur="this.setAttribute('hidden','true');"/>
+    </bulletinboard>  
+  </stack>
+
+  <tree flex="1" flags="dont-test-empty" id="tree-proper">
+    <treecols>
+      <treecol id="NameColumn"
+                   class="treecol-header treecol-inset-header sortDirectionIndicator"
+                   flex="1"
+                   sort="rdf:http://home.netscape.com/NC-rdf#Name"
+                   sortActive="true"
+                   label="Name"
+                   persist="width hidden sortActive sortDirection"
+                   primary="true" />
+
+      <splitter class="tree-splitter"/>
+
+      <treecol id="URLColumn"
+                   class="treecol-header treecol-inset-header sortDirectionIndicator"
+                   flex="1"
+                   sort="rdf:http://home.netscape.com/NC-rdf#URL"
+                   label="Location"
+                   persist="width hidden sortActive sortDirection" />
+    </treecols>
+
+    <treebody id="tree" datasources="rdf:bookmarks rdf:internetsearch rdf:files" flex="1"
+                  onclick="getItemRect(event);" ref="NC:BookmarksRoot">
+      <template>
+        <treerow uri="rdf:*" properties="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type rdf:http://home.netscape.com/NC-rdf#loading">
+          <treecell ref="NameColumn"
+                        label="rdf:http://home.netscape.com/NC-rdf#Name" />
+
+          <treecell ref="URLColumn"
+                        label="rdf:http://home.netscape.com/NC-rdf#URL" />
+        </treerow>
+      </template>
+    </treebody>
+  </tree>
+
+</window>
+

browser/components/bookmarks/content/pref-bookmarks.xul

@@ -0,0 +1,116 @@
+<?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): 
+  -->
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % prefBookmarkDTD SYSTEM "chrome://communicator/locale/bookmarks/pref-bookmarks.dtd">
+%prefBookmarkDTD;
+]>
+
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://communicator/content/bookmarks/pref-bookmarks.xul');"
+      headertitle="&lHeader;">
+
+  <script type="application/x-javascript">
+  <![CDATA[
+    var _elementIDs = ["enableAutoFile", "showExtendedData"];
+
+    var gCreateInFolder = "NC:NewBookmarkFolder";
+    function Startup ()
+    {
+      const kDisplay = document.getElementById("defaultFolder");
+      const kRDFSvcContractID = "@mozilla.org/rdf/rdf-service;1";
+      const kRDFSvcIID = Components.interfaces.nsIRDFService;
+      const kRDFSvc = Components.classes[kRDFSvcContractID].getService(kRDFSvcIID);
+      const kBMDS = kRDFSvc.GetDataSource("rdf:bookmarks");
+      const krDefaultFolder = kRDFSvc.GetResource("NC:NewBookmarkFolder");
+      const krType = kRDFSvc.GetResource("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
+      const krFolder = kRDFSvc.GetResource("http://home.netscape.com/NC-rdf#Folder");
+      const isFolder = kBMDS.HasAssertion(krDefaultFolder, krType, krFolder, true);
+      const krNameArc = kRDFSvc.GetResource("http://home.netscape.com/NC-rdf#Name");
+      if (!isFolder) {
+        const krRoot = kRDFSvc.GetResource("NC:BookmarksRoot");
+        gCreateInFolder = "NC:BookmarksRoot";
+      }
+      var rName = kBMDS.GetTarget(isFolder ? krDefaultFolder : krRoot, krNameArc, true);
+      rName = rName.QueryInterface(Components.interfaces.nsIRDFLiteral);
+      kDisplay.value = rName.Value;
+    }
+  
+    function chooseDefaultFolder ()
+    {
+      var rv = { selectedFolder: null };
+      openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
+                 "centerscreen,chrome,dialog=no,resizable=no", 
+                 null, null, gCreateInFolder, null, "selectFolder", rv);
+      if (rv && rv.selectedFolder) {
+        const kRDFSvcContractID = "@mozilla.org/rdf/rdf-service;1";
+        const kRDFSvcIID = Components.interfaces.nsIRDFService;
+        const kRDFSvc = Components.classes[kRDFSvcContractID].getService(kRDFSvcIID);
+        const kBMDS = kRDFSvc.GetDataSource("rdf:bookmarks");
+        const krDefaultFolder = kRDFSvc.GetResource(rv.selectedFolder);
+        const krNameArc = kRDFSvc.GetResource("http://home.netscape.com/NC-rdf#Name");
+        rName = kBMDS.GetTarget(krDefaultFolder, krNameArc, true);
+        rName = rName.QueryInterface(Components.interfaces.nsIRDFLiteral);
+        document.getElementById("defaultFolder").value = rName.Value;
+      }  
+        
+    }
+  ]]>
+  </script>
+        
+  <groupbox>
+    <caption label="&filingBookmarks.label;"/>
+    <description flex="1">&autoFile.label;</description>
+    <hbox align="center">
+      <checkbox id="enableAutoFile" label="&enableAutoFile.label;"
+                preftype="bool" prefstring="browser.bookmarks.add_without_dialog"
+                prefattribute="checked"/>
+    </hbox>
+    <separator/>
+    <description flex="1">&defaultFolder.label;</description>
+    <hbox align="center">
+      <textbox readonly="true" id="defaultFolder" crop="right" flex="1"/>
+      <button label="&chooseDefaultFolder.label;" accesskey="&chooseDefaultFolder.accesskey;"
+              oncommand="chooseDefaultFolder();"
+              id="browser.bookmarks.choosefolder" preftype="bool"
+              prefstring="pref.browser.homepage.disable_button.choose_folder" prefattribute="disabled"/>
+    </hbox>
+  </groupbox>
+
+  <groupbox>
+    <caption label="&extendedDataViews.label;"/>
+    <vbox align="start">
+      <description>&extendedDataExplanation.label;</description>
+      <checkbox id="showExtendedData" label="&showExtendedData.label;"
+                accesskey="&showExtendedData.accesskey;"
+                preftype="bool" prefstring="browser.bookmarks.show_extended_data"
+                prefattribute="checked"/>
+    </vbox>
+  </groupbox>              
+
+
+</page>
+

browser/components/bookmarks/jar.mn

@@ -0,0 +1,47 @@
+# 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.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+browser.jar:
+	content/browser/bookmarks/addBookmark.xul                  (content/addBookmark.xul)        
+  content/browser/bookmarks/addBookmark.js                   (content/addBookmark.js)
+  content/browser/bookmarks/bm-props.js                      (content/bm-props.js)
+  content/browser/bookmarks/bm-props.xul                     (content/bm-props.xul)
+  content/browser/bookmarks/bookmarksDD.js                   (content/bookmarksDD.js)
+  content/browser/bookmarks/bookmarks.xul                    (content/bookmarks.xul)
+  content/browser/bookmarks/bookmarks.js                     (content/bookmarks.js)
+  content/browser/bookmarks/bookmarks.css                    (content/bookmarks.css)
+  content/browser/bookmarks/bookmarks.xml                    (content/bookmarks.xml)
+  content/browser/bookmarks/bookmarksTree.js                 (content/bookmarksTree.js)
+  content/browser/bookmarks/bookmarksOverlay.xul             (content/bookmarksOverlay.xul)
+  content/browser/bookmarks/bookmarksOverlay.js              (content/bookmarksOverlay.js)
+  content/browser/bookmarks/bm-panel.xul                     (content/bm-panel.xul)
+  content/browser/bookmarks/bookmarksPanel.js                (content/bookmarksPanel.js)
+  content/browser/bookmarks/findBookmark.js                  (content/findBookmark.js)
+  content/browser/bookmarks/findBookmark.xul                 (content/findBookmark.xul)
+  content/browser/bookmarks/pref-bookmarks.xul               (content/pref-bookmarks.xul)
+  content/browser/bookmarks/oTest.xul                        (content/oTest.xul)
+
+en-US.jar:
+  locale/en-US/browser/bookmarks/addBookmark.dtd         (locale/addBookmark.dtd)
+  locale/en-US/browser/bookmarks/bm-props.dtd            (locale/bm-props.dtd)
+  locale/en-US/browser/bookmarks/bookmarks.dtd           (locale/bookmarks.dtd)
+  locale/en-US/browser/bookmarks/bookmark.properties     (locale/bookmark.properties)
+  locale/en-US/browser/bookmarks/bookmarksOverlay.dtd    (locale/bookmarksOverlay.dtd)
+  locale/en-US/browser/bookmarks/findBookmark.dtd        (locale/findBookmark.dtd)
+  locale/en-US/browser/bookmarks/pref-bookmarks.dtd      (locale/pref-bookmarks.dtd)

browser/components/bookmarks/locale/MANIFEST

@@ -0,0 +1,4 @@
+bm-find.dtd
+bm-props.dtd
+bookmark.properties
+bookmarks.dtd

browser/components/bookmarks/locale/addBookmark.dtd

@@ -0,0 +1,46 @@
+<!-- 
+   - The contents of this file are subject to the Mozilla 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/MPL/
+   - 
+   - 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.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp. Portions created by Netscape Communications
+   - Corp. are Copyright (C) 1999 Netscape Communications Corp. All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Ben Goodger <ben@netscape.com> (Original Author)
+  --> 
+  
+<!ENTITY newBookmark.title          "Add Bookmark">
+<!ENTITY newbookmark.label          "&brandShortName; will add a bookmark to this page.">
+<!ENTITY name.label                 "Name:">
+<!ENTITY name.accesskey             "n">
+<!ENTITY url.label                  "Location:">
+<!ENTITY url.accesskey              "l">
+<!ENTITY button.createin.label      "Create In &gt;&gt;">
+<!ENTITY button.createin.accesskey  "c">
+<!ENTITY button.createin2.label     "Create In &lt;&lt;">
+<!ENTITY createin.label             "Create in:">
+<!ENTITY createin.accesskey         "i">
+<!ENTITY button.newfolder.label     "New Folder...">
+<!ENTITY button.newfolder.accesskey "w">
+<!ENTITY alwayscreateinfolder.label "Don't show this dialog again">
+<!ENTITY alwayscreateinfolder.accesskey "a">
+<!ENTITY dontshowmessage.tooltip    "When this option is selected, new Bookmarks will be added using the title provided by the page.">
+<!ENTITY button.defaultfolder.label "Use Default">
+<!ENTITY button.defaultfolder.accesskey "d">
+<!ENTITY selectFolder.label         "Choose Folder">
+<!ENTITY addGroup.label             "Bookmark this group of tabs">
+<!ENTITY addGroup.accesskey         "B">
+
+
+

browser/components/bookmarks/locale/bm-props.dtd

@@ -0,0 +1,91 @@
+<!-- 
+   - The contents of this file are subject to the Mozilla 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/MPL/
+   - 
+   - 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.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp. Portions created by Netscape Communications
+   - Corp. are Copyright (C) 1999 Netscape Communications Corp. All
+   - Rights Reserved.
+   - 
+   - Contributor(s): Stephen Lamm          <slamm@netscape.com>
+   -                 Robert John Churchill <rjc@netscape.com>
+   -                 Ben Goodger           <ben@netscape.com>
+  --> 
+
+<!ENTITY bookmarks.windowtitle.label  "Properties for &quot;**bm_title**&quot;">
+
+<!ENTITY generalInfo.label            "Info">
+<!ENTITY generalInfo.accesskey        "i">
+
+<!ENTITY schedule.label               "Schedule">
+<!ENTITY schedule.accesskey           "s">
+<!ENTITY schedule.description         "&brandShortName; can check this site for updates and notify you when one occurs. Use these settings to customize the schedule for this Bookmark.">
+<!ENTITY notification.label           "Notify">
+<!ENTITY notification.accesskey       "n">
+<!-- ICK. fix me -->
+<!ENTITY notification.description     "&brandShortName; will notify you when this site changes. Use these settings to customize notification.">
+
+<!ENTITY bookmarks.information.label  "Information:">
+<!ENTITY bookmarks.name.label         "Name:">
+<!ENTITY bookmarks.location.label     "Location:">
+<!ENTITY bookmarks.shortcut.label     "Keyword:">
+<!ENTITY bookmarks.description.label  "Description:">
+
+<!ENTITY checkforupdates.legend.label "Check this location for updates:">
+<!ENTITY when.label                   "When:">
+<!ENTITY from.label                   "from:">
+<!ENTITY to.label                     "to: ">
+<!ENTITY every.label                  "every">
+<!ENTITY minutes.label                "minute(s)">
+<!ENTITY notifications.legend.label   "Notification:">
+
+<!ENTITY checknever.label             "Never">
+<!ENTITY checkeveryday.label          "Every day">
+<!ENTITY checkweekdays.label          "Weekdays">
+<!ENTITY checkweekends.label          "Weekends">
+<!ENTITY checkmondays.label           "Mondays">
+<!ENTITY checktuesdays.label          "Tuesdays">
+<!ENTITY checkwednesdays.label        "Wednesdays">
+<!ENTITY checkthursdays.label         "Thursdays">
+<!ENTITY checkfridays.label           "Fridays">
+<!ENTITY checksaturdays.label         "Saturdays">
+<!ENTITY checksundays.label           "Sundays">
+
+<!ENTITY midnight.label               "Midnight">
+<!ENTITY AMone.label                  "1 AM">
+<!ENTITY AMtwo.label                  "2 AM">
+<!ENTITY AMthree.label                "3 AM">
+<!ENTITY AMfour.label                 "4 AM">
+<!ENTITY AMfive.label                 "5 AM">
+<!ENTITY AMsix.label                  "6 AM">
+<!ENTITY AMseven.label                "7 AM">
+<!ENTITY AMeight.label                "8 AM">
+<!ENTITY AMnine.label                 "9 AM">
+<!ENTITY AMten.label                  "10 AM">
+<!ENTITY AMeleven.label               "11 AM">
+<!ENTITY noon.label                   "Noon">
+<!ENTITY PMone.label                  "1 PM">
+<!ENTITY PMtwo.label                  "2 PM">
+<!ENTITY PMthree.label                "3 PM">
+<!ENTITY PMfour.label                 "4 PM">
+<!ENTITY PMfive.label                 "5 PM">
+<!ENTITY PMsix.label                  "6 PM">
+<!ENTITY PMseven.label                "7 PM">
+<!ENTITY PMeight.label                "8 PM">
+<!ENTITY PMnine.label                 "9 PM">
+<!ENTITY PMten.label                  "10 PM">
+<!ENTITY PMeleven.label               "11 PM">
+
+<!ENTITY notification.icon.label      "Change the bookmark's icon">
+<!ENTITY notification.sound.label     "Play a sound">
+<!ENTITY notification.alert.label     "Display an alert">
+<!ENTITY notification.window.label    "Open web page in a new window">

browser/components/bookmarks/locale/bookmark.properties

@@ -0,0 +1,88 @@
+# 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.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation. Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+description_Bookmark = %brandShortName% can remember web page locations for you. Type the page name and location in the fields below, then click OK. Select the page from the Bookmarks menu or your Bookmarks Sidebar tab to visit the page.
+description_Folder = %brandShortName% can organize your bookmarks into specific folders. Type the folder name and an optional comment below, then click OK.
+description_FolderGroup = %brandShortName% can bookmark a group of web pages. Type a group name and an optional comment in the field below, then click OK. Select the group from the Bookmark menu or your Bookmarks Sidebar tab to open each page in a separate Navigator tab.
+description_PersonalToolbarFolder = Folders and bookmarks in this folder appear on the Personal Toolbar.
+description_NewBookmarkFolder = Newly created bookmarks will be stored here by default.
+description_NewSearchFolder = Search results will be stored here by default.
+description_NewBookmarkAndSearchFolder = Newly created bookmarks and search results will be stored here by default.
+
+cmd_bm_open = Open
+cmd_bm_openfolder = Expand
+cmd_bm_openfolder2 = Collapse
+cmd_bm_find = Find a Bookmark...
+cmd_bm_cut = Cut
+cmd_bm_copy = Copy
+cmd_bm_paste = Paste
+cmd_bm_delete = Delete
+cmd_bm_selectAll = Select All
+cmd_bm_rename = Rename...
+cmd_bm_renamebookmark2 = Change Location...
+cmd_bm_properties = Properties
+cmd_bm_fileBookmark = File Bookmark(s)...
+
+cmd_bm_openinnewwindow = Open in New Window
+cmd_bm_newfolder = New Folder...
+cmd_bm_newbookmark = New Bookmark...
+cmd_bm_newseparator = New Separator
+cmd_bm_setnewbookmarkfolder = Set as New Bookmark folder
+cmd_bm_setpersonaltoolbarfolder = Set as Personal Toolbar folder
+cmd_bm_setnewsearchfolder = Set as Saved Search Results folder
+
+ile_newfolder = New Folder
+ile_newbookmark = New Bookmark
+newfolder_dialog_title = Create New Folder
+newfolder_dialog_msg = Create a New Folder named:
+
+window_title = %folder_name% - Bookmarks
+search_results_title = Search Results
+
+file_in = File in "%folder_name%"
+
+bookmarks_root = Bookmarks for %user_name%
+status_foldercount = %num_items% object(s)
+
+WebPageUpdated = The following web page has been updated:
+WebPageTitle = Title:
+WebPageURL = URL:
+WebPageAskDisplay = Would you like to display it?
+WebPageAskStopOption = Stop checking for updates on this web page
+
+pleaseEnterALocation = Please enter a location
+pleaseEnterADuration = Please enter a duration.
+pleaseSelectANotification = Please enter at least one notification method.
+
+SortMenuItem = Sorted by %NAME%
+
+ShortFindTitle = Find: '%S'
+FindTitle = Find: %S %S '%S' in %S
+
+ImportedIEFavorites = Imported IE Favorites                                     
+ImportedIEStaticFavorites = Imported IE Favorites
+ImportedNetPositiveBookmarks = Imported NetPositive Bookmarks                   
+DefaultPersonalToolbarFolder = Personal Toolbar Folder                          
+
+SelectImport = Import bookmark file:                                            
+EnterExport = Export bookmark file:                                             
+
+search_button_label = Find
+

browser/components/bookmarks/locale/bookmarks.dtd

@@ -0,0 +1,89 @@
+<!-- 
+   - The contents of this file are subject to the Mozilla 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/MPL/
+   - 
+   - 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.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp. Portions created by Netscape Communications
+   - Corp. are Copyright (C) 1999 Netscape Communications Corp. All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Stephen Lamm <slamm@netscape.com>
+   -   Blake Ross <blakeross@telocity.com>
+  --> 
+
+<!-- extracted from ./bookmarks.xul -->
+<!ENTITY menuBar.tooltip               "Menu Bar">
+<!ENTITY bookmarkToolbar.tooltip       "Bookmark Toolbar">
+<!ENTITY menuitem.newBookmark.label    "New Bookmark...">
+<!ENTITY command.newBookmark.accesskey "B">
+<!ENTITY button.newFolder.label        "New Folder...">
+<!ENTITY command.newFolder.accesskey   "F">
+<!ENTITY button.newSeparator.label     "New Separator">
+<!ENTITY command.newSeparator.accesskey "S">
+<!ENTITY menuitem.import.label         "Import...">
+<!ENTITY menuitem.import.accesskey     "i">
+<!ENTITY menuitem.export.label         "Export...">
+<!ENTITY menuitem.export.accesskey     "e">
+<!ENTITY menuitem.find.label           "Search Bookmarks...">
+<!ENTITY command.findBookmarks.label   "Search...">
+<!ENTITY menuitem.find.accesskey       "S">
+<!ENTITY edit.find.keybinding          "f">
+<!ENTITY command.properties.label      "Properties...">
+<!ENTITY command.properties.accesskey  "r">
+<!ENTITY edit.properties.keybinding    "i">
+<!ENTITY command.rename.label          "Rename...">
+<!ENTITY command.delete.label          "Delete">
+<!ENTITY command.fileBookmark.label    "File Bookmark(s)...">
+<!ENTITY command.fileBookmark.accesskey "l">
+<!ENTITY command.addBookmark.label     "Add...">
+<!ENTITY command.manageBookmarks.label "Manage">
+
+
+<!ENTITY menuitem.view.command.toolbar.label        "Toolbar">
+<!ENTITY menuitem.view.command.toolbar.accesskey    "t">
+<!ENTITY menuitem.view.unsorted.label               "Unsorted">
+<!ENTITY menuitem.view.unsorted.accesskey           "u">
+<!ENTITY menuitem.view.ascending.label              "A > Z Sort Order">
+<!ENTITY menuitem.view.ascending.accesskey          "a">
+<!ENTITY menuitem.view.descending.label             "Z > A Sort Order">
+<!ENTITY menuitem.view.descending.accesskey         "z">
+<!ENTITY menuitem.view.show_columns.label           "Show columns">
+<!ENTITY menuitem.view.show_columns.accesskey       "S">
+<!ENTITY menuitem.newbookmarkfolder.label           "Set as New Bookmark Folder">
+<!ENTITY menuitem.newbookmarkfolder.accesskey       "b">
+<!ENTITY menuitem.newinternetsearchfolder.label     "Set as New Internet Search Folder">
+<!ENTITY menuitem.newinternetsearchfolder.accesskey "i">
+<!ENTITY menuitem.personaltoolbarfolder.label       "Set as Personal Toolbar Folder">
+<!ENTITY menuitem.personaltoolbarfolder.accesskey   "p">
+
+<!ENTITY treecol.name.label             "Name">
+<!ENTITY treecol.name.accesskey         "n">
+<!ENTITY treecol.url.label              "Location">
+<!ENTITY treecol.url.accesskey          "l">
+<!ENTITY treecol.shortcut.label         "Keyword">
+<!ENTITY treecol.shortcut.accesskey     "k">
+<!ENTITY treecol.addedon.label          "Added">
+<!ENTITY treecol.addedon.accesskey      "a">
+<!ENTITY treecol.lastmod.label          "Last Modified">
+<!ENTITY treecol.lastmod.accesskey      "m">
+<!ENTITY treecol.lastvisit.label        "Last Visited">
+<!ENTITY treecol.lastvisit.accesskey    "b">
+<!ENTITY treecol.description.label      "Description">
+<!ENTITY treecol.description.accesskey  "d">
+
+<!ENTITY bookmarksWindowTitle.label     "Bookmark Manager">
+
+<!ENTITY find.label                     "Find">
+<!ENTITY find.accesskey                 "F">
+<!ENTITY fileMenu.label                 "File">
+<!ENTITY fileMenu.accesskey             "F">

browser/components/bookmarks/locale/bookmarksOverlay.dtd

@@ -0,0 +1,22 @@
+
+<!ENTITY  findABookmark.label               "Find a Bookmark...">
+<!ENTITY  findABookmark.accesskey           "f">
+<!ENTITY  newBookmark.label                 "New Bookmark...">
+<!ENTITY  newBookmark.accesskey             "n">
+<!ENTITY  newFolder.label                   "New Folder...">
+<!ENTITY  newFolder.accesskey               "e">
+<!ENTITY  newSeparator.label                "New Separator">
+<!ENTITY  newSeparator.accesskey            "s">
+<!ENTITY  setAsNewBookmarkFolder.label      "Set as new Bookmark folder">
+<!ENTITY  setAsNewBookmarkFolder.accesskey  "b">
+<!ENTITY  setAsNewSearchFolder.label        "Set as new Search Results folder">
+<!ENTITY  setAsNewSearchFolder.accesskey    "r">
+<!ENTITY  setAsNewToolbarFolder.label       "Set as new Personal Toolbar folder">
+<!ENTITY  setAsNewToolbarFolder.accesskey   "p">
+<!ENTITY  exportBookmarks.label             "Export...">
+<!ENTITY  exportBookmarks.accesskey         "x">
+<!ENTITY  importBookmarks.label             "Import...">
+<!ENTITY  importBookmarks.accesskey         "i">
+
+
+

browser/components/bookmarks/locale/findBookmark.dtd

@@ -0,0 +1,15 @@
+
+<!ENTITY search.name.label              "name">
+<!ENTITY search.url.label               "location">
+<!ENTITY search.shortcut.label          "keyword">
+<!ENTITY search.description.label       "description">
+<!ENTITY search.startswith.label        "starts with">
+<!ENTITY search.endswith.label          "ends with">
+<!ENTITY search.is.label                "is">
+<!ENTITY search.isnot.label             "is not">
+<!ENTITY search.contains.label          "contains">
+<!ENTITY search.doesntcontain.label     "doesn't contain">
+<!ENTITY save.query.label               "Save query in bookmarks">
+<!ENTITY search.for.label               "Find Bookmarks whose">
+<!ENTITY findBookmark.title             "Find Bookmarks">
+

browser/components/bookmarks/locale/pref-bookmarks.dtd

@@ -0,0 +1,13 @@
+
+<!ENTITY  lHeader                       "Bookmarks">
+<!ENTITY  filingBookmarks.label         "Adding Bookmarks">
+<!ENTITY  autoFile.label                "&brandShortName; will ask you to choose a title and folder when adding a new Bookmark.">
+<!ENTITY  enableAutoFile.label          "Automatically set title and destination">
+<!ENTITY  defaultFolder.label           "By default, all new Bookmarks will be added into this folder:">
+<!ENTITY  chooseDefaultFolder.label     "Choose Folder...">
+<!ENTITY  chooseDefaultFolder.accesskey "c">
+<!ENTITY  extendedDataViews.label       "Extended Data Views">
+<!ENTITY  extendedDataExplanation.label "&brandShortName; can display some types of special data (e.g. local file folders and ftp directories) in the bookmarks window or menu as folders, rather than as normal links.">
+<!ENTITY  showExtendedData.label        "Show Extended Data as folders in the Bookmarks window and menu">
+<!ENTITY  showExtendedData.accesskey    "x">
+