Moved search form into navbar. Fixed paginator.

This commit is contained in:
Christoph Haas 2013-08-22 00:22:12 +02:00
parent c275f3e52d
commit be9cb71f47
2 changed files with 18 additions and 38 deletions

View file

@ -1,7 +1,6 @@
<% # Show search results %>
<% if @packages.length>0 %>
<%= paginate @packages %>
<% @packages.each do |package| %>
<div class="col-md-3">
<div class="thumbnail">

View file

@ -1,11 +1,13 @@
<nav class="navbar navbar-default" role="navigation">
<div class="navbar-header">
<!--
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
-->
<a class="navbar-brand" href="#">
Debian Screenshots
</a>
@ -13,58 +15,37 @@
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-ex1-collapse">
<!--
<ul class="nav navbar-nav">
<li class="active"><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
</ul>
-->
<%= form_tag(url_for, method: "get", class: "navbar-form navbar-left form-search", role: "search") do %>
<div class="form-group">
<input type="text" class="form-control" placeholder="Search">
<input type="text" name="search" class="form-control" placeholder="Search..." value="<%= params[:search] %>">
</div>
<button type="submit" class="btn btn-default">Submit</button>
<div class="btn-group" data-toggle="buttons">
<label class="btn btn-default active">
<input type="radio" name="display" value="grid"><span class="glyphicon glyphicon-th"></span>
</label>
<label class="btn btn-default">
<input type="radio" name="display" value="list"><span class="glyphicon glyphicon-th-list"></span>
</label>
</div>
<% end %>
<ul class="nav navbar-nav navbar-right">
<li><a href="#">Login</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</nav>
<%= paginate @packages %>
<div class="container">
<h1>Search for a package/description:</h1>
<%= form_tag(url_for, method: "get", class: "form-search") do %>
<div class="btn-toolbar">
<div class="input-append">
<%= text_field_tag :search, params[:search], autofocus: true, placeholder: 'What are you looking for...', class: "search-query" %>
<button class="btn" type="submit">Search!</button>
</div>
<div class="btn-group">
<!--<a class="btn" href="#"><i class="icon-th"></i></a>-->
<!--<a class="btn" href="#"><i class="icon-th-list"></i></a>-->
<button type="button" class="btn" value="1">With screenshots only</button>
<button type="button" class="btn" value="0">Any</button>
</div>
<!--<label class="checkbox">-->
<!-- <%= check_box_tag 'with_screenshots', 'yes', params[:with_screenshots] %> -->
<!-- Show only packages with screenshots -->
<!--</label>-->
</div>
<div class="btn-toolbar">
<div class="btn-group" data-toggle="buttons">
<label class="btn btn-default">
<input type="radio" name="display" value="grid"> <span class="glyphicon glyphicon-th"></span>
</label>
<label class="btn btn-default">
<input type="radio" name="display" value="list"> <span class="glyphicon glyphicon-th-list"></span>
</label>
</div>
</div>
<% end %>
<%= render "packages_search_results", object: @packages %>
</div>