Fixed Grid/List buttons in navbar (finally...)

This commit is contained in:
Christoph Haas 2013-11-16 22:14:56 +01:00
parent 44df4b2c3f
commit e571aa8a0a

View file

@ -1,37 +1,41 @@
<nav> <nav class="navbar navbar-default">
<div class="container"> <a class="navbar-brand" href="#">
<a class="navbar-brand" href="#"> Debian Screenshots
Debian Screenshots </a>
</a>
<%= form_tag(url_for, method: "get", class: "navbar-form navbar-left form-search", role: "search") do %> <%= form_tag(url_for, method: "get", class: "navbar-form navbar-left
<div class="form-group"> form-search", role: "search") do %>
<%= search_field_tag('query', nil, placeholder:'Search...', size:30, maxlength:200, class:'form-control') %> <div class="form-group">
</div> <%= search_field_tag('query', nil, placeholder:'Search...', size:30,
<button type="submit" class="btn btn-default">Submit</button> maxlength:200, class:'form-control') %>
<% end %> <!-- /form --> </div> <button type="submit" class="btn btn-default">Submit</button>
<% end %> <!-- /form -->
<!--<h2><%= link_to url_for(package_list_path) %></h2>--> <div class="navbar-nav btn-group">
<!-- Button group for grid/list view -->
<div class="navbar-nav"> <%= link_to url_for(package_grid_path), {class:"navbar-btn btn
<!-- Button group for grid/list view --> btn-default"} do %>
<%= link_to url_for(package_grid_path) do %> Grid
<%= params[:display]=='grid!' ? 'active' : '' %>grid <% end %> <%= link_to url_for(package_list_path), {class:"navbar-btn btn
<% end %> btn-default"} do %>
<%= link_to url_for(package_list_path) do %> List
<%= params[:display]=='list!' ? 'active' : '' %>list <% end %>
<% end %>
<%= paginate @packages, :window => 2 %>
</div>
<ul class="nav navbar-nav navbar-right">
<li><a href="#">Login</a></li>
</ul>
</div> </div>
<div class="navbar-nav btn-group">
<%= paginate @packages, :window => 2 %>
</div>
<ul class="nav navbar-nav navbar-right">
<li><a href="#">Login</a></li>
</ul>
</nav> </nav>
<div class="container container-main"> <div class="container">
<ul class="pager">
<li class="previous disabled"><a href="#">&larr; Previous</a></li>
<li class="next"><a href="#">Next &rarr;</a></li>
</ul>
<% if params[:display]=='grid' %> <% if params[:display]=='grid' %>
<%= render "packages_search_results_grid", object: @packages %> <%= render "packages_search_results_grid", object: @packages %>
<% else %> <% else %>