From 22725f01ff9b0000e06a84b6b1a4942739adadd3 Mon Sep 17 00:00:00 2001
From: "rjc%netscape.com" <rjc%netscape.com>
Date: Tue, 23 Nov 1999 01:03:30 +0000
Subject: [PATCH] Add support for sorting in-between separators.  Restoring all
 bookmark columns (per marketing).

---
 .../bookmarks/resources/bookmarks.xul         | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/xpfe/components/bookmarks/resources/bookmarks.xul b/xpfe/components/bookmarks/resources/bookmarks.xul
index bffc04950e2..c6264ced029 100644
--- a/xpfe/components/bookmarks/resources/bookmarks.xul
+++ b/xpfe/components/bookmarks/resources/bookmarks.xul
@@ -89,9 +89,13 @@
       <treechildren>
        <treeitem uri="..." rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" loading="rdf:http://home.netscape.com/NC-rdf#loading">
          <treerow>
-           <treecell>
-             <html:hr width="75%" align="center" size="1" />
-           </treecell>
+           <treecell><html:hr width="100%" align="center" size="1" /></treecell>
+           <treecell><html:hr width="100%" align="center" size="1" /></treecell>
+           <treecell><html:hr width="100%" align="center" size="1" /></treecell>
+           <treecell><html:hr width="100%" align="center" size="1" /></treecell>
+           <treecell><html:hr width="100%" align="center" size="1" /></treecell>
+           <treecell><html:hr width="100%" align="center" size="1" /></treecell>
+           <treecell><html:hr width="100%" align="center" size="1" /></treecell>
          </treerow>
        </treeitem>  		
       </treechildren>
@@ -103,40 +107,34 @@
          <treerow>
            <treecell indent="true" value="rdf:http://home.netscape.com/NC-rdf#Name"/>
            <treecell value="rdf:http://home.netscape.com/NC-rdf#URL"/>
-<!-- Comment out extra columns for beta
            <treecell value="rdf:http://home.netscape.com/NC-rdf#ShortcutURL"/>
            <treecell value="rdf:http://home.netscape.com/NC-rdf#Description"/>
            <treecell value="rdf:http://home.netscape.com/WEB-rdf#LastVisitDate"/>
            <treecell value="rdf:http://home.netscape.com/NC-rdf#BookmarkAddDate"/>
            <treecell value="rdf:http://home.netscape.com/WEB-rdf#LastModifiedDate"/>
--->
          </treerow>
        </treeitem>
       </treechildren>
      </rule>
   </template>
 
-  <treecol persist="width" id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
-  <treecol persist="width" id="URLColumn" rdf:resource="http://home.netscape.com/NC-rdf#URL"/>
-<!-- Comment out extra columns for beta
-  <treecol persist="width" id="ShortcutURLColumn" rdf:resource="http://home.netscape.com/NC-rdf#ShortcutURL"/>
-  <treecol persist="width" id="DescriptionColumn" rdf:resource="http://home.netscape.com/NC-rdf#Description"/>
-  <treecol persist="width" id="LastVisitColumn" rdf:resource="http://home.netscape.com/WEB-rdf#LastVisitDate"/>
-  <treecol persist="width" id="AddedOnColumn" rdf:resource="http://home.netscape.com/NC-rdf#BookmarkAddDate"/>
-  <treecol persist="width" id="LastModColumn" rdf:resource="http://home.netscape.com/WEB-rdf#LastModifiedDate"/>
--->
+  <treecol persist="width" id="NameColumn" sortSeparators="true" rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
+  <treecol persist="width" id="URLColumn" sortSeparators="true" rdf:resource="http://home.netscape.com/NC-rdf#URL"/>
+  <treecol persist="width" id="ShortcutURLColumn" sortSeparators="true" rdf:resource="http://home.netscape.com/NC-rdf#ShortcutURL"/>
+  <treecol persist="width" id="DescriptionColumn" sortSeparators="true" rdf:resource="http://home.netscape.com/NC-rdf#Description"/>
+  <treecol persist="width" id="LastVisitColumn" sortSeparators="true" rdf:resource="http://home.netscape.com/WEB-rdf#LastVisitDate"/>
+  <treecol persist="width" id="AddedOnColumn" sortSeparators="true" rdf:resource="http://home.netscape.com/NC-rdf#BookmarkAddDate"/>
+  <treecol persist="width" id="LastModColumn" sortSeparators="true" rdf:resource="http://home.netscape.com/WEB-rdf#LastModifiedDate"/>
 
   <treehead>
     <treerow>
       <treecell value="&tree.header.name.label;" onclick="return doSort('NameColumn');" observes="NameColumn" />
       <treecell value="&tree.header.url.label;" onclick="return doSort('URLColumn');" observes="URLColumn" />
-<!-- Comment out extra columns for beta
       <treecell value="&tree.header.shortcut.label;" onclick="return doSort('ShortcutURLColumn');" observes="ShortcutURLColumn" />
       <treecell value="&tree.header.description.label;" onclick="return doSort('DescriptionColumn');" observes="DescriptionColumn" />
       <treecell value="&tree.header.lastvisit.label;" onclick="return doSort('LastVisitColumn');" observes="LastVisitColumn" />
       <treecell value="&tree.header.addedon.label;" onclick="return doSort('AddedOnColumn');" observes="AddedOnColumn" />
       <treecell value="&tree.header.lastmod.label;" onclick="return doSort('LastModColumn');" observes="LastModColumn" />
--->
     </treerow>
   </treehead>
 </tree>