YaCy-UI:

- moved search result to flexigrid
- added a toolbar similar to YaCyBar

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5191 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/yacy/ui/css/base.css

@@ -123,7 +123,24 @@ img {
 .flexigrid div.fbutton .delete {
 	background: url(../img/close.png) no-repeat center left;
 }
-
+.flexigrid div.fbutton .bookmark {
+	background: url(../img/bookmark.png) no-repeat center left;
+}
+.flexigrid div.fbutton .blacklist {
+	background: url(../img/blacklist.png) no-repeat center left;
+}
+.flexigrid div.fbutton .crawl {
+	background: url(../img/crawl.png) no-repeat center left;
+}
+.flexigrid div.fbutton .next {
+	background: url(../img/next.png) no-repeat center left;
+}
+.flexigrid div.fbutton .prev {
+	background: url(../img/prev.png) no-repeat center left;
+}
+.flexigrid div.fbutton .load {
+	background: url(../img/flexigrid/load.png) no-repeat center left;
+}
 
 /* YaCy Bookmarks ---------------------------*/
 .url {

htroot/yacy/ui/css/jquery.dialog.css

@@ -5,6 +5,7 @@
 	background-color: white;
 	font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif;
     font-size: 12px;
+    border: black;
 }
 
 .bmdialog .ui-dialog .ui-dialog-titlebar,

htroot/yacy/ui/css/jquery.flexigrid.css

@@ -125,10 +125,13 @@
 
 .flexigrid div.mDiv
 	{
-	background: url(../img/flexigrid/wbg.gif) repeat-x top;
+	background: url(../img/flexigrid/wbg.gif) repeat;
 	border: 1px solid #ccc;
 	border-bottom: 0px;
 	border-top: 0px;
+	font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif;
+	font-size: 12px;	
+	/*color: #27537a;*/
     font-weight: bold;    
 	display: block;
 	overflow: hidden;

htroot/yacy/ui/yacyui-search.html

@@ -8,61 +8,73 @@
 			async: false,
 			dataType: "xml",
 			success: function(xml) {
-				if ($.browser.mozilla && ($.browser.version > 1.8)) {
+				var totalResults = parseInt($(xml).find('opensearch\\:totalResults').text().replace(",","","g"));
-					var totalResults = parseInt($(xml).find('opensearch\\:totalResults').text().replace(".","","g"));
 				var startIndex = parseInt($(xml).find('opensearch\\:startIndex').text());				
 				var itemsPerPage = parseInt($(xml).find('opensearch\\:itemsPerPage').text());				
-				} else {
+				var query = $(xml).find('opensearch\\:Query').attr('searchTerms');								
-					var totalResults = parseInt($(xml).find('totalResults').text().replace(".","","g"));
-					var startIndex = parseInt($(xml).find('startIndex').text());				
-					var itemsPerPage = parseInt($(xml).find('itemsPerPage').text());
-				}
-				var query = $(xml).find('Query').attr('searchTerms');				
-				var endIndex = startIndex+itemsPerPage;				
-				if (endIndex > totalResults) {
-					endIndex = totalResults;
-				}
-				
-				var totalPages = (totalResults/itemsPerPage)|0;
-				if (startIndex != 0) {
-    				var currentPage = ((startIndex-1)/itemsPerPage);
-  				} else {
-    				var currentPage = 0;
-  				}	
-												
 				$(xml).find('item').each(function(){					
 					var title = $(this).find('title').text();
 					var link = $(this).find('link').text();
 					var desc = $(this).find('description').text();
-					var guid = $(this).find('guid').text();
+					var hash = $(this).find('guid').text();
-					$('<div class="searchresults"></div>')
+					var date = $(this).find('pubDate').text();
-						.html('<h3 class="linktitle"><a href="' +link+ '">' +title+ '</a></h3><p class="snippet">' +desc+ '</p><p class="url"><a href="' +link+ '" id="' +guid+ '" >' +link+ '</a></p>')						
+					var tags = "";
-						.appendTo(tabid);										
+					$('<tr></tr')
+						.html('<td>' +hash+ '</td><td>' +''+ '</td><td><h3 class="linktitle">' +HTMLenc(title)+ '</h3><p class="desc">' +HTMLenc(desc)+ '</p><p class="url"><a href="' +link+ '">' +link+ '</a></p><td>' +HTMLenc(tags)+ ' </td><td>' +date+ '</td>')						
+						.appendTo(tabid+" .yresult tbody");										
 				}); //close each(
-				
+				var height=document.documentElement.clientHeight - 205;    			
-				var pagination = tabid + " .pagination";		
+    			var page = "&nbsp;" + (startIndex+1) + "-" + (startIndex+itemsPerPage) + " of " + totalResults
-				$('<div class="pagination"></div>').html('[loading...]').appendTo(tabid);	
+				$(tabid+" .yresult").flexigrid({
-				$(pagination).pagination(totalResults, {
+    				colModel: [
-					current_page:currentPage,
+						{display: 'Hash', name : 'hash', width : 50, sortable : false, align: 'center', hide: true},
-					items_per_page:itemsPerPage,
+						{display: '', name : 'public', width : 25, sortable : true, align: 'center'},
-					num_edge_entries:1,
+						{display: 'Title', name : 'title', width : 450, sortable : true, align: 'left'},
-					num_display_entries:10,
+						{display: 'Tags', name : 'tags', width : 240, sortable : false, align: 'left'},
-					callback: loadContents
+						{display: 'Date', name : 'date', width : 130, sortable : true, align: 'left'}
+					],
+					buttons: [
+						{name: 'Bookmark', bclass: 'bookmark', onpress: test},
+						{name: 'Crawl', bclass: 'crawl', onpress: test},
+						{name: 'Blacklist', bclass: 'blacklist', onpress: test},
+						{name: 'Refresh', bclass: 'load', onpress: load},
+						{separator: true},						
+						{name: page, bclass: 'prev', onpress: load},						
+						{name: '&nbsp;', bclass: 'next', onpress: load},
+						{separator: true}						
+					],										
+					striped: true,
+					nowrap: false,			 									    				
+    				height: height,					
+    				title: 'YaCy P2P Web Search: '+query										    				
     			});	
+			}
+		}); //close $.ajax(
 		
+		/*
 		$(".linktitle a").faviconize({
 			position: "before",
 			defaultImage: "img-2/article.png",
 			className: "favicon"
 		});
-			}
+		*/
-		}); //close $.ajax(
+		
-		function loadContents(page_id, jq) {
+		function test() { alert("Test!"); }
+
+		function load(com, grid) {
 			var $tabs = $('#container ul');
-			var count = $(tabid).attr('count');		
+			var count = parseInt($(tabid).attr('count'));
-			var offset = ((page_id*count)+1);
+			var offset = parseInt($(tabid).attr('offset'));			
+			if (com == '&nbsp;') { 
+				offset = offset+count;
+			}
+			else if (com == 'Refresh') {
+				offset = 0;
+			}
+			else if (offset > count) {
+				offset = offset-count;
+			}
 			$(tabid).attr('offset', offset);
-		
 			query = $(tabid).attr('resource')
 				+"&search="+$(tabid).attr('search')
 				+"&contentdom="+$(tabid).attr('contentdom')
@@ -74,10 +86,12 @@
 					
 			var selected = $tabs.data('selected.tabs');
 			$tabs.tabs("load", selected);
-			$('#pagination').trigger("update");
 			return false;
 		}					
 	 }); //close $(
   //]]>
 </script>
+<table class="yresult">
+	<tbody></tbody>
+</table>