Search UI cleanup.

suite/common/search/internetresults.xul

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
-<?xml-stylesheet href="internet.css" type="text/css"?>
 <?xml-stylesheet href="internetresults.css" type="text/css"?>
+<?xml-stylesheet href="icons.css" type="text/css"?>
 
 
 <!DOCTYPE window
@@ -58,7 +58,7 @@
 					<treerow>
 						<treecell onclick="doResultClick(this.parentNode.parentNode)" >
 							<treeindentation />
-							<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name" align="left" />
+							<titledbutton class="result" value="rdf:http://home.netscape.com/NC-rdf#Name" align="left" />
 						</treecell>
 						<treecell>
 							<progressmeter value="rdf:http://home.netscape.com/NC-rdf#Relevance" align="horizontal" mode="normal" />
@@ -68,7 +68,7 @@
 							<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Site" align="left" style="list-style-image: none;" />
 						</treecell>
 						<treecell>
-							<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Engine" align="left" />
+							<titledbutton class="engine" value="rdf:http://home.netscape.com/NC-rdf#Engine" align="left" />
 						</treecell>
 					</treerow>
 				</treeitem>

xpfe/components/search/resources/find.xul

@@ -73,10 +73,10 @@
 
 			<html:tr>
 				<html:td align="left">
-					<html:input id="SaveSearch" type="button" disabled="true" value="&save.button.label;" onclick="return saveSearch();" />
+					<html:button id="SaveSearch" disabled="true" onclick="return saveSearch();">&save.button.label;</html:button>
 				</html:td>
 				<html:td align="right">
-					<html:input type="button" value="&search.button.label;" onclick="return doFind();" />
+					<html:button onclick="return doFind();">&search.button.label;</html:button>
 				</html:td>
 			</html:tr>
 		</html:table>

xpfe/components/search/resources/internet.css

@@ -26,31 +26,3 @@ titledbutton {
   background-color: inherit;
   background-image: inherit;
 }
-
-treeitem[loading="true"] > treerow > treecell > titledbutton {
- list-style-image: url("resource:/res/rdf/loading.gif") ! important ;
-}
-
-treeitem > treerow > treecell > titledbutton[value="AOL Netfind"] {
-	list-style-image: url("resource:/res/rdf/datasets/AOL_NetFind.gif");
-}
-
-treeitem > treerow > treecell > titledbutton[value="Google"] {
-	list-style-image: url("resource:/res/rdf/datasets/Google.gif");
-}
-
-treeitem > treerow > treecell > titledbutton[value="GoTo.com"] {
-	list-style-image: url("resource:/res/rdf/datasets/GoTo.com.gif");
-}
-
-treeitem > treerow > treecell > titledbutton[value="Netscape Open Directory"] {
-	list-style-image: url("resource:/res/rdf/datasets/Netscape_Open_Directory.gif");
-}
-
-treeitem > treerow > treecell > titledbutton[value="Snap.com"] {
-	list-style-image: url("resource:/res/rdf/datasets/Snap.com.gif");
-}
-
-treeitem > treerow > treecell > titledbutton {
-	list-style-image: url("resource:/res/rdf/document.gif");
-}

xpfe/components/search/resources/internet.xul

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="internet.css" type="text/css"?>
+<?xml-stylesheet href="icons.css" type="text/css"?>
 
 
 <!DOCTYPE window
@@ -10,6 +11,7 @@
 <!ENTITY checkbox.column.label       "On">
 <!ENTITY engine.column.label         "Search Engines">
 
+<!ENTITY search.button.label         "Search">
 <!ENTITY checkall.button.label       "Check All">
 <!ENTITY uncheckall.button.label     "Uncheck All">
 <!ENTITY savesearch.button.label     "Save Search in Bookmarks">
@@ -27,8 +29,8 @@
 	<box align="horizontal" style="width: 100%;" >
 		<spring align="horizontal" flex="100%" />
 		<titledbutton value="&words.label;" />
-		<html:input id="searchtext" type="text" width="20" onkeyup="if (event.which == 13) { doSearch(); }" />
+		<html:input id="searchtext" width="20" onkeyup="if (event.which == 13) { doSearch(); }" />
-		<html:input type="button" value="Search" onclick="return doSearch();" />
+		<html:button onclick="return doSearch();">&search.button.label;</html:button>
 		<spring align="horizontal" flex="100%" />
 	</box>
 
@@ -46,7 +48,7 @@
 							<html:input type="checkbox" onclick="doCheck(this)" />
 						</treecell>
 						<treecell>
-							<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name" align="left" />
+							<titledbutton class="engine" value="rdf:http://home.netscape.com/NC-rdf#Name" align="left" />
 						</treecell>
 					</treerow>
 				</treeitem>
@@ -70,9 +72,9 @@
 
 	<box align="horizontal" style="width: 100%;" >
 		<spring align="horizontal" flex="100%" />
-		<html:input type="button" value="&checkall.button.label;" onclick="return doCheckAll(true);" />
+		<html:button onclick="return doCheckAll(true);">&checkall.button.label;</html:button>
-		<html:input type="button" value="&uncheckall.button.label;" onclick="return doCheckAll(false);" />
+		<html:button onclick="return doCheckAll(false);">&uncheckall.button.label;</html:button>
-		<html:input id="SaveSearch" type="button" disabled="true" value="&savesearch.button.label;" onclick="return saveSearch();" />
+		<html:button id="SaveSearch" disabled="true" onclick="return saveSearch();">&savesearch.button.label;</html:button>
 		<spring align="horizontal" flex="100%" />
 	</box>
 </window>

xpfe/components/search/resources/internetresults.css

@@ -4,6 +4,18 @@ window {
  width: 100%;
 }
 
+titledbutton {
+  display: inline;
+  color:black; 
+  border: 0px outset white;
+  padding: 0px;
+  margin: 0px;
+  text-align: center;
+  font: inherit;
+  background-color: inherit;
+  background-image: inherit;
+}
+
 treecol[sortActive="true"] {
  background-color: lightgray;
 }
@@ -12,28 +24,6 @@ titledbutton.engine[loading="true"] {
  list-style-image: url("resource:/res/rdf/loading.gif") ! important ;
 }
 
-/* Icons */
+titledbutton.result {
-
+ list-style-image: url("resource:/res/rdf/document.gif") ! important ;
-titledbutton.engine[value="AOL Netfind"] {
-	list-style-image: url("resource:/res/rdf/datasets/AOL_NetFind.gif");
-}
-
-titledbutton.engine[value="Google"] {
-	list-style-image: url("resource:/res/rdf/datasets/Google.gif");
-}
-
-titledbutton.engine[value="GoTo.com"] {
-	list-style-image: url("resource:/res/rdf/datasets/GoTo.com.gif");
-}
-
-titledbutton.engine[value="Netscape Open Directory"] {
-	list-style-image: url("resource:/res/rdf/datasets/Netscape_Open_Directory.gif");
-}
-
-titledbutton.engine[value="Snap.com"] {
-	list-style-image: url("resource:/res/rdf/datasets/Snap.com.gif");
-}
-
-titledbutton.engine {
-	list-style-image: url("resource:/res/rdf/document.gif");
 }

xpfe/components/search/resources/internetresults.xul

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
-<?xml-stylesheet href="internet.css" type="text/css"?>
 <?xml-stylesheet href="internetresults.css" type="text/css"?>
+<?xml-stylesheet href="icons.css" type="text/css"?>
 
 
 <!DOCTYPE window
@@ -58,7 +58,7 @@
 					<treerow>
 						<treecell onclick="doResultClick(this.parentNode.parentNode)" >
 							<treeindentation />
-							<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name" align="left" />
+							<titledbutton class="result" value="rdf:http://home.netscape.com/NC-rdf#Name" align="left" />
 						</treecell>
 						<treecell>
 							<progressmeter value="rdf:http://home.netscape.com/NC-rdf#Relevance" align="horizontal" mode="normal" />
@@ -68,7 +68,7 @@
 							<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Site" align="left" style="list-style-image: none;" />
 						</treecell>
 						<treecell>
-							<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Engine" align="left" />
+							<titledbutton class="engine" value="rdf:http://home.netscape.com/NC-rdf#Engine" align="left" />
 						</treecell>
 					</treerow>
 				</treeitem>