YaCy-Ui: fixed some bugs and updated to jQuery-ui 1.5b4

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

htroot/yacy/ui/index.html

@@ -13,25 +13,30 @@
   <link media="screen" type="text/css" href="css/jquery.accordion.css" rel="stylesheet" />	
 	
   <script src="js/jquery-1.2.6.min.js" type="text/javascript"></script>    
+  <script src="js/jquery-ui.min.js" type="text/javascript"></script>
+  
   <script src="js/jquery.tablesorter.min.js" type="text/javascript"></script>  
   <script src="js/jquery.tablesorter.pager.js" type="text/javascript"></script>
+  
   <script src="js/jquery.dimensions.min.js" type="text/javascript"></script>  
   <script src="js/jquery.metadata.min.js" type="text/javascript"></script>
+  
   <script src="js/jquery.form.js" type="text/javascript"></script>
-  <script src="js/jquery.field.min.js" type="text/javascript"></script>  
+  <script src="js/jquery.field.min.js" type="text/javascript"></script>
-  <script src="js/jquery.accordion.js" type="text/javascript"></script>
+  
   <script src="js/jquery.pagination.js" type="text/javascript"></script>
   <script src="js/jquery-faviconize-1.0.js" type="text/javascript"></script>
+  
   <script src="js/jqModal.js" type="text/javascript"></script>
   <script src="js/jqDnR.js" type="text/javascript"></script> 
-  <script src="js/ui.tabs.min.js" type="text/javascript"></script>
+  
   <script type="text/javascript">
    //<![CDATA[
 	$(function() {		
 		qtag = "";
 		/* Initialize Tabs and set up close function */
-		var $tabs = $('#container ul').tabs()
+		var $tabs = $('#container ul').tabs({
-        	.bind('add.ui-tabs', function(e, ui) {
+        	add: function(ui) {
             	var li = $(ui.tab).parents('li:eq(0)')[0];
                 $('<img class="close" alt="close" src="/yacy/ui/img/cancel.png" border="0"/>')
 					.appendTo(li)
@@ -56,10 +61,8 @@
 				$('#' + ui.panel.id).attr('constraint', constraint);
 	        	$('#' + ui.panel.id).attr('prefermaskfilter', prefermaskfilter);
 				$('#' + ui.panel.id).attr('urlmaskfilter', urlmaskfilter);
-             });
+            },
-		
+			select: function(ui) {             	
-		$tabs.tabs()   	
-			.bind('select.ui-tabs', function(e, ui) {
 				/* set global variable tabid */
 				tabid = '#' + ui.panel.id;				
 				if (tabid == "#Bookmarks") {
@@ -92,6 +95,7 @@
 					$("input[@name='urlmaskfilter']").setValue(urlmaskfilter);
 					$('#yoptions').trigger('update');
 				}
+			}
 		});
 			 
 		/* Load Sidebar */

htroot/yacy/ui/sidebar/sidebar.html

@@ -2,7 +2,7 @@
    //<![CDATA[
 	$(document).ready(function() {   		
   		$("#side3").accordion({
-			autoheight: false,
+			autoHeight: false,
 			header: "h3"
 		});
 		$.ajax({

htroot/yacy/ui/sidebar/sidebar_admin.html

@@ -2,7 +2,7 @@
    //<![CDATA[
 	$(document).ready(function() { 
   		$("#side1").accordion({
-			autoheight: false,
+			autoHeight: false,
 			header: "h3"
 		});
 		$("#side1").accordion("activate", 2);

htroot/yacy/ui/welcome.html

@@ -9,7 +9,8 @@
 </p>
 apfelmaennchen
 <h3>Change Log</h3>
-	<ul>
+	<ul>		
+		<li>28-05-2008: Updated to jQuery 1.2.6 and jQuery-ui 1.5b4</li>
 		<li>18-05-2008: YaCy-UI has basic support for searching Bookmark tags !!</li>
 		<li>17-05-2008: YaCy-Widget: e.g. /yacy/ui/ywidget.html?search=yacy&count=50&offset=0</li>
 		<li>14-05-2008: YaCy-UI now support searching Sciencenet !!</li>
@@ -23,9 +24,9 @@ apfelmaennchen
 	<ul>		
 		<li>Please report bugs in the official <a href="http://forum.yacy-websuche.de/">YaCy-Forum</a> - thanks!</li> 
 		<li>12-05-2008: if you click a tag in the tagcloud, the bookmarks table doesn't update properly and JavaScript returns a 'tabs is undefined' error...</li>
-		<li>10-05-2008: there is an issue with Firefox 3.0b5 and the jQuery XML parsing of the search result (one symptom is the broken pagination)</li>
+		<li>10-05-2008: <strike>there is an issue with Firefox 3.0b5 and the jQuery XML parsing of the search result (one symptom is the broken pagination)</strike></li>
-		<li>19-04-2008: if you open more than one search tab in Firefox 2.x or Safari, only the first result item is shown. I would be greatful for any hint...</li>
+		<li>19-04-2008: <strike>if you open more than one search tab in Firefox 2.x or Safari, only the first result item is shown. I would be greatful for any hint...</strike></li>
-		<li>19-04-2008: resource types 'sciencenet' and 'bookmarks' doen't work yet. For 'sciencenet' we have to solve the Ajax cross domain restriction.</li>		
+		<li>19-04-2008: <strike>resource types 'sciencenet' and 'bookmarks' doen't work yet. For 'sciencenet' we have to solve the Ajax cross domain restriction.</strike></li>		
 		<li>19-04-2008: currently only contentdom="text" is working, all others will fail...</li>
 		<li>19-04-2008: language selection is not yet supported</li>
 	</ul>

htroot/yacy/ui/ysearch.html

@@ -9,9 +9,16 @@
 			url: query,
 			dataType: "xml",
 			success: function(xml) {
-				var totalResults = parseInt($(xml).find('opensearch\\:totalResults').text().replace(".","","g"));
+				alert($.browser.version);
-				var startIndex = parseInt($(xml).find('opensearch\\:startIndex').text());				
+				if ($.browser.mozilla && ($.browser.version > 1.8)) {
-				var itemsPerPage = parseInt($(xml).find('opensearch\\:itemsPerPage').text());
+					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 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) {
@@ -39,16 +46,16 @@
 					var guid = $(this).find('guid').text();
 					$('<div class="searchresults"></div>')
 						.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>')						
-						.prependTo(tabid);
+						.prependTo(tabid);										
-					$(".linktitle a").faviconize({
-						position: "before",
-						defaultImage: "img-2/article.png",
-						className: "favicon"				
-					});					
 				}); //close each(
+				$(".linktitle a").faviconize({
+					position: "before",
+					defaultImage: "img-2/article.png",
+					className: "favicon"
+				});	
 			}
 		}); //close $.ajax(
-		function loadContents(page_id, jq) {        	
+		function loadContents(page_id, jq) {
 			var $tabs = $('#container ul');
 			var count = $(tabid).attr('count');		
 			var offset = ((page_id*count)+1);
@@ -63,11 +70,11 @@
 				+"&prefermaskfilter="+$(tabid).attr('prefermaskfilter')
 				+"&urlmaskfilter="+$(tabid).attr('urlmaskfilter');
 			
-			var selected = $tabs.data('selected.ui-tabs');		
+			var selected = $tabs.data('selected.tabs');
 			$tabs.tabs("load", selected);			
 			$('#pagination').trigger("update");
 			return false;
-		}		
+		}					
 	 }); //close $(
   //]]>
 </script>