diff --git a/htroot/yacy/ui/css/base.css b/htroot/yacy/ui/css/base.css index 223f6526e..e4f13619f 100644 --- a/htroot/yacy/ui/css/base.css +++ b/htroot/yacy/ui/css/base.css @@ -14,7 +14,7 @@ table.contentdom { text-align:center; margin:8px 0px 6px 0px; border:1px solid #CCCCCC; - + display:inline-block; } div.ys { clear: inherit; @@ -22,7 +22,7 @@ div.ys { } #searchbutton { width: 95px; - padding: 12px 0px 12px 0px; /* top right bottom left */ + height: 48px; margin: 20px 0px 0px 8px; /* border: 1px solid #CCCCCC; */ font: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif; diff --git a/htroot/yacy/ui/sidebar/sidebar_1.html b/htroot/yacy/ui/sidebar/sidebar_1.html index 5d0dee828..740a820dc 100644 --- a/htroot/yacy/ui/sidebar/sidebar_1.html +++ b/htroot/yacy/ui/sidebar/sidebar_1.html @@ -210,6 +210,7 @@ +
diff --git a/htroot/yacy/ui/yacyui-search.html b/htroot/yacy/ui/yacyui-search.html index 2bcc74322..ba32f0250 100644 --- a/htroot/yacy/ui/yacyui-search.html +++ b/htroot/yacy/ui/yacyui-search.html @@ -7,11 +7,18 @@ url: query, async: false, dataType: "xml", - success: function(xml) { - 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()); - var query = $(xml).find('opensearch\\:Query').attr('searchTerms'); + success: function(xml) { + if ($.browser.mozilla && ($.browser.version.replace(".","","g") > 1800)) { + 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()); + var query = $(xml).find('opensearch\\:Query').attr('searchTerms'); + } 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'); + } $(xml).find('item').each(function(){ var title = $(this).find('title').text(); var link = $(this).find('link').text(); @@ -24,7 +31,7 @@ .appendTo(tabid+" .yresult tbody"); }); //close each( var height=document.documentElement.clientHeight - 205; - var page = " " + (startIndex+1) + "-" + (startIndex+itemsPerPage) + " of " + totalResults + var page = " " + (startIndex+1) + "-" + (startIndex+itemsPerPage) + " of " + totalResults; $(tabid+" .yresult").flexigrid({ colModel: [ {display: 'Hash', name : 'hash', width : 50, sortable : false, align: 'center', hide: true}, @@ -82,8 +89,7 @@ } else { alert("Test!"); } - } - + } function load(com, grid) { var $tabs = $('#container ul'); var count = parseInt($(tabid).attr('count'));