- partial update to jquery-1.3.2

- partial update to jquery-ui-1.7.2
- yacyportalsearch fixed sidebar for navigators


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

htroot/env/templates/header.template

@@ -2,8 +2,8 @@
 <link media="screen" type="text/css" href="/yacy/ui/css/themes/start/ui.theme.css" rel="stylesheet" />
 <link media="screen" type="text/css" href="/yacy/ui/css/yacyui-portalsearch.css" rel="stylesheet" />
 
-<script src="/yacy/ui/js/jquery-1.3.1.min.js" type="text/javascript"></script>    
-<script src="/yacy/ui/js/jquery.ui.all.min.js" type="text/javascript"></script>
+<script src="/yacy/ui/js/jquery-1.3.2.min.js" type="text/javascript"></script>    
+<script src="/yacy/ui/js/jquery-ui-1.7.2.min.js" type="text/javascript"></script>
 <script src="/yacy/ui/js/jquery.dimensions.min.js"></script>
 <script src="/yacy/ui/js/jquery.query.js"></script>
 <script src="/yacy/ui/js/jquery.form.js"></script>
@@ -37,6 +37,7 @@
 			<input type="hidden" name="prefermaskfilter" value="" />
 			<input type="hidden" name="former" value="" />
 			<input type="hidden" name="display" value="2" />
+			<input type="hidden" name="nav" value="all" />
 		</form>
 	</div>
 </div>

htroot/yacy/ui/js/yacyui-portalsearch.js

@@ -25,6 +25,13 @@ $(document).ready(function() {
 		load_css : true	
 	}, yconf);
 	
+	$.extend($.ui.accordion.defaults, {
+		autoHeight: false,
+		clearStyle: true,
+		collapsible: true,
+		header: "h3"
+	});
+	
 	$('<div id="ypopup" class="classic"></div>').appendTo("#yacylivesearch");
 	
 	if(yconf.load_css) {	
@@ -136,7 +143,6 @@ function yrun() {
 		},
 		open: function(event, ui) {
 			$('<div id="yside" style="padding:0px;"></div>').insertAfter(".ui-dialog-content");
-			$('<div id="ynav" style="margin0px; padding:0px;"></div>').appendTo('#yside');
 			var position = $(".ui-dialog").position();
 			$("#yside").dialog({
 				title: 'Navigation',
@@ -240,30 +246,35 @@ function yacysearch(global) {
 				className: "favicon"
 			});
 			
-			$('#ynav').empty();
+			$('#yside').empty();
 			$.each (
 				data.channels[0].navigation,
 				function(i,facet) {
 					if (facet) {
+						var acc = '#ynav'+i;
+						$(acc).accordion('destroy');
+						$('<div id="ynav'+i+'" style="margin0px; padding:0px;"></div>').appendTo('#yside');
 						var id = "#y"+facet.facetname;
-						$('<h3 style="padding-left:25px;">'+facet.displayname+'</h3>').appendTo('#ynav');
-						$('<div id="y'+facet.facetname+'"></div>').appendTo('#ynav');
-						$("<ul style='padding-left: 0px;'>").appendTo(id);
+						$('<h3 style="padding-left:25px;">'+facet.displayname+'</h3>').appendTo(acc);
+						$('<div id="y'+facet.facetname+'"></div>').appendTo(acc);
+						$("<ul class='nav' style='padding-left: 0px; margin-left: -5px; font-size:85%;'></ul>").appendTo(id);
 						$.each (
 							facet.elements,
 							function(j,element) {
-								$("<li><a href='"+element.url+"'>"+element.name+" ("+element.count+")</a></li>").appendTo(id);
+								$("<li><a href='#' modifier='"+element.modifier+"'>"+element.name+" ("+element.count+")</a></li>").appendTo(id+" .nav");
 							}	
-						)	
-						$("</ul>").appendTo(id);
+						)
+						$(acc).accordion({});
 					}								
 				}
 			);
-			$("#ynav").accordion({
-				autoHeight: false,
-				clearStyle: true,
-				collapsible: true,
-				header: "h3"
+			$('#ynav1').accordion('activate', false);
+			$('#yside a').click(function() {
+				var modifier = $(this).attr('modifier');
+				modifier = modifier.replace(/^#/,' ');
+				var query = $("#yquery").getValue() + modifier;
+				$("#yquery").setValue(query);
+				$("#yquery").trigger('keyup');
 			});
         }
     );

htroot/yacysearch.html

@@ -16,8 +16,8 @@
 
 #(display)#
 	#%env/templates/simpleheader.template%#
-	<script src="/yacy/ui/js/jquery-1.3.1.min.js" type="text/javascript"></script>    
-    <script src="/yacy/ui/js/jquery.ui.all.min.js" type="text/javascript"></script>
+	<script src="/yacy/ui/js/jquery-1.3.2.min.js" type="text/javascript"></script>    
+    <script src="/yacy/ui/js/jquery-ui-1.7.2.min.js" type="text/javascript"></script>
     <link media="screen" type="text/css" href="/yacy/ui/css/themes/start/ui.base.css" rel="stylesheet" />	
     <link media="screen" type="text/css" href="/yacy/ui/css/themes/start/ui.theme.css" rel="stylesheet" />
 	::
@@ -36,8 +36,8 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
 	#%env/templates/header.template%#
 	::
 	#%env/templates/embeddedheader.template%#
-	<script src="/yacy/ui/js/jquery-1.3.1.min.js" type="text/javascript"></script>    
-    <script src="/yacy/ui/js/jquery.ui.all.min.js" type="text/javascript"></script>
+	<script src="/yacy/ui/js/jquery-1.3.2.min.js" type="text/javascript"></script>    
+    <script src="/yacy/ui/js/jquery-ui-1.7.2.min.js" type="text/javascript"></script>
     <link media="screen" type="text/css" href="/yacy/ui/css/themes/start/ui.base.css" rel="stylesheet" />	
     <link media="screen" type="text/css" href="/yacy/ui/css/themes/start/ui.theme.css" rel="stylesheet" />
 #(/display)#
@@ -53,7 +53,8 @@ $(function() {
 	});
 	$("#sidebar1").accordion({});
 	$("#sidebar2").accordion({});
-	$("#sidebar2").accordion('activate', 1);
+	$("#sidebar2").accordion('activate', false);
+	$("#sidebar3").accordion({});
 	$("#search").focus();
 });
 //]]>

htroot/yacysearchtrailer.html

@@ -6,6 +6,7 @@
 #{/element}#</ul></div>
 #(/nav-domains)#
 </div>
+
 <div id="sidebar2" style="float: right; margin-top:5px; width: 220px;">
 #(nav-authors)#::
 <h3 style="padding-left:25px;">Authors</h3>
@@ -13,6 +14,9 @@
 <li>#[url]#</li>
 #{/element}#</ul></div>
 #(/nav-authors)#
+</div>
+
+<div id="sidebar3" style="float: right; margin-top:5px; width: 220px;">
 #(nav-topics)#::
 <h3 style="padding-left:25px;">Topics</h3>
 <div><ul style="padding-left: 0px;">#{element}#