From 96c34220783998b38069ecc1b99f023ad4fc2b65 Mon Sep 17 00:00:00 2001
From: "varga%netscape.com"
 <varga%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 25 Mar 2003 04:44:31 +0000
Subject: [PATCH] Landing bookmarks branch. Everything except mozilla/xpfe Bug
 196756 - Meta bug for major architectural changes in bookmarks code r=jag,
 sr=bryner

git-svn-id: svn://10.0.0.236/trunk@140214 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/shared/public/nsXULAtomList.h |  9 ---
 .../xul/templates/src/nsXULTreeBuilder.cpp    | 12 +--
 .../help/resources/content/help.xul           |  2 +-
 .../communicator/locale/bookmarks/bm-find.dtd | 58 --------------
 .../communicator/locale/bookmarks/bm-find.dtd | 58 --------------
 mozilla/layout/xul/base/src/nsBox.cpp         | 10 ++-
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp | 77 +++++++++++++++----
 .../xul/base/src/tree/src/nsTreeBodyFrame.h   |  8 +-
 .../resources/content/abMailListDialog.js     | 10 ---
 .../resources/content/mailWindowOverlay.xul   |  2 +-
 mozilla/netwerk/test/jarlist.dat              |  2 +-
 mozilla/profile/defaults/bookmarks.html       | 14 ++--
 .../communicator/bookmarks/bookmarks.css      | 13 ++++
 .../communicator/bookmarks/bookmarks.css      | 13 ++++
 14 files changed, 114 insertions(+), 174 deletions(-)
 delete mode 100644 mozilla/l10n/langpacks/en-DE/chrome/en-DE/communicator/locale/bookmarks/bm-find.dtd
 delete mode 100644 mozilla/l10n/langpacks/en-GB/chrome/en-GB/communicator/locale/bookmarks/bm-find.dtd

diff --git a/mozilla/content/shared/public/nsXULAtomList.h b/mozilla/content/shared/public/nsXULAtomList.h
index 6fab0fd502b..a2846e1ade4 100644
--- a/mozilla/content/shared/public/nsXULAtomList.h
+++ b/mozilla/content/shared/public/nsXULAtomList.h
@@ -191,17 +191,8 @@ XUL_ATOM(columns, "columns")
 XUL_ATOM(row, "row")
 XUL_ATOM(column, "column")
 
-// toolbar & toolbar d&d atoms
-XUL_ATOM(ddDropLocation, "dd-droplocation")
-XUL_ATOM(ddDropLocationCoord, "dd-droplocationcoord")
-XUL_ATOM(ddDropOn, "dd-dropon")
-XUL_ATOM(ddTriggerRepaintSorted, "dd-triggerrepaintsorted")
-XUL_ATOM(ddTriggerRepaintRestore, "dd-triggerrepaintrestore")
-XUL_ATOM(ddTriggerRepaint, "dd-triggerrepaint")
-XUL_ATOM(ddNoDropBetweenRows, "dd-nodropbetweenrows")
 XUL_ATOM(container, "container")
 XUL_ATOM(leaf,"leaf")
-XUL_ATOM(ddDragDropArea, "dragdroparea")
 
 XUL_ATOM(widget, "widget")
 XUL_ATOM(window, "window")
diff --git a/mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp b/mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp
index 54d749ced40..9ee803822ad 100644
--- a/mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp
+++ b/mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp
@@ -865,8 +865,8 @@ nsXULTreeBuilder::ToggleOpenState(PRInt32 aIndex)
     }
     
     if (mPersistStateStore) {
-        nsTreeRows::iterator iter = mRows[aIndex];
-        PRBool isOpen = iter->mContainerState == nsTreeRows::eContainerState_Open;
+        PRBool isOpen;
+        IsContainerOpen(aIndex, &isOpen);
 
         nsIRDFResource* container = GetResourceFor(aIndex);
         if (! container)
@@ -1178,13 +1178,7 @@ nsXULTreeBuilder::ReplaceMatch(nsIRDFResource* aMember,
             // Use the persist store to remember if the container
             // is open or closed.
             PRBool open = PR_FALSE;
-
-            if (mPersistStateStore)
-                mPersistStateStore->HasAssertion(container,
-                                                 nsXULContentUtils::NC_open,
-                                                 nsXULContentUtils::true_,
-                                                 PR_TRUE,
-                                                 &open);
+            IsContainerOpen(row, &open);
 
             // If it's open, make sure that we've got a subtree structure ready.
             if (open)
diff --git a/mozilla/extensions/help/resources/content/help.xul b/mozilla/extensions/help/resources/content/help.xul
index 4d139b32930..b3fc69aeca2 100644
--- a/mozilla/extensions/help/resources/content/help.xul
+++ b/mozilla/extensions/help/resources/content/help.xul
@@ -32,7 +32,7 @@
   <script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
 
diff --git a/mozilla/l10n/langpacks/en-DE/chrome/en-DE/communicator/locale/bookmarks/bm-find.dtd b/mozilla/l10n/langpacks/en-DE/chrome/en-DE/communicator/locale/bookmarks/bm-find.dtd
deleted file mode 100644
index b5ff07a7f01..00000000000
--- a/mozilla/l10n/langpacks/en-DE/chrome/en-DE/communicator/locale/bookmarks/bm-find.dtd
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- 
-   - 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.
-   - 
-   - Original Author(s):
-   -    Robert John Churchill    <rjc@netscape.com>
-   -
-   - Contributor(s):
-  --> 
-
-<!ENTITY menu.file.label                "File">
-<!ENTITY menuitem.close.label           "Close">
-
-<!ENTITY menu.edit.label                "Edit">
-<!ENTITY menuitem.undo.label            "Undo">
-<!ENTITY menuitem.redo.label            "Redo">
-<!ENTITY menuitem.cut.label             "Cut">
-<!ENTITY menuitem.copy.label            "Copy">
-<!ENTITY menuitem.paste.label           "Paste">
-<!ENTITY menuitem.delete.label          "Delete">
-<!ENTITY menuitem.selectAll.label       "Select All">
-
-<!ENTITY window.title.label             "Find">
-
-<!ENTITY search1.label                  "Find items in ">
-<!ENTITY search2.label                  " whose ">
-
-<!ENTITY search.button.label            "Find">
-<!ENTITY save.button.label              "Bookmark Find Query">
-
-<!ENTITY bookmarks.label                "Bookmarks">
-<!ENTITY history.label                  "History">
-
-<!ENTITY name.label                     "Name">
-<!ENTITY url.label                      "URL">
-<!ENTITY shortcut.label                 "Custom Keyword">
-<!ENTITY description.label              "Description">
-
-<!ENTITY contains.label                 "contains">
-<!ENTITY startswith.label               "starts with">
-<!ENTITY endswith.label                 "ends with">
-<!ENTITY is.label                       "is">
-<!ENTITY isnot.label                    "is not">
-<!ENTITY doesntcontain.label            "doesn't contain">
diff --git a/mozilla/l10n/langpacks/en-GB/chrome/en-GB/communicator/locale/bookmarks/bm-find.dtd b/mozilla/l10n/langpacks/en-GB/chrome/en-GB/communicator/locale/bookmarks/bm-find.dtd
deleted file mode 100644
index b5ff07a7f01..00000000000
--- a/mozilla/l10n/langpacks/en-GB/chrome/en-GB/communicator/locale/bookmarks/bm-find.dtd
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- 
-   - 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.
-   - 
-   - Original Author(s):
-   -    Robert John Churchill    <rjc@netscape.com>
-   -
-   - Contributor(s):
-  --> 
-
-<!ENTITY menu.file.label                "File">
-<!ENTITY menuitem.close.label           "Close">
-
-<!ENTITY menu.edit.label                "Edit">
-<!ENTITY menuitem.undo.label            "Undo">
-<!ENTITY menuitem.redo.label            "Redo">
-<!ENTITY menuitem.cut.label             "Cut">
-<!ENTITY menuitem.copy.label            "Copy">
-<!ENTITY menuitem.paste.label           "Paste">
-<!ENTITY menuitem.delete.label          "Delete">
-<!ENTITY menuitem.selectAll.label       "Select All">
-
-<!ENTITY window.title.label             "Find">
-
-<!ENTITY search1.label                  "Find items in ">
-<!ENTITY search2.label                  " whose ">
-
-<!ENTITY search.button.label            "Find">
-<!ENTITY save.button.label              "Bookmark Find Query">
-
-<!ENTITY bookmarks.label                "Bookmarks">
-<!ENTITY history.label                  "History">
-
-<!ENTITY name.label                     "Name">
-<!ENTITY url.label                      "URL">
-<!ENTITY shortcut.label                 "Custom Keyword">
-<!ENTITY description.label              "Description">
-
-<!ENTITY contains.label                 "contains">
-<!ENTITY startswith.label               "starts with">
-<!ENTITY endswith.label                 "ends with">
-<!ENTITY is.label                       "is">
-<!ENTITY isnot.label                    "is not">
-<!ENTITY doesntcontain.label            "doesn't contain">
diff --git a/mozilla/layout/xul/base/src/nsBox.cpp b/mozilla/layout/xul/base/src/nsBox.cpp
index 608602dc885..50e11f1d1cf 100644
--- a/mozilla/layout/xul/base/src/nsBox.cpp
+++ b/mozilla/layout/xul/base/src/nsBox.cpp
@@ -1314,12 +1314,14 @@ nsIBox::AddCSSMinSize(nsBoxLayoutState& aState, nsIBox* aBox, nsSize& aSize)
                                       display->mAppearance, &size, &canOverride);
           float p2t;
           aState.GetPresContext()->GetScaledPixelsToTwips(&p2t);
-          aSize.width = NSIntPixelsToTwips(size.width, p2t);
-          aSize.height = NSIntPixelsToTwips(size.height, p2t);
-          if (aSize.width)
+          if (size.width) {
+            aSize.width = NSIntPixelsToTwips(size.width, p2t);
             widthSet = PR_TRUE;
-          if (aSize.height)
+          }
+          if (size.height) {
+            aSize.height = NSIntPixelsToTwips(size.height, p2t);
             heightSet = PR_TRUE;
+          }
         }
       }
     }
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 8d7ba0e6b09..68d0a9a07ab 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -422,7 +422,7 @@ nsTreeBodyFrame::Init(nsIPresContext* aPresContext, nsIContent* aContent,
 }
 
 NS_IMETHODIMP
-nsTreeBodyFrame::GetPrefSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize)
+nsTreeBodyFrame::GetMinSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize)
 {
   EnsureView();
 
@@ -441,8 +441,10 @@ nsTreeBodyFrame::GetPrefSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize)
       desiredRows = size.ToInteger(&err);
       mHasFixedRowCount = PR_TRUE;
       mPageCount = desiredRows;
-    } else
+    }
+    else {
       desiredRows = 1;
+    }
   } else {
     // tree
     aSize.width = 0;
@@ -453,15 +455,17 @@ nsTreeBodyFrame::GetPrefSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize)
       desiredRows = rows.ToInteger(&err);
       mHasFixedRowCount = PR_TRUE;
       mPageCount = desiredRows;
-    } else
+    }
+    else {
       desiredRows = 0;
+    }
   }
 
   aSize.height = mRowHeight * desiredRows;
 
   AddBorderAndPadding(aSize);
   AddInset(aSize);
-  nsIBox::AddCSSPrefSize(aBoxLayoutState, this, aSize);
+  nsIBox::AddCSSMinSize(aBoxLayoutState, this, aSize);
 
   return NS_OK;
 }
@@ -2324,6 +2328,32 @@ nsTreeBodyFrame::PaintRow(PRInt32              aRowIndex,
   if (isSeparator) {
     // The row is a separator. Paint only a double horizontal line.
 
+    // Find the primary cell.
+    nscoord currX, primaryX1, primaryX2;
+    currX = primaryX1 = primaryX2 = rowRect.x;
+    for (nsTreeColumn* currCol = mColumns; currCol && currX < mInnerBox.x+mInnerBox.width;
+         currCol = currCol->GetNext()) {
+      if (currCol->IsPrimary()) {
+        nsRect cellRect(currX, rowRect.y, currCol->GetWidth(), rowRect.height);
+        PRInt32 overflow = cellRect.x+cellRect.width-(mInnerBox.x+mInnerBox.width);
+        if (overflow > 0)
+          cellRect.width -= overflow;
+        nsRect dirtyRect;
+        if (dirtyRect.IntersectRect(aDirtyRect, cellRect))
+          PaintCell(aRowIndex, currCol, cellRect, aPresContext, aRenderingContext, aDirtyRect, primaryX2); 
+
+        primaryX1 = currX;
+        PRInt32 level;
+        mView->GetLevel(aRowIndex, &level);
+        if (level == 0) {
+          primaryX1 += mIndentation;
+        }
+
+        break;
+      }
+      currX += currCol->GetWidth();
+    }
+
     // Resolve style for the separator.
     nsStyleContext* separatorContext = GetPseudoStyleContext(nsCSSAnonBoxes::moztreeseparator);
     PRBool useTheme = PR_FALSE;
@@ -2336,9 +2366,17 @@ nsTreeBodyFrame::PaintRow(PRInt32              aRowIndex,
     }
 
     // use -moz-appearance if provided.
-    if ( useTheme ) 
-      theme->DrawWidgetBackground(&aRenderingContext, this, 
-                                    displayData->mAppearance, rowRect, aDirtyRect); 
+    if (useTheme) {
+      if (primaryX1 > rowRect.x) {
+        // XXX We should draw the left side of the native separator here.
+        // The problem is that Mac native theme implementation is too smart
+        // and draws a vertical line if the separator is too narrow.
+      }
+      rowRect.width -= primaryX2 - rowRect.x;
+      rowRect.x = primaryX2;
+      theme->DrawWidgetBackground(&aRenderingContext, this,
+                                  displayData->mAppearance, rowRect, aDirtyRect); 
+    }
     else {
       // Get border style
       const nsStyleBorder* borderStyle = (const nsStyleBorder*)separatorContext->GetStyleData(eStyleStruct_Border);
@@ -2356,7 +2394,10 @@ nsTreeBodyFrame::PaintRow(PRInt32              aRowIndex,
         style = borderStyle->GetBorderStyle(side);
         aRenderingContext.SetLineStyle(ConvertBorderStyleToLineStyle(style));
 
-        aRenderingContext.DrawLine(rowRect.x, currY, rowRect.x + rowRect.width, currY);
+        if (primaryX1 > rowRect.x) {
+          aRenderingContext.DrawLine(rowRect.x, currY, primaryX1, currY);
+        }
+        aRenderingContext.DrawLine(primaryX2, currY, rowRect.x + rowRect.width, currY);
 
         side = NS_SIDE_BOTTOM;
         currY += 16;
@@ -2376,8 +2417,9 @@ nsTreeBodyFrame::PaintRow(PRInt32              aRowIndex,
       if (overflow > 0)
         cellRect.width -= overflow;
       nsRect dirtyRect;
+      nscoord dummy;
       if (dirtyRect.IntersectRect(aDirtyRect, cellRect))
-        PaintCell(aRowIndex, currCol, cellRect, aPresContext, aRenderingContext, aDirtyRect); 
+        PaintCell(aRowIndex, currCol, cellRect, aPresContext, aRenderingContext, aDirtyRect, dummy); 
       currX += currCol->GetWidth();
     }
   }
@@ -2391,7 +2433,8 @@ nsTreeBodyFrame::PaintCell(PRInt32              aRowIndex,
                            const nsRect&        aCellRect,
                            nsIPresContext*      aPresContext,
                            nsIRenderingContext& aRenderingContext,
-                           const nsRect&        aDirtyRect)
+                           const nsRect&        aDirtyRect,
+                           nscoord&             aCurrX)
 {
   if (aCellRect.width == 0)
     return NS_OK; // Don't paint cells in hidden columns.
@@ -2539,7 +2582,7 @@ nsTreeBodyFrame::PaintCell(PRInt32              aRowIndex,
     if (dirtyRect.IntersectRect(aDirtyRect, elementRect)) {
       switch (aColumn->GetType()) {
         case nsTreeColumn::eText:
-          PaintText(aRowIndex, aColumn, elementRect, aPresContext, aRenderingContext, aDirtyRect);
+          PaintText(aRowIndex, aColumn, elementRect, aPresContext, aRenderingContext, aDirtyRect, currX);
           break;
         case nsTreeColumn::eCheckbox:
           PaintCheckbox(aRowIndex, aColumn, elementRect, aPresContext, aRenderingContext, aDirtyRect);
@@ -2554,7 +2597,7 @@ nsTreeBodyFrame::PaintCell(PRInt32              aRowIndex,
               break;
             case nsITreeView::progressNone:
             default:
-              PaintText(aRowIndex, aColumn, elementRect, aPresContext, aRenderingContext, aDirtyRect);
+              PaintText(aRowIndex, aColumn, elementRect, aPresContext, aRenderingContext, aDirtyRect, currX);
               break;
           }
           break;
@@ -2562,6 +2605,8 @@ nsTreeBodyFrame::PaintCell(PRInt32              aRowIndex,
     }
   }
 
+  aCurrX = currX;
+
   return NS_OK;
 }
 
@@ -2767,7 +2812,8 @@ nsTreeBodyFrame::PaintText(PRInt32              aRowIndex,
                            const nsRect&        aTextRect,
                            nsIPresContext*      aPresContext,
                            nsIRenderingContext& aRenderingContext,
-                           const nsRect&        aDirtyRect)
+                           const nsRect&        aDirtyRect,
+                           nscoord&             aCurrX)
 {
   // Now obtain the text for our cell.
   nsAutoString text;
@@ -2922,6 +2968,11 @@ nsTreeBodyFrame::PaintText(PRInt32              aRowIndex,
   aRenderingContext.GetWidth(text, width);
   textRect.width = width;
 
+  // Subtract out the remaining width.
+  nsRect copyRect(textRect);
+  copyRect.Inflate(textMargin);
+  aCurrX += copyRect.width;
+
   textRect.Inflate(bp);
   PaintBackgroundLayer(textContext, aPresContext, aRenderingContext, textRect, aDirtyRect);
 
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h
index cc61d1065b3..f1e9d4d736c 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h
@@ -247,7 +247,7 @@ public:
   NS_DECL_NSITREEBOXOBJECT
 
   // nsIBox
-  NS_IMETHOD GetPrefSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize);
+  NS_IMETHOD GetMinSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize);
   NS_IMETHOD SetBounds(nsBoxLayoutState& aBoxLayoutState, const nsRect& aRect);
 
   // nsIReflowCallback
@@ -295,7 +295,8 @@ public:
                      const nsRect&        aCellRect,
                      nsIPresContext*      aPresContext,
                      nsIRenderingContext& aRenderingContext,
-                     const nsRect&        aDirtyRect);
+                     const nsRect&        aDirtyRect,
+                     nscoord&             aCurrX);
 
   // This method paints the twisty inside a cell in the primary column of an tree.
   nsresult PaintTwisty(PRInt32              aRowIndex,
@@ -323,7 +324,8 @@ public:
                      const nsRect&        aTextRect,
                      nsIPresContext*      aPresContext,
                      nsIRenderingContext& aRenderingContext,
-                     const nsRect&        aDirtyRect);
+                     const nsRect&        aDirtyRect,
+                     nscoord&             aCurrX);
 
   // This method paints the checkbox inside a particular cell of the tree.
   nsresult PaintCheckbox(PRInt32              aRowIndex, 
diff --git a/mozilla/mailnews/addrbook/resources/content/abMailListDialog.js b/mozilla/mailnews/addrbook/resources/content/abMailListDialog.js
index 0637220f628..e0c9c3eca7c 100644
--- a/mozilla/mailnews/addrbook/resources/content/abMailListDialog.js
+++ b/mozilla/mailnews/addrbook/resources/content/abMailListDialog.js
@@ -501,16 +501,6 @@ function DragOverAddressListTree(event)
 
   // XXX add support for other flavors here
   if (dragSession.isDataFlavorSupported("text/x-moz-address")) {
-    validFlavor = true;
-  }
-
-  // touch the attribute on the rowgroup to trigger the repaint with the drop feedback.
-  if (validFlavor)
-  {
-    //XXX this is really slow and likes to refresh N times per second.
-    var rowGroup = event.target.parentNode.parentNode;
-    if (rowGroup)
-      rowGroup.setAttribute ( "dd-triggerrepaint", 0 );
     dragSession.canDrop = true;
   }
 }
diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index 67616c46c8d..d35ca79ea0d 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -44,7 +44,7 @@ Rights Reserved.
 <script src="chrome://messenger/content/commandglue.js"/>
 <script src="chrome://messenger/content/mail-offline.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
-<script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+<script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
 
 <stringbundleset id="stringbundleset">
diff --git a/mozilla/netwerk/test/jarlist.dat b/mozilla/netwerk/test/jarlist.dat
index f5113681c9c..3b0165d27fb 100644
--- a/mozilla/netwerk/test/jarlist.dat
+++ b/mozilla/netwerk/test/jarlist.dat
@@ -206,7 +206,7 @@ jar:resource:///chrome/toolkit.jar!/content/global/bindings/outliner.xml
 jar:resource:///chrome/en-US.jar!/locale/en-US/navigator/navigator.properties
 jar:resource:///chrome/en-win.jar!/locale/en-US/navigator-platform/navigator.properties
 jar:resource:///chrome/en-US.jar!/locale/en-US/necko/necko.properties
-jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/bookmarks/bookmark.properties
+jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/bookmarks/bookmarks.properties
 jar:resource:///chrome/en-win.jar!/locale/en-US/global-platform/platformKeys.properties
 jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/utilityOverlay.properties
 jar:resource:///chrome/US.jar!/locale/US/navigator-region/region.properties
diff --git a/mozilla/profile/defaults/bookmarks.html b/mozilla/profile/defaults/bookmarks.html
index 585661f2bb7..66c7e4234cb 100644
--- a/mozilla/profile/defaults/bookmarks.html
+++ b/mozilla/profile/defaults/bookmarks.html
@@ -15,23 +15,23 @@ Do Not Edit! -->
     <HR>
     <DT><H3 ADD_DATE="961099767" LAST_MODIFIED="0">Mozilla Project</H3>
     <DL><p>
-        <DT><H3 ADD_DATE="961099767" LAST_MODIFIED="0" ID="NC:BookmarksRoot#$7a37f5df">mozilla.org</H3>
+        <DT><H3 ADD_DATE="961099767" LAST_MODIFIED="0">mozilla.org</H3>
         <DL><p>
             <DT><A HREF="http://www.mozilla.org/" ADD_DATE="961099870" LAST_VISIT="0" LAST_MODIFIED="0" LAST_CHARSET="ISO-8859-1">The Mozilla Organization</A>
             <DT><A HREF="http://www.mozilla.org/status/" ADD_DATE="961099993" LAST_VISIT="0" LAST_MODIFIED="0" LAST_CHARSET="ISO-8859-1">Weekly Status Update</A>
             <DT><A HREF="http://www.mozilla.org/feedback.html" ADD_DATE="961100017" LAST_VISIT="0" LAST_MODIFIED="0" LAST_CHARSET="ISO-8859-1">Feedback</A>
         </DL><p>
-        <DT><H3 ADD_DATE="961102203" LAST_MODIFIED="0" ID="NC:BookmarksRoot#$b742f58">Developer Information</H3>
+        <DT><H3 ADD_DATE="961102203" LAST_MODIFIED="0">Developer Information</H3>
         <DL><p>
             <DT><A HREF="http://www.mozilla.org/get-involved.html" ADD_DATE="961102879">Getting Involved</A>
             <DT><A HREF="http://www.mozilla.org/docs/" ADD_DATE="961102901">Documentation</A>
             <DT><A HREF="http://www.mozilla.org/source.html" ADD_DATE="961105505" LAST_VISIT="0" LAST_MODIFIED="0" LAST_CHARSET="ISO-8859-1">Download Source Code</A>
-            <DT><H3 ADD_DATE="961102925" LAST_MODIFIED="0" ID="NC:BookmarksRoot#$b742f59">Standards</H3>
+            <DT><H3 ADD_DATE="961102925" LAST_MODIFIED="0">Standards</H3>
             <DL><p>
                 <DT><A HREF="http://www.w3c.org/" ADD_DATE="961102978">World Wide Web Consortium</A>
                 <DT><A HREF="http://www.faqs.org/rfcs/" ADD_DATE="961104168">RFC Archive</A>
             </DL><p>
-            <DT><H3 ADD_DATE="961103100" LAST_MODIFIED="0" ID="NC:BookmarksRoot#$b742f5b">User interface design</H3>
+            <DT><H3 ADD_DATE="961103100" LAST_MODIFIED="0">User interface design</H3>
             <DL><p>
                 <DT><A HREF="http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-2.html" ADD_DATE="961104987">Macintosh Human Interface Guidelines</A>
                 <DT><A HREF="http://www-3.ibm.com/ibm/easy/eou_ext.nsf/Publish/561" ADD_DATE="961105043">IBM/Ease of Use/Design</A>
@@ -39,21 +39,21 @@ Do Not Edit! -->
                 <DT><A HREF="http://developer.kde.org/documentation/standards/kde/style/basics/" ADD_DATE="961105043">KDE User Interface Guidelines</A>
             </DL><p>
         </DL><p>
-        <DT><H3 ADD_DATE="961105105" LAST_MODIFIED="0" ID="NC:BookmarksRoot#$b8619366">Webtools</H3>
+        <DT><H3 ADD_DATE="961105105" LAST_MODIFIED="0">Webtools</H3>
         <DL><p>
             <DT><A HREF="http://lxr.mozilla.org/" ADD_DATE="961105149" LAST_VISIT="0" LAST_MODIFIED="0" LAST_CHARSET="ISO-8859-1">lxr - Mozilla Cross-Reference</A>
             <DT><A HREF="http://bonsai.mozilla.org/" ADD_DATE="961105218" LAST_MODIFIED="0">bonsai - CVS Tree Control</A>
             <DT><A HREF="http://tinderbox.mozilla.org/showbuilds.cgi" ADD_DATE="961105359">tinderbox - Tree Status</A>
             <DT><A HREF="http://bugzilla.mozilla.org/" ADD_DATE="961105401">bugzilla - Bug-Tracking System</A>
         </DL><p>
-        <DT><H3 ADD_DATE="961111855" LAST_MODIFIED="0" ID="NC:BookmarksRoot#$ebf1a63">Community</H3>
+        <DT><H3 ADD_DATE="961111855" LAST_MODIFIED="0">Community</H3>
         <DL><p>
             <DT><A HREF="http://www.mozilla.org/community.html" ADD_DATE="961111887" LAST_VISIT="0" LAST_MODIFIED="0">Newsgroups</A>
             <DT><A HREF="http://www.mozillazine.org/" ADD_DATE="961111887" LAST_VISIT="0" LAST_MODIFIED="0" LAST_CHARSET="ISO-8859-1">MozillaZine</A>
             <DT><A HREF="http://www.mozdev.org/" ADD_DATE="961112176" LAST_VISIT="0" LAST_MODIFIED="0" LAST_CHARSET="ISO-8859-1">Alphanumerica's Mozilla Development Projects</A>
             <DT><A HREF="http://www.gerbilbox.com/newzilla/" ADD_DATE="961112731">NewZilla - the Unofficial Netscape 6 and Mozilla FAQ</A>
         </DL><p>
-        <DT><H3 ADD_DATE="961106554" LAST_MODIFIED="0" ID="NC:BookmarksRoot#$ebf1a62">Third-Party Tools</H3>
+        <DT><H3 ADD_DATE="961106554" LAST_MODIFIED="0">Third-Party Tools</H3>
         <DL><p>
             <DT><A HREF="http://aphrodite.mozdev.org/total_recall.html" ADD_DATE="961106831">Crash Recovery - Alphanumerica's Total Recall</A>
         </DL><p>
diff --git a/mozilla/themes/classic/communicator/bookmarks/bookmarks.css b/mozilla/themes/classic/communicator/bookmarks/bookmarks.css
index 2c17b3e2107..6cc7aff1a2e 100644
--- a/mozilla/themes/classic/communicator/bookmarks/bookmarks.css
+++ b/mozilla/themes/classic/communicator/bookmarks/bookmarks.css
@@ -87,3 +87,16 @@ treechildren:-moz-tree-twisty(group,hidetwisty) {
 treechildren:-moz-tree-image(Name, container, group) {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-group.gif");
 }
+
+treechildren:-moz-tree-image(Name, separator) {
+  list-style-image: none;
+}
+
+treechildren:-moz-tree-cell-text(Name, separator) {
+  color: ThreeDShadow;
+  margin: 0px 5px 0px 5px;
+}
+
+treechildren:-moz-tree-cell-text(Name, separator, selected, focus) {
+  color: HighlightText;
+}
diff --git a/mozilla/themes/modern/communicator/bookmarks/bookmarks.css b/mozilla/themes/modern/communicator/bookmarks/bookmarks.css
index f6cb4e33367..e879cfbac90 100644
--- a/mozilla/themes/modern/communicator/bookmarks/bookmarks.css
+++ b/mozilla/themes/modern/communicator/bookmarks/bookmarks.css
@@ -71,3 +71,16 @@ treechildren:-moz-tree-twisty(group, hidetwisty) {
 treechildren:-moz-tree-image(Name, container, group) {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-group.gif");
 }
+
+treechildren:-moz-tree-image(Name, separator) {
+  list-style-image: none;
+}
+
+treechildren:-moz-tree-cell-text(Name, separator) {
+  color: #808080;
+  margin: 0px 5px 0px 5px;
+}
+
+treechildren:-moz-tree-cell-text(Name, separator, selected, focus) {
+  color: #FFFFFF;
+}