From f7fd3d30c2fbac4546e3435feac9833d9419fca7 Mon Sep 17 00:00:00 2001 From: apfelmaennchen Date: Sat, 7 Mar 2009 10:20:34 +0000 Subject: [PATCH] - various changes to RichClient - improved search stability git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5675 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/yacy/ui/css/base.css | 79 ++++++++++++++------------- htroot/yacy/ui/index.html | 17 ++++-- htroot/yacy/ui/sidebar/sidebar_1.html | 3 +- htroot/yacy/ui/yacyui-search.html | 24 ++++---- 4 files changed, 66 insertions(+), 57 deletions(-) diff --git a/htroot/yacy/ui/css/base.css b/htroot/yacy/ui/css/base.css index 350e7dfe4..c56778662 100644 --- a/htroot/yacy/ui/css/base.css +++ b/htroot/yacy/ui/css/base.css @@ -65,31 +65,31 @@ table.contentdom { div.ys { clear: inherit; float:left; -} -#searchbutton { - width: 95px; +} +#searchbutton { + width: 95px; height: 48px; margin: 20px 0px 0px 8px; - /* border: 1px solid #CCCCCC; */ + /* border: 1px solid #CCCCCC; */ font: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif; - font-size: 12px; - /* color: #999999; */ + font-size: 12px; + /* color: #999999; */ } .filter { width: 190px; - margin-bottom: .5em; - padding: 2px 0px 2px 0px /* top right bottom left */ - border: 1px solid #CCCCCC; - font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif; + margin-bottom: .5em; + padding: 2px 0px 2px 0px /* top right bottom left */ + border: 1px solid #CCCCCC; + font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif; font-size: 12px; /* color: #999999; */ } .selector { width: 120px; - margin-bottom: .5em; - padding: 2px 0px 2px 0px; /* top right bottom left */ - border: 1px solid #CCCCCC; - font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif; + margin-bottom: .5em; + padding: 2px 0px 2px 0px; /* top right bottom left */ + border: 1px solid #CCCCCC; + font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif; font-size: 12px; /* color: #999999; */ } @@ -175,42 +175,41 @@ img.help { /* YaCy Bookmarks ---------------------------*/ .url { padding-top: 1px; - font-size: 0.9em; - line-height: 1.2em; - margin-bottom:0.6em; + font-size: 0.9em; + line-height: 1.2em; + margin-bottom:0.6em; } -h3.linktitle { +h3.linktitle { margin-top:2px; - margin-bottom: -0.5em; - font-size: 1.0em; + margin-bottom: -0.5em; + font-size: 1.0em; line-height: 1.2em; - color:#239AFF; + color:#239AFF; } -.url a { - color:#20A020; - text-decoration:none; +.url a { + color:#20A020; + text-decoration:none; } -.desc { +.desc { font-style:italic; - font-size: 0.9em; - color: #808080; - line-height: 1.2em; - margin-bottom:-1em; + font-size: 0.9em; + color: #808080; + line-height: 1.2em; + margin-bottom:-1em; } -.bm_input { - width: 340px; +.bm_input, .bm_select { 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: 1.0em; + margin: 0px 0px 2px 10px; } +.bm_input { width: 240px; } +.bm_select { width: 100px; } +.bm_dialog label { margin: 6px 0px 2px 10px;} .bm_dialog { - margin: 10px 10px 10px 10px; - font-size: .9em; + margin: 5px 5px 5px 5px; + font-size: 1.1em; } -#yfolder { - margin: 5px 5px 10px 20px; /* top right bottom left */ +#yfolder { max-height: 250px; overflow-x: hidden; overflow-y: auto; @@ -270,5 +269,7 @@ h3.linktitle { padding: 1px 0px 0px 18px; display: block; } - +.filetree ul, .filetree li { + background-color: transparent; +} diff --git a/htroot/yacy/ui/index.html b/htroot/yacy/ui/index.html index 70c8cada3..4ad8f5ea3 100644 --- a/htroot/yacy/ui/index.html +++ b/htroot/yacy/ui/index.html @@ -60,6 +60,12 @@ flex = {}; bmk_tab = 2; tabid = "#Welcome"; + + $.ajaxSetup({ + timeout: 3000, + cache: false + }) + /* Initialize Tabs and set up close function */ $tabs = $('#tabs-container').tabs({ // tabs options @@ -134,8 +140,8 @@ /* Initialize Bookmark Dialog */ $("#bmadd").dialog({ autoOpen: false, - height: 365, - width: 400, + height: 400, + width: 300, position: ['top',100], modal: true, resizable: false, @@ -306,6 +312,10 @@
+

+ + Add or edit bookmark +


@@ -331,7 +341,7 @@

- @@ -383,4 +393,3 @@ - diff --git a/htroot/yacy/ui/sidebar/sidebar_1.html b/htroot/yacy/ui/sidebar/sidebar_1.html index e73aa591c..78b3bf51e 100644 --- a/htroot/yacy/ui/sidebar/sidebar_1.html +++ b/htroot/yacy/ui/sidebar/sidebar_1.html @@ -78,7 +78,8 @@ - + +
diff --git a/htroot/yacy/ui/yacyui-search.html b/htroot/yacy/ui/yacyui-search.html index 3e73137c5..c201a86d6 100644 --- a/htroot/yacy/ui/yacyui-search.html +++ b/htroot/yacy/ui/yacyui-search.html @@ -49,6 +49,7 @@ var page = (data.channels[0].startIndex / data.channels[0].itemsPerPage) + 1; var search = data.channels[0].searchTerms; var rows = {}; + var counter = 0; $.each ( data.channels[0].items, function(i,item) { @@ -56,9 +57,11 @@ var html = "

"+item.title+"

"+item.description+"

"+item.link+"" var fav = ""; rows[i] = {id: item.guid, cell: [item.guid, fav, html, "Tags", "Folders", item.pubDate]}; + counter++; } } - ); + ); + if (total < counter) total = counter; var bhtml = "

  • "+search+"
      "; $.each ( data.channels[0].topwords, @@ -109,20 +112,15 @@ if (p.params) { for (var pi = 0; pi < p.params.length; pi++) param[param.length] = p.params[pi]; } - $.ajax({ - type: p.method, - url: p.url, - data: param, - dataType: p.dataType, - success: function(data){ - /* yacy limits itemsPerPage for unauthenticated users */ + + $.getJSON(url, param, + function(json, status){ + if (json[0]) data = json[0]; + else data = json; p.rp = parseInt(data.channels[0].itemsPerPage); g.flexAddData(data); - }, - error: function(data) { - try { if (p.onError) p.onError(data); } catch (e) {} - } - }); + } + ); } }); });