YaCy-UI: some small cosmetical changes....

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

htroot/yacy/ui/sidebar/sidebar_1.html

@@ -34,28 +34,6 @@
 		});
 		
 		/* Menu .click(function() */
-		$("#login").click(function() {
-			$.ajax({
-    			url: "/api/bookmarks/xbel/xbel.xml?login=true",
-    			method : "GET",
-    			dataType: "xml",    			
-    			success: function(xml) {
-    				// ToDo: /api/util/login.xml
-    				// alert("Login");
-    			}    			
-			});          
-		});
-		
-		$("#shutdown").click(function() {
-			if ( confirm("Shutdown YaCy-Peer?") ) {
-				$("body").load("../../Steering.html?shutdown=");
-			}		
-		});
-		
-		$("#admin").click(function() { 
-			$tabs.tabs('select',1); 
-		});
-		
 		$("#searchtext").click(function () { 
 			$("#side2").accordion("activate", 0); 
 		});
@@ -65,9 +43,9 @@
 			if ($("select[@name='resource']").getValue() == "ymarks") {								
 				qtag = $("input[@name='search']").getValue();				
 				if (tabid == "#Bookmarks") {
-					$tabs.tabs("load", 3);
+					reloadBM();
 				} else {
-					$tabs.tabs('select',3);
+					$tabs.tabs('select',2);
 				}						
 			} else {			
 				var tabnr = $tabs.tabs('length');			

htroot/yacy/ui/yacyui-admin.html

@@ -10,6 +10,17 @@ function loadBanner() {
 }
 $(function() {
 	loaderBanner = window.setInterval("loadBanner()", 5000);
+	$("#login").click(function() {
+		$.ajax({
+   			url: "/api/bookmarks/xbel/xbel.xml?login=true",
+   			method : "GET",
+   			dataType: "xml",    			
+   			success: function(xml) {
+   				// ToDo: /api/util/login.xml
+   				// alert("Login");
+   			}    			
+		});          
+	});		
 }) 
 //]]>
 </script>
@@ -39,7 +50,7 @@ $(function() {
 			</a>
 		</td>
 		<td>
-			<a id="shutdown" href="#Shutdown">
+			<a href="../../Steering.html?shutdown=">
 				<img alt="Shutdown" title="Shutdown" src="img-1/Stop%20Red%20Button.png" border="0"/>
 				<br />
 				Shutdown

htroot/yacy/ui/yacyui-bookmarks.html

@@ -2,7 +2,7 @@
    //<![CDATA[
 	$(document).ready(function() {
 		$("#side1").accordion("activate", 1);
-		// $("#side2").accordion("activate", 1);
+		$("#side2").accordion("activate", 1);
 		// $('#yoptions').resetForm();		
 		
 		var height=document.documentElement.clientHeight - 240;    			

htroot/yacy/ui/yacyui-search.html

@@ -1,7 +1,9 @@
 <script type="text/javascript">
    //<![CDATA[
 	$(document).ready(function() {
-		$("#side3").accordion("activate", 0);
+		$("#side1").accordion("activate", 0);
+		$("#side2").accordion("activate", 0);
+		
 		var height=document.documentElement.clientHeight - 240;
 				    			
  		$(tabid+" .yresult").flexigrid({