Moved pagination to top bar.
Removed "prev", "next", "first" and "last" from kaminari paginator.
This commit is contained in:
parent
c219c38a49
commit
8b5c1d9ff2
3 changed files with 27 additions and 4 deletions
|
|
@ -21,3 +21,16 @@ div.thumbnail
|
||||||
{
|
{
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Pagination is shown in top bar. Reduce margin to avoid making the nav bar larger. */
|
||||||
|
ul.pagination
|
||||||
|
{
|
||||||
|
margin-top: 8px;
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Top bar is fixed. Move main part down so the bar does not hide it. */
|
||||||
|
.container-main
|
||||||
|
{
|
||||||
|
margin-top: 60px;
|
||||||
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<nav class="navbar navbar-default" role="navigation">
|
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
|
||||||
<div class="navbar-header">
|
<div class="navbar-header">
|
||||||
<!--
|
<!--
|
||||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
|
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
|
||||||
|
|
@ -38,14 +38,16 @@
|
||||||
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
<div class="navbar-nav">
|
||||||
|
<%= paginate @packages, :window => 2 %>
|
||||||
|
</div>
|
||||||
|
|
||||||
<ul class="nav navbar-nav navbar-right">
|
<ul class="nav navbar-nav navbar-right">
|
||||||
<li><a href="#">Login</a></li>
|
<li><a href="#">Login</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div><!-- /.navbar-collapse -->
|
</div><!-- /.navbar-collapse -->
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<%= paginate @packages %>
|
<div class="container container-main">
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<%= render "packages_search_results", object: @packages %>
|
<%= render "packages_search_results", object: @packages %>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -21,3 +21,11 @@
|
||||||
|
|
||||||
en:
|
en:
|
||||||
hello: "Hello world"
|
hello: "Hello world"
|
||||||
|
|
||||||
|
views:
|
||||||
|
pagination:
|
||||||
|
first: "«"
|
||||||
|
last: "»"
|
||||||
|
previous: "‹"
|
||||||
|
next: "›"
|
||||||
|
truncate: "..."
|
||||||
Loading…
Add table
Add a link
Reference in a new issue