From 848dbbd2805b17d17976ec4621cba14a0fab8008 Mon Sep 17 00:00:00 2001 From: apfelmaennchen Date: Wed, 24 Sep 2008 21:09:12 +0000 Subject: [PATCH] YaCy-UI: - added bookmark folder widget to sidebar (it uses the xbel.xml with XSLT! git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5206 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/yacy/ui/css/jquery.treeview.css | 68 ++ htroot/yacy/ui/img/treeview/file.gif | Bin 0 -> 110 bytes htroot/yacy/ui/img/treeview/folder-closed.gif | Bin 0 -> 105 bytes htroot/yacy/ui/img/treeview/folder.gif | Bin 0 -> 106 bytes htroot/yacy/ui/img/treeview/minus.gif | Bin 0 -> 837 bytes htroot/yacy/ui/img/treeview/plus.gif | Bin 0 -> 841 bytes .../ui/img/treeview/treeview-black-line.gif | Bin 0 -> 1877 bytes .../yacy/ui/img/treeview/treeview-black.gif | Bin 0 -> 1216 bytes .../ui/img/treeview/treeview-default-line.gif | Bin 0 -> 1993 bytes .../yacy/ui/img/treeview/treeview-default.gif | Bin 0 -> 1222 bytes .../img/treeview/treeview-famfamfam-line.gif | Bin 0 -> 807 bytes .../ui/img/treeview/treeview-famfamfam.gif | Bin 0 -> 1280 bytes .../ui/img/treeview/treeview-gray-line.gif | Bin 0 -> 1877 bytes htroot/yacy/ui/img/treeview/treeview-gray.gif | Bin 0 -> 1230 bytes .../ui/img/treeview/treeview-red-line.gif | Bin 0 -> 1877 bytes htroot/yacy/ui/img/treeview/treeview-red.gif | Bin 0 -> 1230 bytes htroot/yacy/ui/index.html | 10 +- htroot/yacy/ui/js/jquery.treeview.min.js | 15 + htroot/yacy/ui/js/jquery.xslTransform.js | 420 +++++++ htroot/yacy/ui/js/sarissa.js | 1025 +++++++++++++++++ htroot/yacy/ui/js/sarissa_ieemu_xpath.js | 220 ++++ htroot/yacy/ui/sidebar/sidebar_2.html | 14 +- htroot/yacy/ui/xsl/xbel2folder-ul.xsl | 39 + htroot/yacy/ui/yacyui-bookmarks.html | 5 +- htroot/yacy/ui/yacyui-search.html | 24 +- htroot/yacy/ui/yacyui-welcome.html | 1 + 26 files changed, 1824 insertions(+), 17 deletions(-) create mode 100644 htroot/yacy/ui/css/jquery.treeview.css create mode 100644 htroot/yacy/ui/img/treeview/file.gif create mode 100644 htroot/yacy/ui/img/treeview/folder-closed.gif create mode 100644 htroot/yacy/ui/img/treeview/folder.gif create mode 100644 htroot/yacy/ui/img/treeview/minus.gif create mode 100644 htroot/yacy/ui/img/treeview/plus.gif create mode 100644 htroot/yacy/ui/img/treeview/treeview-black-line.gif create mode 100644 htroot/yacy/ui/img/treeview/treeview-black.gif create mode 100644 htroot/yacy/ui/img/treeview/treeview-default-line.gif create mode 100644 htroot/yacy/ui/img/treeview/treeview-default.gif create mode 100644 htroot/yacy/ui/img/treeview/treeview-famfamfam-line.gif create mode 100644 htroot/yacy/ui/img/treeview/treeview-famfamfam.gif create mode 100644 htroot/yacy/ui/img/treeview/treeview-gray-line.gif create mode 100644 htroot/yacy/ui/img/treeview/treeview-gray.gif create mode 100644 htroot/yacy/ui/img/treeview/treeview-red-line.gif create mode 100644 htroot/yacy/ui/img/treeview/treeview-red.gif create mode 100644 htroot/yacy/ui/js/jquery.treeview.min.js create mode 100644 htroot/yacy/ui/js/jquery.xslTransform.js create mode 100644 htroot/yacy/ui/js/sarissa.js create mode 100644 htroot/yacy/ui/js/sarissa_ieemu_xpath.js create mode 100644 htroot/yacy/ui/xsl/xbel2folder-ul.xsl diff --git a/htroot/yacy/ui/css/jquery.treeview.css b/htroot/yacy/ui/css/jquery.treeview.css new file mode 100644 index 000000000..4ba19a2ad --- /dev/null +++ b/htroot/yacy/ui/css/jquery.treeview.css @@ -0,0 +1,68 @@ +.treeview, .treeview ul { + padding: 0; + margin: 0; + list-style: none; +} + +.treeview ul { + background-color: white; + margin-top: 4px; +} + +.treeview .hitarea { + background: url(../img/treeview/treeview-default.gif) -64px -25px no-repeat; + height: 16px; + width: 16px; + margin-left: -16px; + float: left; + cursor: pointer; +} +/* fix for IE6 */ +* html .hitarea { + display: inline; + float:none; +} + +.treeview li { + margin: 0; + padding: 3px 0pt 3px 16px; +} + +.treeview a.selected { + background-color: #eee; +} + +#treecontrol { margin: 1em 0; display: none; } + +.treeview .hover { color: red; cursor: pointer; } + +.treeview li { background: url(../img/treeview/treeview-default-line.gif) 0 0 no-repeat; } +.treeview li.collapsable, .treeview li.expandable { background-position: 0 -176px; } + +.treeview .expandable-hitarea { background-position: -80px -3px; } + +.treeview li.last { background-position: 0 -1766px } +.treeview li.lastCollapsable, .treeview li.lastExpandable { background-image: url(../img/treeview/treeview-default.gif); } +.treeview li.lastCollapsable { background-position: 0 -111px } +.treeview li.lastExpandable { background-position: -32px -67px } + +.treeview div.lastCollapsable-hitarea, .treeview div.lastExpandable-hitarea { background-position: 0; } + +.treeview-red li { background-image: url(../img/treeview/treeview-red-line.gif); } +.treeview-red .hitarea, .treeview-red li.lastCollapsable, .treeview-red li.lastExpandable { background-image: url(../img/treeview/treeview-red.gif); } + +.treeview-black li { background-image: url(../img/treeview/treeview-black-line.gif); } +.treeview-black .hitarea, .treeview-black li.lastCollapsable, .treeview-black li.lastExpandable { background-image: url(../img/treeview/treeview-black.gif); } + +.treeview-gray li { background-image: url(../img/treeview/treeview-gray-line.gif); } +.treeview-gray .hitarea, .treeview-gray li.lastCollapsable, .treeview-gray li.lastExpandable { background-image: url(../img/treeview/treeview-gray.gif); } + +.treeview-famfamfam li { background-image: url(../img/treeview/treeview-famfamfam-line.gif); } +.treeview-famfamfam .hitarea, .treeview-famfamfam li.lastCollapsable, .treeview-famfamfam li.lastExpandable { background-image: url(../img/treeview/treeview-famfamfam.gif); } + + +.filetree li { padding: 3px 0 2px 16px; } +.filetree span.folder, .filetree span.file { padding: 1px 0 1px 16px; display: block; } +.filetree span.folder { background: url(../img/treeview/folder.gif) 0 0 no-repeat; } +.filetree li.expandable span.folder { background: url(../img/treeview/folder-closed.gif) 0 0 no-repeat; } +.filetree span.file { background: url(../img/treeview/file.gif) 0 0 no-repeat; } diff --git a/htroot/yacy/ui/img/treeview/file.gif b/htroot/yacy/ui/img/treeview/file.gif new file mode 100644 index 0000000000000000000000000000000000000000..7e6216798f8e5abfc81a2fe2e5cb32b7a2d82e10 GIT binary patch literal 110 zcmZ?wbhEHb!0m5Y~9sd L;uWgGz+epk&R;19 literal 0 HcmV?d00001 diff --git a/htroot/yacy/ui/img/treeview/folder-closed.gif b/htroot/yacy/ui/img/treeview/folder-closed.gif new file mode 100644 index 0000000000000000000000000000000000000000..541107888e6739a7b367ad3d208e1efa933f877d GIT binary patch literal 105 zcmZ?wbhEHb6ky4lrdiO0bk3ZcRLy6E?4f Hg~1vCyv-@{ literal 0 HcmV?d00001 diff --git a/htroot/yacy/ui/img/treeview/folder.gif b/htroot/yacy/ui/img/treeview/folder.gif new file mode 100644 index 0000000000000000000000000000000000000000..2b31631ca2bfec3a8afb1bfdd4f8ed4c5bcc3a18 GIT binary patch literal 106 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 literal 0 HcmV?d00001 diff --git a/htroot/yacy/ui/img/treeview/treeview-gray-line.gif b/htroot/yacy/ui/img/treeview/treeview-gray-line.gif new file mode 100644 index 0000000000000000000000000000000000000000..37600447dc002bbc0dd16e1391b711360aae2e34 GIT binary patch literal 1877 zcmeH``8OK|0LL@bF~qSc#n50?JXNI+k>{#)#go3O{g`&sTA06+?`JRv{%1VB*=kSggPTmbZ?E2@Hm10RaqGJr~M_swEK9(fuU z9bXMur@nY#Xn3Qp;v6X2AT> zA>EM+>y@m1^a49s_E1X&+bZH^!_a=e{N6Su)s&U>sDnd!~=b?JFEB#FT8 zioZMFaK52~t&52oqdWW~2MJ1ue%%?en#qCfU7u!nC|sSJi5E`}X3h8)ly{+5*|mp+ zYqNE`8MkZN-)k};oze-j%*tB&sNuZif|=0wM%!=l0sXF(V)Zg+3_ zjbW;EBEX2ytHG=$Dx2Ha{HE%5V3a1hHnd2R32m%R*9#gFWf^4tEW&~!6yIiV)*e*l zireg~b4-8KL1b9Tn<4TQc-aUN7>=bBxE!0Aep)ES$dA>bZ zlac_>GSf$}Amq|xpG2f_X<$)PU0E=BExZ&}FuYP8&bwD%fgJCOsK5%!A}jIpO{>+( zGV75wBp|A>JOyOlNY1dq-7SE-P1iq3bVQx6%Yk<{*5}84F?-+_`Yq}S#U}_=SCzX? zX`+&GsCqhDsvFh7AWWM#ck=(Rps}W(-f3)-hf$w$i>58wymeug)RAsnbE^=j9L-?f zpi-Z);Tuuyqj4L}9YcZxTIWO&p4K%*X3?0-?f4ef8jtm%XgkyEBd6Ds8uOK?%`{)>0D(Cr`A4IcZoG`&U18YKqjoYtzQo|Dt=**7zk597IbK9sJXFyhNi zwtW@gRcSW?gGKMW@kxrlG#OY-do~qJ*-V&3Js8`Y3GYwom_@$iB+g=ml}U5>1u1QR zAzAiA(jrL>&74Uwwqm}`xJ1AT;O_GsONn5#!*ULyhq;oEIkp%2g#mF(6lf@Jxhn4i zV~t87;8y4{2KZG5ao+KL=SUTJlQq*4|E@_PjJ3`!o(GG)^}?JsMpy*)mQYPCf1;Sk`8-A8at@Xm#Gb>oe(v%3b{156)aykj?nu&|IbZfh z!lZx$?iVd}BHwuNSkmco3iwy5Drr$xV-lid6PqT(u95$N>8c#Jm2RMN_SB1WJe9Oq z(x$uU@TQLQX@QVr>U~Sa;vEmbZ_QL7odp^*-BsqVXSqmf)oqYES3tl*66F0YO=#d1 rlgk$~puxAlhuJ^ZHqgioD1o1DVtQEUit~KllU0$5nh)jV0N{TCC3Zqn literal 0 HcmV?d00001 diff --git a/htroot/yacy/ui/img/treeview/treeview-gray.gif b/htroot/yacy/ui/img/treeview/treeview-gray.gif new file mode 100644 index 0000000000000000000000000000000000000000..cfb8a2f0961b880d9ecc9e59f831d0c0bf9d06db GIT binary patch literal 1230 zcmZ?wbhEHbOkikb_|5F}1vNN-#bFE}n2rob1X65+pkEe*DZwLSXy)sc-G6LrLE|#j%ny@ltx#{|>*k3`b zudj+f+$8$@s#fHh^zF++cYjOsT#=i)PgZ*SBbQFk<=6g7TzYe_x%fYqoR5WW_>5Nf zsIRkcJbHA@c(c>D3XzqU)=k#8J9nngIK5|{y|vw$2$RE?mT4~XtDRLEe|<_~c?_?$ zLGJZ!!S{W4%zp58Z=>w%X})`Qe0&`0sXRUALwVLJuj#KvHA1S2+ow&BYJYdfr2O^1 zna!)!@5=7^`T51=)#j2iwbhrWRX*39_q(R{^Y??#w#k`8!n#b?Ah=gT4^b_6Je!p-pqnUi6)T{Kw4)JLb3tD)cb}Z;R&ALM=NKo^J zQum3S7LQAK7iB!^v-vhdvhxz-&N&k%mqtvOXdV2 literal 0 HcmV?d00001 diff --git a/htroot/yacy/ui/img/treeview/treeview-red-line.gif b/htroot/yacy/ui/img/treeview/treeview-red-line.gif new file mode 100644 index 0000000000000000000000000000000000000000..df9e749a8f1f58862588efc64988003efad01d51 GIT binary patch literal 1877 zcmeH``BxGK0LPh{$5cGF%CuRcF0W^1+Eb91Y0har@ns%QJPI-bCps}CP-u#GY96he zH{=x}8cR_?6wMSBHp}~@d8B5Ec_ztT`#0A2hwu02&*#0br`JzT&Np-c8>+j2FWJW9 z|J$$i)xiJGfXTkfHvoVFVDp9i%O?Qp3V=f6d5==7Sk4KMl>Ucik`YxtvJ<)$%#TPKR% zdeBegW3Nr-TZ$_DvX!7#=EQu`)|{{_NO4?Hnuz--`I}N3UjF&+?uwLk+=>GJd{B_Tc2OKbjN9H> z96NPSF%oo|+^NT@plDh-RsN>!ws$&N>eV+-RSK`GN-+xQlcpP|{VXMbZmGY?Sg+bE z&yqDeRb-m~Xn;($Rkc9os0lNWR0x7V&viYtFw425?`)O{#Xnxi^Z-rV%z`xuPf1K3U`ignx^9LiY{9RF`M1 z((4&CBBq9gRTxIqvdNQH4XvU-teM=&r#I{BRpE@Mf`UowW*aYDTj; zR~d}wJj7bmv%$EvhL%3@95+YnP@jZFjkyaK?LZqem&Cp}E@#J}7%>obDszfKXbSed{!N zqe%A5h1G9<<|OWgt(pyPNUi%mt_OllWQ$!DHV#9VzJogSLla83`aMi%;zcml$vXr7 zf<%YcL08HgN8s@2tufz(==0;jh0Ny@q4f1T-P5MdE9;FzHSA-Pm3Wn^KX5K-#%-h+YndE*c}A#} z97|nymmXX*xOhw~p_=<#*Rp;q1c;i_)TkyvQ;xgVtY5mTyh_&|ZEzU`%%?)%UDt;N sUpBjNE)^Df<9oQ%i{r+6SwTgJWAz*lYeQMK?>m|{T3!EviV6VoFXq=mv;Y7A literal 0 HcmV?d00001 diff --git a/htroot/yacy/ui/img/treeview/treeview-red.gif b/htroot/yacy/ui/img/treeview/treeview-red.gif new file mode 100644 index 0000000000000000000000000000000000000000..3bbb3a157f1568d59d6db02b55a3b3fe9a1ff7a7 GIT binary patch literal 1230 zcmZ?wbhEHbOkikb_|5q9rFMYXq;dkzBCUd%AXV z7f->2WoKqf=UU0E5MF-1&C2oHA5RfQ-wyu&du5`wWCYCfT`X0jHDP7Qa?|x$vA=>= zUtbk}xJmT)RjtT1>D!lu?*5kMxgs}ppRDxuM=qV7%dh>Fxb)^;bMb#JIUft%@ENV{ zQD0}@c=YI)@n)xQ6(TDyt(&ZGckWD~aeB`@duzKh5hjN(Ez?}&S39dT{`!=}@)%xg zgWT)eg75q8nEl}G-bUHi(|q^r`1m-~Q+ayKhw`jdUejNTYJ^l3w@;fM)&A~|N%`x2 zGn-ed-<93-^Ye?#tIZ{4YO60#t9-6I?{`h@=kEuf$II8+R(@HSYaUSgyf$2+OgK}0 zZsRjUi+L5dHILtK5edt9=qI|b{eIzIMl<7PRm>?O4!tnstX#kf7!b zrS20uEgqNfF3Nb+XY*}_WalNuopUBkE{&Kl(L5+ZuF(6`HI*Fyu5b4nE$kweHiYk+ hA)Dse=Ki!azG~* - + + + + + @@ -28,7 +32,9 @@ - + + + @@ -78,7 +85,10 @@

- +

Bookmark Folders

+
+
    +
    diff --git a/htroot/yacy/ui/xsl/xbel2folder-ul.xsl b/htroot/yacy/ui/xsl/xbel2folder-ul.xsl new file mode 100644 index 000000000..444cfd157 --- /dev/null +++ b/htroot/yacy/ui/xsl/xbel2folder-ul.xsl @@ -0,0 +1,39 @@ + + + + + +
    +     + + + + + + + +
  • + +
      + +
    +
    • +     + + + + + + +
  • + + + +
    • +     + + + + + +     \ No newline at end of file diff --git a/htroot/yacy/ui/yacyui-bookmarks.html b/htroot/yacy/ui/yacyui-bookmarks.html index ff60aab6d..692a073d0 100644 --- a/htroot/yacy/ui/yacyui-bookmarks.html +++ b/htroot/yacy/ui/yacyui-bookmarks.html @@ -23,8 +23,11 @@ url: "/xml/bookmarks/posts/add_p.xml?login="+query, dataType: "xml", success: function(xml) { + $('#bmaddform').resetForm(); $("#bmadd").dialog("close"); - $tabs.tabs("load", 3); + $tabs.tabs("load", 3); + $("#side2 *").remove(); + $("#side2").load("sidebar/sidebar_2.html"); } }); } diff --git a/htroot/yacy/ui/yacyui-search.html b/htroot/yacy/ui/yacyui-search.html index ba32f0250..87b6db2f8 100644 --- a/htroot/yacy/ui/yacyui-search.html +++ b/htroot/yacy/ui/yacyui-search.html @@ -7,8 +7,8 @@ url: query, async: false, dataType: "xml", - success: function(xml) { - if ($.browser.mozilla && ($.browser.version.replace(".","","g") > 1800)) { + success: function(xml) { + if (($.browser.mozilla && (parseInt($.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()); @@ -41,13 +41,13 @@ {display: 'Date', name : 'date', width : 130, sortable : true, align: 'left'} ], buttons: [ - {name: 'Bookmark', bclass: 'bookmark', onpress: test}, - {name: 'Crawl', bclass: 'crawl', onpress: test}, - {name: 'Blacklist', bclass: 'blacklist', onpress: test}, - {name: 'Refresh', bclass: 'load', onpress: load}, + {name: 'Bookmark', bclass: 'bookmark', onpress: yaction}, + {name: 'Crawl', bclass: 'crawl', onpress: yaction}, + {name: 'Blacklist', bclass: 'blacklist', onpress: yaction}, + {name: 'Refresh', bclass: 'load', onpress: yload}, {separator: true}, - {name: page, bclass: 'prev', onpress: load}, - {name: ' ', bclass: 'next', onpress: load}, + {name: page, bclass: 'prev', onpress: yload}, + {name: ' ', bclass: 'next', onpress: yload}, {separator: true} ], striped: true, @@ -66,9 +66,9 @@ }); */ - function test(com, grid) { + function yaction(com, grid) { if (com == 'Bookmark') { - confirm('Add' + $('.trSelected',grid).length + ' bookmark(s)?') + confirm('Add ' + $('.trSelected',grid).length + ' search results to bookmark(s)?') $('.trSelected',grid).each(function(){ var url = $(this).find('.url').text(); var title = $(this).find('.linktitle').text(); @@ -82,7 +82,7 @@ url: "/xml/bookmarks/posts/add_p.xml?login="+query, dataType: "xml", success: function(xml) { - alert("Posted bookmark for: "+url); + alert("Debug: posted bookmark for: "+url); } }); }); @@ -90,7 +90,7 @@ alert("Test!"); } } - function load(com, grid) { + function yload(com, grid) { var $tabs = $('#container ul'); var count = parseInt($(tabid).attr('count')); var offset = parseInt($(tabid).attr('offset')); diff --git a/htroot/yacy/ui/yacyui-welcome.html b/htroot/yacy/ui/yacyui-welcome.html index f775688bd..5df2fe7ff 100644 --- a/htroot/yacy/ui/yacyui-welcome.html +++ b/htroot/yacy/ui/yacyui-welcome.html @@ -7,6 +7,7 @@ apfelmaennchen

    Change Log

      +
    • 23-09-2008: Added bookmark folder widget to sidebar (it uses the xbel.xml with XSLT!
    • 21-09-2008: Enabled the new language selection - special thanks to orbiter
    • 21-09-2008: Added basic functionallity to add bookmark(s) from search results
    • 21-09-2008: Re-design of sidebar search form