Simplified the grid and list view of packages
This commit is contained in:
parent
728a9a952f
commit
bc774c8b65
3 changed files with 31 additions and 21 deletions
|
|
@ -14,11 +14,13 @@ class PackagesController < ApplicationController
|
|||
|
||||
@packages = @packages.page(params[:page]).per(12)
|
||||
|
||||
if params[:search][:display]=='list'
|
||||
@view='list'
|
||||
else
|
||||
@view='grid'
|
||||
end
|
||||
#if params[:search][:display]=='list'
|
||||
#@view='list'
|
||||
#else
|
||||
#@view='grid'
|
||||
#end
|
||||
|
||||
#@view = (params[:display]=='list') ? 'list' : 'grid'
|
||||
end
|
||||
|
||||
def with_screenshots
|
||||
|
|
|
|||
|
|
@ -23,25 +23,27 @@
|
|||
-->
|
||||
<%= form_tag(url_for, method: "get", class: "navbar-form navbar-left form-search", role: "search") do %>
|
||||
<div class="form-group">
|
||||
<%= search_field_tag('search[query]', nil, placeholder:'Search...', size:30, maxlength:200, class:'form-control') %>
|
||||
<%= search_field_tag('query', nil, placeholder:'Search...', size:30, maxlength:200, class:'form-control') %>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-default">Submit</button>
|
||||
|
||||
<!-- Button group for grid/list view -->
|
||||
<div class="btn-group" data-toggle="buttons">
|
||||
<span class="btn btn-default <%= @view=='grid' ? 'active' : '' %>">
|
||||
<%= radio_button('search', 'display', 'grid') %>
|
||||
<span class="glyphicon glyphicon-th"></span>
|
||||
</span>
|
||||
<span class="btn btn-default <%= @view=='list' ? 'active' : '' %>">
|
||||
<%= radio_button('search', 'display', 'list') %>
|
||||
<span class="glyphicon glyphicon-th"></span>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<% end %> <!-- /form -->
|
||||
|
||||
<div class="navbar-nav">
|
||||
<!-- Button group for grid/list view -->
|
||||
<%= link_to url_for(params.merge({:display => "grid"})) do %>
|
||||
<span class="btn btn-default <%= params[:display]=='grid' ? 'active' : '' %>">
|
||||
<span class="glyphicon glyphicon-th"></span>
|
||||
<% end %>
|
||||
<%= link_to url_for(params.merge({:display => "list"})) do %>
|
||||
<span class="btn btn-default <%= params[:display]=='list' ? 'active' : '' %>">
|
||||
<span class="glyphicon glyphicon-th-list"></span>
|
||||
<% end %>
|
||||
<!--</span>-->
|
||||
<!--<span class="btn btn-default <%= @view=='list' ? 'active' : '' %>">
|
||||
<%= radio_button('search', 'display', 'list') %>
|
||||
<span class="glyphicon glyphicon-th-list"></span>
|
||||
</span>-->
|
||||
|
||||
<%= paginate @packages, :window => 2 %>
|
||||
</div>
|
||||
|
||||
|
|
@ -52,9 +54,12 @@
|
|||
</nav>
|
||||
|
||||
<div class="container container-main">
|
||||
<% if @view=='grid' %>
|
||||
<% if params[:display]='grid' %>
|
||||
<%= render "packages_search_results_grid", object: @packages %>
|
||||
<% else %>
|
||||
<%= render "packages_search_results_list", object: @packages %>
|
||||
<% end %>
|
||||
</div>
|
||||
<h1><%= params[:display] %></h1>
|
||||
<h1><%= params %></h1>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
Debshots::Application.routes.draw do
|
||||
#get "packages/index"
|
||||
get "packages" => "packages#index"
|
||||
#get "packages" => "packages#index"
|
||||
#get "packages/:page/:display" => "packages#index"
|
||||
get "packages(/:page(/:display))" => "packages#index", defaults: { page: 1, display: 'grid' }
|
||||
#get "packages(/:display)", to: "packages#index", defaults: { display: 'grid' }
|
||||
get "packages/with_screenshots"
|
||||
get "packages/without_screenshots"
|
||||
get "packages/moderate"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue