From bc774c8b65e328943f722d88b81bbdaf355e9ca9 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Tue, 12 Nov 2013 22:58:36 +0100 Subject: [PATCH] Simplified the grid and list view of packages --- app/controllers/packages_controller.rb | 12 +++++---- app/views/packages/index.html.erb | 35 +++++++++++++++----------- config/routes.rb | 5 +++- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb index c24c7d0..9bd3d45 100644 --- a/app/controllers/packages_controller.rb +++ b/app/controllers/packages_controller.rb @@ -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 diff --git a/app/views/packages/index.html.erb b/app/views/packages/index.html.erb index d69d763..cf8c6a2 100644 --- a/app/views/packages/index.html.erb +++ b/app/views/packages/index.html.erb @@ -23,25 +23,27 @@ --> <%= form_tag(url_for, method: "get", class: "navbar-form navbar-left form-search", role: "search") do %>
- <%= 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') %>
- - -
- - <%= radio_button('search', 'display', 'grid') %> - - - - <%= radio_button('search', 'display', 'list') %> - - -
- <% end %> @@ -52,9 +54,12 @@
- <% if @view=='grid' %> + <% if params[:display]='grid' %> <%= render "packages_search_results_grid", object: @packages %> <% else %> <%= render "packages_search_results_list", object: @packages %> <% end %>
+

<%= params[:display] %>

+

<%= params %>

+ diff --git a/config/routes.rb b/config/routes.rb index 43766f2..1fae6e8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -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"