adjusted display of search results

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4547 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Mar 10, 2008 · c75fa90 · c75fa90
1 parent 7a90242
commit c75fa90
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 61 deletions.
diff --git a/htroot/yacy/ui/index.html b/htroot/yacy/ui/index.html
@@ -27,8 +27,10 @@
 			var tabnr = $('#container > ul').tabs('length');			
 			var result = "result.html?" + $('#searchbox').formSerialize();
 			var tabname = "*" + $("input[@name='search']").getValue();		
-			$('#container > ul').tabs('add', result, tabname);
-			$('#container > ul').tabs('select', tabnr);					
+			$('#container > ul').tabs('add', '#empty', tabname);
+			$('#container > ul').tabs('select', tabnr);
+			$('#container > ul').tabs('url', tabnr, result);
+			$('#container > ul').tabs('load', tabnr);
 			return false;
 		});
 	});
@@ -93,7 +95,8 @@
 		<ul>
 			<li><a href="welcome.html" title="Welcome"><span>Welcome</span></a></li>
 			<li><a href="ymarks.html" title="Ymarks"><span>Y-Marks</span></a></li>			
-		</ul>		
+		</ul>
+		<div id="empty"></div>
 	</div>	
 	<div id="sidebar" class="sidebar"><!-- Sidebar wird dynamisch geladen --></div>
 </body>

diff --git a/htroot/yacy/ui/result.html b/htroot/yacy/ui/result.html
@@ -1,39 +1,19 @@
-<script type="text/javascript">  
-	$(document).ready(function() { 
-    	$('#ritems') 
-    	.tablesorter({widgets: ['zebra']}) 
-    	.tablesorterPager({container: $('#pager'), size: 15, positionFixed: false});	
-	}); 
+<script type="text/javascript">
+	$(document).ready(function() {
+		var url = "/yacy/user/sidebar_history.html?eventID=#[eventID]#";		
+		$('<div id="history" class="boxed"></div>').appendTo('#sidebar')
+		$("#history").load(url);				
+	});
 </script>
 
-<!-- resultTable -->
-#(resultTable)#
-	<table class="ytable" id="ritems">
-		<colgroup>
-			<col width="25"/>
-			<col width="25"/>
-			<col width="220"/>
-			<col width="220"/>
-			<col width="285"/>
-			<col width="25"/>								
-		</colgroup>
-		<thead>
-		  <tr>			 
-			<th class="{sorter: false}"></th>
-			<th class="{sorter: false}"></th>
-			<th>Description</th>
-			<th>URL</th>				
-			<th>Snippet</th>
-			<th class="{sorter: false}"></th>							
-		  </tr>
-		</thead>			
-		<tbody>
-#(/resultTable)#
+<!-- linklist begin -->
+#(resultTable)#::<table width="100%"><tr class="TableHeader"><td width="30%">Media</td><td width="70%">URL</tr>#(/resultTable)#
 #{results}#
-	<!--#include virtual="/yacy/ui/ritem.html?rss=false&item=#[item]#&eventID=#[eventID]#" -->
+<!--#include virtual="/yacy/user/ysearchitem.html?rss=false&item=#[item]#&eventID=#[eventID]#" -->
 #{/results}#
-#(resultTable)#
-		</tbody>
-	</table>
-	<!-- Navigation -->
-#(/resultTable)#
+#(resultTable)#::</table>#(/resultTable)#
+/yacy/user/sidebar_history.html?eventID=#[eventID]#
+
+
+
+
diff --git a/htroot/yacy/ui/ritem.html b/htroot/yacy/ui/ritem.html
@@ -1,25 +1,11 @@
-#(content)#
-::
-<tr>
-	<td>
-		<input type="checkbox" value="true" />
-	</td>
-	<td>
-		<img src="../../ViewImage.png?width=16&height=16&code=#[faviconCode]#" id="f#[urlhash]#" width="16" height="16" alt="" />
-	</td>
-	<td>
-		#[description]#				
-	</td>
-	<td class="url">
-		<a href="#[url]#" id="url#[urlhash]#" target="_parent">#[urlname]#</a>
-	</td>				
-	<td>
-		#[snippet]#
-	</td>
-	<td>				
-		<img src="img-2/cancel.png" alt="delete bookmark" title="delete bookmark"/>					
-	</td>
-</tr>
+#(content)#::
+  <div class="searchresults">
+    <h3 class="linktitle">
+    <img src="../../ViewImage.png?width=16&height=16&code=#[faviconCode]#" id="f#[urlhash]#" class="favicon" width="16" height="16" alt="" />
+    <a href="#[url]#" target="_parent">#[description]#</a></h3>
+    <p class="snippet">#[snippet]#</p>
+    <p class="url"><a href="#[url]#" id="url#[urlhash]#" target="_parent">#[urlname]#</a></p>
+  </div>
   ::
   #{items}#
   <div class="thumbcontainer">
@@ -42,4 +28,19 @@
   #{items}#
   <tr class="#(col)#TableCellLight::TableCellDark#(/col)#"><td>#[name]#</td><td><a href="#[href]#">#[hrefshort]#</a></tr>
   #{/items}#
-#(/content)#
+#(/content)#
+#(rss)#::
+<item>
+<title>#[title]#</title>
+<link>#[link]#</link>
+<description>#[description]#</description>
+<pubDate>#[date]#</pubDate>
+<guid isPermaLink="false">#[urlhash]#</guid>
+</item>
+#(/rss)#
+#(dynamic)#::
+<script type="text/javascript">
+statistics("#[offset]#", "#[itemscount]#", "#[totalcount]#", "#[localResourceSize]#", "#[remoteResourceSize]#", "#[remoteIndexCount]#", "#[remotePeerCount]#");
+progressbar.step(1);
+</script>
+#(/dynamic)#