Merge branch 'master' of ssh://git.eclipse.org/gitroot/orion/org.eclipse.orion.client
diff --git a/bundles/org.eclipse.orion.client.core/jsTestDriver.conf b/bundles/org.eclipse.orion.client.core/jsTestDriver.conf
index 1ac27fa..37f1903 100644
--- a/bundles/org.eclipse.orion.client.core/jsTestDriver.conf
+++ b/bundles/org.eclipse.orion.client.core/jsTestDriver.conf
@@ -7,4 +7,4 @@
 proxy:
   - {matcher: "/*", server: "http://localhost:8080/"}
     
-timeout: 3000
\ No newline at end of file
+timeout: 10000
\ No newline at end of file
diff --git a/bundles/org.eclipse.orion.client.core/web/css/theme.css b/bundles/org.eclipse.orion.client.core/web/css/theme.css
index f56d460..e689e2d 100644
--- a/bundles/org.eclipse.orion.client.core/web/css/theme.css
+++ b/bundles/org.eclipse.orion.client.core/web/css/theme.css
@@ -21,21 +21,10 @@
 	color: #3087B3;

 }

 

-/* REAL PROBLEMS WITH THESE IN THEMING - AND WE WERE NOT CHANGING THEM IN ANY CASE 

-

-a:visited {

-	color: #3087B3;

-}

-

-a:active {

-	color: #3087B3;

-}

-

 a:hover {

 	cursor: hand;

 	text-decoration: underline;

-	color: #3087B3;

-} */

+}

 

 /* Navigation text */

 

diff --git a/bundles/org.eclipse.orion.client.core/web/orion/searchClient.js b/bundles/org.eclipse.orion.client.core/web/orion/searchClient.js
index 3f07a57..633fc3e 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/searchClient.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/searchClient.js
@@ -339,9 +339,8 @@
 					if (!foundValidHit) {
 						// only display no matches found if we have a proper name
 						if (queryName) {
-							var div = dojo.place("<div>"+messages["No matches found for "]+"</div>", resultsNode, "only"); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-0$
-							var b = dojo.create("b", null, div, "last"); //$NON-NLS-1$ //$NON-NLS-0$
-							dojo.place(document.createTextNode(queryName), b, "only"); //$NON-NLS-0$
+							var errorStr = dojo.string.substitute(messages["No matches found for ${0}"], [queryName]); 
+							dojo.place(document.createTextNode(errorStr), resultsNode, "only"); //$NON-NLS-0$
 							if (typeof(onResultReady) === "function") { //$NON-NLS-0$
 								onResultReady(resultsNode);
 							}
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/searchExplorer.js b/bundles/org.eclipse.orion.client.core/web/orion/searchExplorer.js
index efc5377..f697d89 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/searchExplorer.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/searchExplorer.js
@@ -492,7 +492,7 @@
 		qParams.location = item.parentLocation;
 		qParams.start = 0;
 		var href =  mSearchUtils.generateSearchHref(qParams);
-		var link = dojo.create("a", {className: "navlink", href: href}, spanHolder, "last"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
+		var link = dojo.create("a", {className: "navlinkonpage", href: href}, spanHolder, "last"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
 		link.title = dojo.string.substitute(messages["Search again in this folder with \"${0}\""], [this.explorer.model.queryObj.searchStrTitle]);
 		mNavUtils.addNavGrid(this.explorer.getNavDict(), item, link);
 		var that = this;
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/widgets/themes/container/ThemeData.js b/bundles/org.eclipse.orion.client.core/web/orion/widgets/themes/container/ThemeData.js
index 8751dd9..3ab732e 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/widgets/themes/container/ThemeData.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/widgets/themes/container/ThemeData.js
@@ -293,8 +293,6 @@
 				family:'navbar', fill: '#333' } );

 			}

 			

-			console.log( 'c o n t a i n e r   t h e m e' );

-			

 			return dataset;

 		}

 

diff --git a/bundles/org.eclipse.orion.client.editor/web/examples/textview/textstyler.css b/bundles/org.eclipse.orion.client.editor/web/examples/textview/textstyler.css
index 6f3d8dc..a801ed7 100644
--- a/bundles/org.eclipse.orion.client.editor/web/examples/textview/textstyler.css
+++ b/bundles/org.eclipse.orion.client.editor/web/examples/textview/textstyler.css
@@ -10,6 +10,10 @@
 	color: #00008F;
 }
 
+a.token_singleline_comment, a.token_multiline_comment, a.token_doc_comment {
+	text-decoration: underline;
+}
+
 .token_doc_html_markup {
 	color: #7F7F9F;
 }
@@ -52,4 +56,3 @@
 .line_caret {
 	background-color: #EAF2FE;
 }
-