From 441035f1f4313ca29c153838f7006f9fd9cd883a Mon Sep 17 00:00:00 2001 From: apfelmaennchen Date: Mon, 2 May 2011 20:11:58 +0000 Subject: [PATCH] YMarks: some improvements to flexigrid quick search on YMarks.html git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7694 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/YMarks.html | 39 ++++++++----- htroot/api/ymarks/get_tags.java | 16 +++--- htroot/api/ymarks/get_ymark.java | 58 ++++++-------------- source/de/anomic/data/ymark/YMarkTables.java | 2 +- 4 files changed, 51 insertions(+), 64 deletions(-) diff --git a/htroot/YMarks.html b/htroot/YMarks.html index dba13e80c..cf88a8157 100644 --- a/htroot/YMarks.html +++ b/htroot/YMarks.html @@ -14,8 +14,8 @@ HTMLenc = function(s) { return $('
').text(s).html(); } - $(document).ready(function() { - var height=document.documentElement.clientHeight - 180; + $(document).ready(function() { + var height=document.documentElement.clientHeight - 220; $('#ymarks').flexigrid({ url: '/api/ymarks/get_ymark.json', dataType: 'json', @@ -44,9 +44,13 @@ {name: 'Help', bclass: 'help', onpress: bm_action}, ], searchitems : [ - {display: 'Tags', name : 'tags'}, - {display: 'Folders', name : 'folders'}, - {display: 'Title', name : 'title'}, + {display: 'Full text (regexp)', name : ''}, + {display: 'Tags (comma seperated)', name : '_tags'}, + {display: 'Tags (regexp)', name : 'tags'}, + {display: 'Singel Folder', name : '_folder'}, + {display: 'Folders (regexp)', name : 'folders'}, + {display: 'Title (regexp)', name : 'title'}, + {display: 'Description (regexp)', name : 'desc'} ], useRp: true, rp: 15, @@ -63,16 +67,17 @@ /* Init Sidebar_1 */ $("#side1").accordion({ autoHeight: false, - clearStyle: true, + clearStyle: true, + collapsible: true, header: "h3" }); loadTagCloud(); - $("#side1").accordion("activate", 0); + $("#side1").accordion("activate", 1); }); function loadTagCloud() { $("#tagcloud *").remove(); - $("#sidebar-2-1").toggleClass("ui.loading"); + $("#sidebar-1-1").toggleClass("ui.loading"); $.ajax({ type: "POST", url: "/api/ymarks/get_tags.xml?top=25&sort=alpha", @@ -86,9 +91,18 @@ if (size < 1) {size = 1;} $('') .html(HTMLenc(tag)+' ') - .appendTo('#tagcloud') + .appendTo('#tagcloud') + .bind('click', function() { + var qtag = $(this).text().replace(/\s+/g,""); + $('#ymarks').flexOptions({ + query: qtag, + qtype: "_tags" + }); + $('#ymarks').flexReload(); + }); }); //close each( $("#sidebar-1-1").toggleClass("ui.loading"); + $("#side1").accordion("activate", 0); } }); //close $.ajax( }; @@ -180,16 +194,13 @@

-