diff --git a/htroot/yacy/ui/css/base.css b/htroot/yacy/ui/css/base.css index 476ec9958..e459483ee 100644 --- a/htroot/yacy/ui/css/base.css +++ b/htroot/yacy/ui/css/base.css @@ -198,15 +198,15 @@ h3.linktitle { } .bm_input { width: 340px; - margin-bottom: .5em; padding: 2px 0px 2px 0px /* top right bottom left */ border: 1px solid #CCCCCC; + margin-bottom: 2px; font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif; - font-size: 12px; + font-size: 1.0em; } .bm_dialog { - margin: 15px 15px 15px 15px; - font-size: 11px; + margin: 10px 10px 10px 10px; + font-size: .9em; } /* YaCy Search Results ---------------------------*/ @@ -281,10 +281,15 @@ dl.pairs dt { #yfolder { margin: 5px 5px 10px 20px; /* top right bottom left */ + max-height: 250px; + overflow-x: hidden; + overflow-y: auto; } #tagcloud { - margin: 5px 5px 5px 5px; /* top right bottom left */ + margin: 10px 10px 10px 7px; /* top right bottom left */ + text-align: justify; + line-height: 1.2em; } #tagcloud a { @@ -307,7 +312,7 @@ dl.pairs dt { #tabs-container .ui-tabs-nav li.ui-tabs-selected a:link, #tabs-container .ui-tabs-nav li.ui-tabs-selected a:visited, #tabs-container .ui-tabs-nav li.ui-tabs-selected a:hover, -#tabs-container .ui-tabs-nav li.ui-tabs-selected a:active { font-size: 1.1em; font-style: bold; } +#tabs-container .ui-tabs-nav li.ui-tabs-selected a:active { font-size: 1.1em; font-style: bold; padding-left: 5px;} #tabs-container .ui-tabs-panel { padding:0px 0px; font-size:11px; } /* overrides for ui-accordion styles diff --git a/htroot/yacy/ui/index.html b/htroot/yacy/ui/index.html index e884fa0f9..bc3af5215 100644 --- a/htroot/yacy/ui/index.html +++ b/htroot/yacy/ui/index.html @@ -10,6 +10,8 @@ + + @@ -24,9 +26,6 @@ - - - @@ -64,10 +63,11 @@ $tabs = $('#tabs-container').tabs({ // tabs options }); - $tabs.tabs().find(".ui-tabs-nav").sortable(); + /* $tabs.tabs().find(".ui-tabs-nav").sortable(); */ $tabs.bind('tabsadd', function(event, ui) { var li = $(ui.tab).parents('li:eq(0)')[0]; - var close = $('
close
').appendTo($(ui.tab)); + $('a', li).attr('style','float:left'); + var close = $('close').appendTo(li); close.bind('click', function() { $tabs.tabs('remove', $('li', $tabs).index(li)); }); @@ -82,9 +82,9 @@ var count = $("#searchbox select[name='itemsPerPage']").getValue(); var offset = 0; var resource = $("#searchbox select[name='resource']").getValue(); - var constraint= $("#searchbox select[name='constraint']").getValue(); - var prefermaskfilter = $("#searchbox input[name='prefermaskfilter']").getValue(); - var urlmaskfilter = $("#searchbox input[name='urlmaskfilter']").getValue(); + var constraint= $("#yoptions select[name='constraint']").getValue(); + var prefermaskfilter = $("#yoptions input[name='prefermaskfilter']").getValue(); + var urlmaskfilter = $("#yoptions input[name='urlmaskfilter']").getValue(); var language = $("#searchbox select[name='language']").getValue(); tabid = "#"+ui.panel.id; @@ -122,9 +122,9 @@ $("#searchbox input[name='search']").setValue(search); $("#searchbox input[name='contentdom']").setValue(contentdom); - $("#searchbox select[name='constraint']").setValue(constraint); - $("#searchbox input[name='prefermaskfilter']").setValue(prefermaskfilter); - $("#searchbox input[name='urlmaskfilter']").setValue(urlmaskfilter); + $("#yoptions select[name='constraint']").setValue(constraint); + $("#yoptions input[name='prefermaskfilter']").setValue(prefermaskfilter); + $("#yoptions input[name='urlmaskfilter']").setValue(urlmaskfilter); $("#searchbox select[name='language']").setValue(language); $('#yoptions').trigger('update'); } diff --git a/htroot/yacy/ui/sidebar/sidebar_1.html b/htroot/yacy/ui/sidebar/sidebar_1.html index fca5fc26c..c34b1ac35 100644 --- a/htroot/yacy/ui/sidebar/sidebar_1.html +++ b/htroot/yacy/ui/sidebar/sidebar_1.html @@ -35,7 +35,8 @@ /* Menu .click(function() */ $("#searchtext").click(function () { - $("#side2").accordion("activate", 0); + $("#side2").accordion("activate", 0); + $("#searchtext").focus(); }); /* Load Search Result into new Tab */ @@ -243,7 +244,7 @@

Bookmark Folders

- +
diff --git a/htroot/yacy/ui/sidebar/sidebar_2.html b/htroot/yacy/ui/sidebar/sidebar_2.html index e26536014..31de5389d 100644 --- a/htroot/yacy/ui/sidebar/sidebar_2.html +++ b/htroot/yacy/ui/sidebar/sidebar_2.html @@ -14,7 +14,7 @@ function loadTagCloud() { $("#tagcloud *").remove(); - $("#sidebar-2-1").toggleClass("loading"); + $("#sidebar-2-1").toggleClass("ui.loading"); $.ajax({ type: "POST", url: "/api/bookmarks/tags/getTag.xml?top=25&sort=alpha", @@ -31,8 +31,8 @@ .appendTo('#tagcloud') .bind('click', function() { qtag = $(this).text().replace(/\s+/g,""); - $("select[@name='resource']").setValue('ymarks'); - $("input[@name='search']").setValue(qtag); + $("select[name='resource']").setValue('ymarks'); + $("input[name='search']").setValue(qtag); if (tabid == "#Bookmarks") { reloadBM(); } else { @@ -40,7 +40,7 @@ } }); }); //close each( - $("#sidebar-2-1").toggleClass("loading"); + $("#sidebar-2-1").toggleClass("ui.loading"); } }); //close $.ajax( } @@ -71,8 +71,8 @@ -

Bookmark TagCloud

-
+ +

diff --git a/htroot/yacy/ui/yacyui-search.html b/htroot/yacy/ui/yacyui-search.html index c300a1bb2..e675a3573 100644 --- a/htroot/yacy/ui/yacyui-search.html +++ b/htroot/yacy/ui/yacyui-search.html @@ -4,7 +4,7 @@ $("#side1").accordion("activate", 0); $("#side2").accordion("activate", 0); - var height = document.documentElement.clientHeight - 240; + var height = document.documentElement.clientHeight - 180; var url = $(tabid).attr('resource'); $(tabid+" .yresult").flexigrid({