Skip to content

Commit

Permalink
fix hiding of "per page" buttons if few searchresults
Browse files Browse the repository at this point in the history
  • Loading branch information
@jakosch
jakosch committed Oct 3, 2019
1 parent 860848e commit 1a7359a
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 31 deletions.
2 changes: 1 addition & 1 deletion modules/app.xqm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ declare
function app:set-entries-per-page($node as node(), $model as map(*)) as map() {
map {
'limit' : config:entries-per-page(),
'fewresults' := if ((count($model('search-results'))>config:entries-per-page())) then 'true' else ()
'fewresults' := if ( count($model('search-results')) lt config:entries-per-page() ) then 'true' else ()
}
};

Expand Down
32 changes: 18 additions & 14 deletions templates/includes/search-results.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ <h2 data-template="search:results-count">124 Suchergebnisse</h2>
<li><a href="#">&lt;</a></li>
</ul>
</div>
<div class="col-sm-4" data-template="app-shared:if-not-matches" data-template-key="fewresults" data-template-value="true">
<ul class="pagination switch-limit" data-template="app:set-entries-per-page">
<li class="page-item disabled"><a class="page-link" href="#" data-template="lang:translate">perPage</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">10</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">25</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">50</a></li>
</ul>
<div data-template="app:set-entries-per-page">
<div class="col-sm-4" data-template="app-shared:if-not-matches" data-template-key="fewresults" data-template-value="true">
<ul class="pagination switch-limit">
<li class="page-item disabled"><a class="page-link" href="#" data-template="lang:translate">perPage</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">10</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">25</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">50</a></li>
</ul>
</div>
</div>
</div>
<div class="row">
Expand All @@ -30,13 +32,15 @@ <h2 data-template="search:results-count">124 Suchergebnisse</h2>
<li><a href="#">&lt;</a></li>
</ul>
</div>
<div class="col-sm-4" data-template="app-shared:if-not-matches" data-template-key="fewresults" data-template-value="true">
<ul class="pagination switch-limit" data-template="app:set-entries-per-page">
<li class="page-item disabled"><a class="page-link" href="#" data-template="lang:translate">perPage</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">10</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">25</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">50</a></li>
</ul>
<div data-template="app:set-entries-per-page">
<div class="col-sm-4" data-template="app-shared:if-not-matches" data-template-key="fewresults" data-template-value="true">
<ul class="pagination switch-limit">
<li class="page-item disabled"><a class="page-link" href="#" data-template="lang:translate">perPage</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">10</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">25</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">50</a></li>
</ul>
</div>
</div>
</div>
</div>
36 changes: 20 additions & 16 deletions templates/search.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,16 @@ <h2 data-template="search:results-count">124 Suchergebnisse</h2>
<li><a href="#">&lt;</a></li>
</ul>
</div>
<div class="col-sm-4" data-template="app-shared:if-not-matches" data-template-key="fewresults" data-template-value="true">
<ul class="pagination" data-template="app:set-entries-per-page">
<li class="page-item disabled"><a class="page-link" href="#" data-template="lang:translate">perPage</a></li>
<li data-template="app:switch-limit"><a href="#">10</a></li>
<li data-template="app:switch-limit"><a href="#">25</a></li>
<li data-template="app:switch-limit"><a href="#">50</a></li>
</ul>
</div>
<div data-template="app:set-entries-per-page">
<div class="col-sm-4" data-template="app-shared:if-not-matches" data-template-key="fewresults" data-template-value="true">
<ul class="pagination switch-limit">
<li class="page-item disabled"><a class="page-link" href="#" data-template="lang:translate">perPage</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">10</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">25</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">50</a></li>
</ul>
</div>
</div>
</div>
<div class="row">
<div class="col-12">
Expand All @@ -98,14 +100,16 @@ <h2 data-template="search:results-count">124 Suchergebnisse</h2>
<li><a href="#">&lt;</a></li>
</ul>
</div>
<div class="col-sm-4" data-template="app-shared:if-not-matches" data-template-key="fewresults" data-template-value="true">
<ul class="pagination" data-template="app:set-entries-per-page">
<li class="page-item disabled"><a class="page-link" href="#" data-template="lang:translate">perPage</a></li>
<li data-template="app:switch-limit"><a href="#">10</a></li>
<li data-template="app:switch-limit"><a href="#">25</a></li>
<li data-template="app:switch-limit"><a href="#">50</a></li>
</ul>
</div>
<div data-template="app:set-entries-per-page">
<div class="col-sm-4" data-template="app-shared:if-not-matches" data-template-key="fewresults" data-template-value="true">
<ul class="pagination switch-limit">
<li class="page-item disabled"><a class="page-link" href="#" data-template="lang:translate">perPage</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">10</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">25</a></li>
<li data-template="app:switch-limit"><a class="page-link" href="#">50</a></li>
</ul>
</div>
</div>
</div>
</div>
</div>
Expand Down

0 comments on commit 1a7359a

Please sign in to comment.