smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[HTML Rendering] Do not render page navigation buttons if only one page.

This commit is contained in:
Matthieu Gautier 2019-09-09 14:41:57 +02:00
parent fdc291b7c2
commit 78dbd66522
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/search_renderer.cpp
View File

@ -131,6 +131,7 @@ std::string SearchRenderer::getHtml()
allData.set("results", results); allData.set("results", results);
allData.set("pages", pages); allData.set("pages", pages);
allData.set("hasResult", estimatedResultCount != 0); allData.set("hasResult", estimatedResultCount != 0);
allData.set("hasPages", pageStart != pageEnd);
allData.set("count", kiwix::beautifyInteger(estimatedResultCount)); allData.set("count", kiwix::beautifyInteger(estimatedResultCount));
allData.set("searchPattern", kiwix::encodeDiples(this->searchPattern)); allData.set("searchPattern", kiwix::encodeDiples(this->searchPattern));
allData.set("searchPatternEncoded", urlEncode(this->searchPattern)); allData.set("searchPatternEncoded", urlEncode(this->searchPattern));

50
static/templates/search_result.html
View File

@ -129,30 +129,32 @@
</div> </div>
<div class="footer"> <div class="footer">
<ul> {{#hasPages}}
{{#resultLastPageStart}} <ul>
<li> {{#resultLastPageStart}}
<a href="{{searchProtocolPrefix}}pattern={{searchPatternEncoded}}{{#contentId}}&content={{.}}{{/contentId}}&start=0&end={{resultRange}}"> <li>
◀ <a href="{{searchProtocolPrefix}}pattern={{searchPatternEncoded}}{{#contentId}}&content={{.}}{{/contentId}}&start=0&end={{resultRange}}">
</a> ◀
</li> </a>
{{/resultLastPageStart}} </li>
{{#pages}} {{/resultLastPageStart}}
<li> {{#pages}}
<a {{#selected}}class="selected"{{/selected}} <li>
href="{{searchProtocolPrefix}}pattern={{searchPatternEncoded}}{{#contentId}}&content={{.}}{{/contentId}}&start={{start}}&end={{end}}"> <a {{#selected}}class="selected"{{/selected}}
{{label}} href="{{searchProtocolPrefix}}pattern={{searchPatternEncoded}}{{#contentId}}&content={{.}}{{/contentId}}&start={{start}}&end={{end}}">
</a> {{label}}
</li> </a>
{{/pages}} </li>
{{#resultLastPageStart}} {{/pages}}
<li> {{#resultLastPageStart}}
<a href="{{searchProtocolPrefix}}pattern={{searchPatternEncoded}}{{#contentId}}&content={{.}}{{/contentId}}&start={{resultLastPageStart}}&end={{lastResult}}"> <li>
▶ <a href="{{searchProtocolPrefix}}pattern={{searchPatternEncoded}}{{#contentId}}&content={{.}}{{/contentId}}&start={{resultLastPageStart}}&end={{lastResult}}">
</a> ▶
</li> </a>
{{/resultLastPageStart}} </li>
</ul> {{/resultLastPageStart}}
</ul>
{{/hasPages}}
</div> </div>
</body> </body>
</html> </html>