boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

Add UI for numbered page navigation when Javascript re-sorting is enabled.

Browse Source
pull/104/head
JeremyRand 8 years ago
parent 74333c931e
commit a888254769
No known key found for this signature in database
GPG Key ID: B3F2D165786D6570
3 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File

27
htroot/js/yacysearch.js
Unescape View File

@ -42,9 +42,12 @@ function fadeOutBar() {
}
/**
* @param offset item number to start with
* @param itemsperpage count of items requested per page
* @param totalcount count of items available from YaCy node for this query
* @returns pagination buttons
*/
function renderPaginationButtons(offset, itemsperpage, totalcount, navurlbase, localQuery) {
function renderPaginationButtons(offset, itemsperpage, totalcount, navurlbase, localQuery, jsResort) {
var resnav = "<ul class=\"pagination\">";
var thispage = Math.floor(offset / itemsperpage);
var firstPage = thispage - (thispage % 10);
@ -52,7 +55,11 @@ function renderPaginationButtons(offset, itemsperpage, totalcount, navurlbase, l
resnav += "<li class=\"disabled\"><a title=\"Previous page\" href=\"#\">&laquo;</a></li>";
} else {
resnav += "<li><a id=\"prevpage\" title=\"Previous page\" accesskey=\"p\" href=\"";
resnav += (navurlbase + "&amp;startRecord=" + ((thispage - 1) * itemsperpage));
if (jsResort) {
resnav += ("javascript:numberedPage(" + (thispage - 1) + ");");
} else {
resnav += (navurlbase + "&amp;startRecord=" + ((thispage - 1) * itemsperpage));
}
resnav += "\">&laquo;</a></li>";
}
@ -66,7 +73,11 @@ function renderPaginationButtons(offset, itemsperpage, totalcount, navurlbase, l
resnav += "</a></li>";
} else {
resnav += "<li><a href=\"";
resnav += (navurlbase + "&amp;startRecord=" + (i * itemsperpage));
if (jsResort) {
resnav += ("javascript:numberedPage(" + (i) + ");");
} else {
resnav += (navurlbase + "&amp;startRecord=" + (i * itemsperpage));
}
resnav += "\">" + (i + 1) + "</a></li>";
}
}
@ -74,7 +85,11 @@ function renderPaginationButtons(offset, itemsperpage, totalcount, navurlbase, l
resnav += "<li class=\"disabled\"><a href=\"#\" title=\"Next page\">&raquo;</a></li>";
} else {
resnav += "<li><a id=\"nextpage\" title=\"Next page\" accesskey=\"n\" href=\"";
resnav += (navurlbase + "&amp;startRecord=" + ((thispage + 1) * itemsperpage));
if (jsResort) {
resnav += ("javascript:numberedPage(" + (thispage + 1) + ");");
} else {
resnav += (navurlbase + "&amp;startRecord=" + ((thispage + 1) * itemsperpage));
}
resnav += "\">&raquo;</a>";
}
resnav += "</ul>";
@ -95,7 +110,7 @@ function parseFormattedInt(strIntValue) {
return intValue;
}
function statistics(offset, itemscount, itemsperpage, totalcount, localIndexCount, remoteIndexCount, remotePeerCount, navurlbase, localQuery, feedRunning) {
function statistics(offset, itemscount, itemsperpage, totalcount, localIndexCount, remoteIndexCount, remotePeerCount, navurlbase, localQuery, feedRunning, jsResort) {
var totalcountIntValue = parseFormattedInt(totalcount);
var offsetIntValue = parseFormattedInt(offset);
var itemscountIntValue = parseFormattedInt(itemscount);
@ -174,7 +189,7 @@ function statistics(offset, itemscount, itemsperpage, totalcount, localIndexCoun
}
var resnavElement = document.getElementById("resNav");
if (resnavElement != null) {
resnavElement.innerHTML = renderPaginationButtons(offsetIntValue, itemsperpageIntValue, totalcountIntValue, navurlbase, localQuery);
resnavElement.innerHTML = renderPaginationButtons(offsetIntValue, itemsperpageIntValue, totalcountIntValue, navurlbase, localQuery, jsResort);
}
}

16
htroot/js/yacysort.js
Unescape View File

@ -28,8 +28,20 @@ var displayPage = function() {
}
});
$("#offset").html($("#resultscontainer .searchresults.earlierpage").length + 1);
$("#itemscount").html($("#resultscontainer .searchresults.earlierpage").length + $("#resultscontainer .searchresults.currentpage").length);
// TODO: The following statistical displays could maybe be moved to the latestinfo() call.
var offset = $("#resultscontainer .searchresults.earlierpage").length + 1;
var itemscount = $("#resultscontainer .searchresults.earlierpage").length + $("#resultscontainer .searchresults.currentpage").length;
// TODO: This seems to often be smaller than the "totalcount" that statistics() ends up with. Why is that?
var totalcount = $("#resultscontainer .searchresults").length;
$("#offset").html(offset);
$("#itemscount").html(itemscount);
$("#resNav").html(renderPaginationButtons(offset, requestedResults, totalcount, null, theLocalQuery, true));
//latestinfo();
console.log("Showing results " + ($("#resultscontainer .searchresults.earlierpage").length + 1) + " - " + ($("#resultscontainer .searchresults.earlierpage").length + requestedResults) + " out of " + $("#resultscontainer .searchresults").length + "; notEarlierPage = " + $("#resultscontainer .searchresults:not(.earlierpage)").length);
};

11
htroot/yacysearch.html
Unescape View File

@ -16,6 +16,7 @@
<script type="text/javascript">
var requestedResults = #[results]#;
var theEventID = "#[eventID]#";
var theLocalQuery = #[localQuery]#;
</script>
<script type="text/javascript" src="js/yacysort.js"></script>
#(/jsResort)#
@ -209,11 +210,7 @@ document.getElementById("Enter").innerHTML = "search again";
::
::
::
#(jsResort)#
<span id="resNav" class="col-sm-12 col-md-12" style="display: inline;"></span>
::
<p><br><br><a href="javascript:earlierPage();">Prev Page</a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:laterPage();">Next Page</a></p>
#(/jsResort)#
<span id="resNav" class="col-sm-12 col-md-12" style="display: inline;"></span>
::
#(/num-results)#
@ -254,9 +251,9 @@ function latestinfo() {
if(rsp && rsp.offset != null) {
#(jsResort)#
statistics(rsp.offset, rsp.itemscount, rsp.itemsperpage, rsp.totalcount, rsp.localIndexCount, rsp.remoteIndexCount, rsp.remotePeerCount, rsp.navurlBase, #[localQuery]#, rsp.feedRunning);
statistics(rsp.offset, rsp.itemscount, rsp.itemsperpage, rsp.totalcount, rsp.localIndexCount, rsp.remoteIndexCount, rsp.remotePeerCount, rsp.navurlBase, #[localQuery]#, rsp.feedRunning, false);
::
statistics($("#resultscontainer .searchresults.earlierpage").length + 1, $("#resultscontainer .searchresults.earlierpage").length + $("#resultscontainer .searchresults.currentpage").length, rsp.itemsperpage, rsp.totalcount, rsp.localIndexCount, rsp.remoteIndexCount, rsp.remotePeerCount, rsp.navurlBase, #[localQuery]#, rsp.feedRunning);
statistics($("#resultscontainer .searchresults.earlierpage").length + 1, $("#resultscontainer .searchresults.earlierpage").length + $("#resultscontainer .searchresults.currentpage").length, rsp.itemsperpage, rsp.totalcount, rsp.localIndexCount, rsp.remoteIndexCount, rsp.remotePeerCount, rsp.navurlBase, #[localQuery]#, rsp.feedRunning, true);
#(/jsResort)#
if(rsp.feedRunning) {
/* Refresh statistics while server feeders are still running */

Write Preview
Loading…
Cancel
Save