mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
- bookmarks are now retrieved from /xml/bookmarks/xbel/xbel.xml and do no longer require a seperate servlet
- minor bug fixes - refactoring (obsolete items) git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4783 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
apfelmaennchen
parent
f44d5d302b
commit
fa3ed2888d
|
|
@ -64,7 +64,7 @@ div.top {
|
|||
color: #999999;
|
||||
}
|
||||
.small {
|
||||
font: normal Arial, Helvetica, sans-serif;
|
||||
font: normal small Arial, Helvetica, sans-serif;
|
||||
font-size: 9px;
|
||||
}
|
||||
.normal {
|
||||
|
|
@ -250,12 +250,12 @@ div.searchresults.hidden {
|
|||
margin-bottom:0.6em;
|
||||
margin-left:22px;
|
||||
}
|
||||
.searchresults .url a,. searchselect .url a {
|
||||
.searchresults .url a, .searchselect .url a {
|
||||
color:#20A020;
|
||||
text-decoration:none;
|
||||
}
|
||||
img.favicon{
|
||||
width: 16px;pagesize
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
vertical-align: middle;
|
||||
margin-left: -20px;
|
||||
|
|
|
|||
|
|
@ -10,16 +10,18 @@
|
|||
apfelmaennchen
|
||||
<h3>Change Log</h3>
|
||||
<ul>
|
||||
<li>19-04-2007: new double-accordion sidebar menu is up and running (I am open for suggestions on how to populate the menus).</li>
|
||||
<li>19-04-2007: search results are now retrieved from yacysearch.rss (XML) and does no longer need a seperate servlet</li>
|
||||
<li>10-05-2008: bookmarks are now retrieved from /xml/bookmarks/xbel/xbel.xml and do no longer require a seperate servlet</li>
|
||||
<li>19-04-2008: new double-accordion sidebar menu is up and running (I am open for suggestions on how to populate the menus).</li>
|
||||
<li>19-04-2008: search results are now retrieved from yacysearch.rss (XML) and do no longer need a seperate servlet</li>
|
||||
</ul>
|
||||
<h3>Bug Tracker</h3>
|
||||
<ul>
|
||||
<li>Please report bugs in the official <a href="http://forum.yacy-websuche.de/">YaCy-Forum</a> - thanks!</li>
|
||||
<li>19-04-2007: if you open more than one search tab, only the first result item is shown. I would be greatful for any hint...</li>
|
||||
<li>19-04-2007: resource types 'sciencenet' and 'bookmarks' doen't work yet. For 'sciencenet' we have to solve the Ajax cross domain restriction.</li>
|
||||
<li>19-04-2007: currently only contentdom="text" is working, all others will fail...</li>
|
||||
<li>19-04-2007: language selection is not yet supported</li>
|
||||
<li>10-05-2008: there is an issue with Firefox 3.0b5 and the jQuery XML parsing of the search result (one symptom is the broken pagination)</li>
|
||||
<li>19-04-2008: if you open more than one search tab in Firefox 2.x or Safari, only the first result item is shown. I would be greatful for any hint...</li>
|
||||
<li>19-04-2008: resource types 'sciencenet' and 'bookmarks' doen't work yet. For 'sciencenet' we have to solve the Ajax cross domain restriction.</li>
|
||||
<li>19-04-2008: currently only contentdom="text" is working, all others will fail...</li>
|
||||
<li>19-04-2008: language selection is not yet supported</li>
|
||||
</ul>
|
||||
|
||||
|
||||
|
|
@ -1,13 +1,32 @@
|
|||
|
||||
<script type="text/javascript">
|
||||
//<![CDATA[
|
||||
$(document).ready(function() {
|
||||
$('#ymarks')
|
||||
.tablesorter({widgets: ['zebra']})
|
||||
.tablesorterPager({container: $('#pager'), size: 5, positionFixed: false});
|
||||
$(document).ready(function() {
|
||||
$("#side1").accordion("activate", 1);
|
||||
$("#side3").accordion("activate", 2);
|
||||
$('#yoptions').resetForm();
|
||||
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
url: "/xml/bookmarks/xbel/xbel.xml?login=",
|
||||
dataType: "xml",
|
||||
success: function(xml) {
|
||||
$(xml).find('bookmark').each(function(){
|
||||
var link = $(this).attr('href');
|
||||
var hash = $(this).attr('id');
|
||||
var title = $(this).find('title').text();
|
||||
var date = "01-01-0101";
|
||||
var desc = $(this).find('desc').text();
|
||||
var tags = $(this).find('metadata').attr('ShortcutURL');
|
||||
$('<tr></tr')
|
||||
.html('<td><input type="checkbox" value="true" /></td><td><img src="img-2/world2.png" alt="public bookmark" title="public bookmark"/></td><td><h3 class="linktitle">' +title+ '</h3><p class="desc">' +desc+ '</p><p class="url"><a href="' +link+ '">' +link+ '</a></p><td>' +tags+ '</td><td>' +date+ '</td><td><a href="/Bookmarks.html?edit=' +hash+ '"><img src="img-2/pencil.png" alt="edit bookmark" title="edit bookmark" /></a><img src="img-2/cancel.png" alt="delete bookmark" title="delete bookmark"/></td>')
|
||||
.appendTo('#ymarks tbody');
|
||||
}); //close each(
|
||||
$('#ymarks')
|
||||
.tablesorter({widgets: ['zebra']})
|
||||
.tablesorterPager({container: $('#pager'), size: 5, positionFixed: false});
|
||||
}
|
||||
}); //close $.ajax(
|
||||
});
|
||||
//]]>
|
||||
</script>
|
||||
|
|
@ -32,36 +51,7 @@
|
|||
<th class="{sorter: false}"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
#{bookmarks}#
|
||||
<tr>
|
||||
<td>
|
||||
<input type="checkbox" value="true" />
|
||||
</td>
|
||||
<td>
|
||||
#(public)#
|
||||
<img src="img-2/lock.png" alt="private bookmark" title="private bookmark"/>
|
||||
::
|
||||
<img src="img-2/world2.png" alt="public bookmark" title="public bookmark"/>
|
||||
#(/public)#
|
||||
</td>
|
||||
<td>
|
||||
<h3 class="linktitle">#[title]#</h3>
|
||||
<p class="desc">#[description]#</p>
|
||||
<p class="url"><a href="#[link]#">#[link]#</a></p>
|
||||
</td>
|
||||
<td>#{tags}# #[tag]#,#{/tags}#</td>
|
||||
<td>
|
||||
#[date]#
|
||||
</td>
|
||||
<td>
|
||||
<a href="Bookmarks.html?edit=#[hash]#">
|
||||
<img src="img-2/pencil.png" alt="edit bookmark" title="edit bookmark" />
|
||||
</a>
|
||||
<img src="img-2/cancel.png" alt="delete bookmark" title="delete bookmark"/>
|
||||
</td>
|
||||
</tr>
|
||||
#{/bookmarks}#
|
||||
<tbody>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,17 @@
|
|||
//<![CDATA[
|
||||
$(function() {
|
||||
$("#side3").accordion("activate", 0);
|
||||
var pagination = tabid + " .pagination";
|
||||
$('<div class="pagination"></div>').html('[loading...]').appendTo(tabid);
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
url: query,
|
||||
dataType: "xml",
|
||||
success: function(xml) {
|
||||
var totalResults = parseInt($(xml).find('totalResults').text().replace(".",""));
|
||||
var startIndex = parseInt($(xml).find('startIndex').text());
|
||||
var startIndex = parseInt($(xml).find('startIndex').text());
|
||||
var itemsPerPage = parseInt($(xml).find('itemsPerPage').text());
|
||||
var query = $(xml).find('Query').attr('searchTerms');
|
||||
var query = $(xml).find('Query').attr('searchTerms');
|
||||
var endIndex = startIndex+itemsPerPage;
|
||||
if (endIndex > totalResults) {
|
||||
endIndex = totalResults;
|
||||
|
|
@ -21,8 +23,8 @@
|
|||
var currentPage = ((startIndex-1)/itemsPerPage);
|
||||
} else {
|
||||
var currentPage = 0;
|
||||
}
|
||||
$("#pagination").pagination(totalResults, {
|
||||
}
|
||||
$(pagination).pagination(totalResults, {
|
||||
current_page:currentPage,
|
||||
items_per_page:itemsPerPage,
|
||||
num_edge_entries:1,
|
||||
|
|
@ -69,5 +71,4 @@
|
|||
}); //close $(
|
||||
//]]>
|
||||
</script>
|
||||
<div id="pagination" class="pagination">[loading...]</div>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user