Remove incorrect 'rdf:' from 'rdf:resource', 'rdf:resource2' and 'rdf:containment'. Part of bug=53297, more to follow. r=rjc, a=waterson. This particular checkin should fix bug=52789 (column sorting in bookmarks and history) and bug=52547 (sidebar bookmarks panel not showing sort triangle).

suite/common/directory/directory.xul

@@ -59,15 +59,15 @@
       <treecolgroup>
         <treecol flex="1" id="FilenameColumn"
             sortActive="true" sortDirection="ascending"
-            rdf:resource="http://home.netscape.com/NC-rdf#Name" />
+            resource="http://home.netscape.com/NC-rdf#Name" />
         <splitter class="tree-splitter"/>
         <treecol flex="1" id="ContentLengthColumn"
-            rdf:resource="http://home.netscape.com/NC-rdf#Content-Length"
-            rdf:resource2="http://home.netscape.com/NC-rdf#Name"/>
+            resource="http://home.netscape.com/NC-rdf#Content-Length"
+            resource2="http://home.netscape.com/NC-rdf#Name"/>
         <splitter class="tree-splitter"/>
         <treecol flex="1" id="LastModColumn"
-            rdf:resource="http://home.netscape.com/WEB-rdf#LastModifiedDate"
-            rdf:resource2="http://home.netscape.com/NC-rdf#Name"/>
+            resource="http://home.netscape.com/WEB-rdf#LastModifiedDate"
+            resource2="http://home.netscape.com/NC-rdf#Name"/>
       </treecolgroup>
 
       <treehead>

suite/common/search/internetresults.xul

@@ -54,32 +54,32 @@
 		onselect="treeSelect(event);" onclick="treeClick(event);">
 
   <treecolgroup>
-    <treecol id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" flex="1"/>
+    <treecol id="NameColumn" resource="http://home.netscape.com/NC-rdf#Name" flex="1"/>
     <splitter class="tree-splitter"/>
-    <treecol id="PageRankColumn" rdf:resource="http://home.netscape.com/NC-rdf#PageRank"
-             rdf:resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
+    <treecol id="PageRankColumn" resource="http://home.netscape.com/NC-rdf#PageRank"
+             resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
     <splitter class="tree-splitter"/>
-    <treecol id="RelevanceColumn" rdf:resource="http://home.netscape.com/NC-rdf#Relevance"
-             rdf:resource2="http://home.netscape.com/NC-rdf#Name"
+    <treecol id="RelevanceColumn" resource="http://home.netscape.com/NC-rdf#Relevance"
+             resource2="http://home.netscape.com/NC-rdf#Name"
              style="width: 0; visibility: collapse;" flex="1"/>
     <splitter class="tree-splitter"/>
-    <treecol id="PriceColumn" rdf:resource="http://home.netscape.com/NC-rdf#Price"
-             rdf:resource2="http://home.netscape.com/NC-rdf#Availability"
+    <treecol id="PriceColumn" resource="http://home.netscape.com/NC-rdf#Price"
+             resource2="http://home.netscape.com/NC-rdf#Availability"
              style="width: 0; visibility: collapse;" flex="1"/>
     <splitter class="tree-splitter"/>
-    <treecol id="AvailabilityColumn" rdf:resource="http://home.netscape.com/NC-rdf#Availability"
-             rdf:resource2="http://home.netscape.com/NC-rdf#Price"
+    <treecol id="AvailabilityColumn" resource="http://home.netscape.com/NC-rdf#Availability"
+             resource2="http://home.netscape.com/NC-rdf#Price"
              style="width: 0; visibility: collapse;" flex="1"/>
     <splitter class="tree-splitter"/>
-    <treecol id="DateColumn" rdf:resource="http://home.netscape.com/NC-rdf#Date"
-             rdf:resource2="http://home.netscape.com/NC-rdf#Name"
+    <treecol id="DateColumn" resource="http://home.netscape.com/NC-rdf#Date"
+             resource2="http://home.netscape.com/NC-rdf#Name"
              style="width: 0; visibility: collapse;" flex="1"/>
     <splitter class="tree-splitter"/>
-    <treecol id="SiteColumn" rdf:resource="http://home.netscape.com/NC-rdf#Site"
-             rdf:resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
+    <treecol id="SiteColumn" resource="http://home.netscape.com/NC-rdf#Site"
+             resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
     <splitter class="tree-splitter"/>
-    <treecol id="EngineColumn" rdf:resource="http://home.netscape.com/NC-rdf#Engine"
-             rdf:resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
+    <treecol id="EngineColumn" resource="http://home.netscape.com/NC-rdf#Engine"
+             resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
   </treecolgroup>
 
 		<template>

suite/common/search/search-editor.xul

@@ -63,7 +63,7 @@
       </template>
     
       <treecolgroup>
-        <treecol id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" sortActive="true" sortDirection="ascending" flex="1"/>
+        <treecol id="NameColumn" resource="http://home.netscape.com/NC-rdf#Name" sortActive="true" sortDirection="ascending" flex="1"/>
       </treecolgroup>
     
       <treehead>
@@ -120,7 +120,7 @@
             </treechildren>
           </template>
           
-          <treecol id="EngineColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" flex="1" />
+          <treecol id="EngineColumn" resource="http://home.netscape.com/NC-rdf#Name" flex="1" />
         
           <treehead>
             <treerow>

suite/common/search/search-panel.xul

@@ -88,8 +88,8 @@
   <deck class="outset-right" id="advancedDeck" flex="1">
     <box align="vertical" class="searchpanel-outerbox" flex="1">
       <tree id="Tree" class="inset" ref="NC:LastSearchRoot"
-            rdf:resource="http://home.netscape.com/NC-rdf#PageRank"
-            rdf:resource2="http://home.netscape.com/NC-rdf#Name"
+            resource="http://home.netscape.com/NC-rdf#PageRank"
+            resource2="http://home.netscape.com/NC-rdf#Name"
             sortDirection="ascending" sortActive="true"
             flex="1" datasources="rdf:internetsearch" context="contextual"
             onclick="sidebarOpenURL(event, event.target.parentNode.parentNode, 'Tree')">
@@ -134,8 +134,8 @@
         </treehead>
       
         <treecolgroup>
-          <treecol flex="1" rdf:resource="http://home.netscape.com/NC-rdf#PageRank" rdf:resource2="http://home.netscape.com/NC-rdf#Name" />
-          <treecol width="0" id="SortNameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" />
+          <treecol flex="1" resource="http://home.netscape.com/NC-rdf#PageRank" resource2="http://home.netscape.com/NC-rdf#Name" />
+          <treecol width="0" id="SortNameColumn" resource="http://home.netscape.com/NC-rdf#Name" />
         </treecolgroup>
       </tree>
       
@@ -168,7 +168,7 @@
         </template>
         
         <treecolgroup>
-          <treecol id="EngineColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" flex="1" />
+          <treecol id="EngineColumn" resource="http://home.netscape.com/NC-rdf#Name" flex="1" />
         </treecolgroup>
         
         <treehead>