diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb index b7b7043..7452ff9 100644 --- a/app/controllers/packages_controller.rb +++ b/app/controllers/packages_controller.rb @@ -3,13 +3,14 @@ class PackagesController < ApplicationController def list @packages = query_packages @packages = @packages.paginate(page: params[:page], per_page: 6) - render 'packages/index-list.slim' + # render 'packages/index-list.slim' end def grid @packages = query_packages @packages = @packages.paginate(page: params[:page], per_page: 24) - render 'packages/index-grid.slim' + # render 'packages/index-grid.slim' + respond_to :html, :json end def details diff --git a/app/views/packages/index-grid.slim b/app/views/packages/index-grid.slim deleted file mode 100644 index 61ae37c..0000000 --- a/app/views/packages/index-grid.slim +++ /dev/null @@ -1,28 +0,0 @@ -// Paginator and search bar -.row - .small-6.medium-8.large-9.columns - // Paginator - = render 'packages/paginator' - - .small-6.medium-4.large-3.columns - // Search form - = render 'packages/searchfield' - -// Grid view -.row - .small-9.large-10.columns - - if @packages.length>0 - .row.small-up-1.medium-up-3.large-up-4.grid-thumbnails - - @packages.all.each do |pkg| - .column - = render partial: 'packages/grid_thumbnail', locals: { pkg: pkg } - - - else - = render 'packages/noresults' - - // Paginator - = render 'packages/paginator' - - // Icon sidebar for options and views - .small-3.large-2.columns - = render 'packages/sidebar' diff --git a/app/views/packages/index-list.slim b/app/views/packages/index-list.slim deleted file mode 100644 index 99ae8f1..0000000 --- a/app/views/packages/index-list.slim +++ /dev/null @@ -1,46 +0,0 @@ -// Paginator and search bar -.row - .small-6.medium-8.large-9.columns - // Paginator - = render 'packages/paginator' - - .small-6.medium-4.large-3.columns - // Search form - = render 'packages/searchfield' - -// Package list -.row.packagepage - .small-9.medium-10.columns - - if @packages.length>0 - - @packages.to_a.each do |pkg| - .row.listview - .small-12.medium-4.columns - a.black href=package_path(name: pkg.name) - .pkgname - =pkg.name - ' > - - if pkg.screenshots.any? - // TODO: smarter search for the best screenshot instead of taking the first one - - screenshot = pkg.screenshots.first - a.black title=screenshot.caption href=package_path(name: pkg.name) - = image_tag(screenshot.image.url(:large, timestamp: false), alt: screenshot.caption) - - if pkg.screenshots.length > 1 - a.black href=package_path(name: pkg.name) - .text-center and #{pluralize(pkg.screenshots.length-1, 'screenshot')} more… - - else - a href=package_path(name: pkg.name) - img.screenshot src="/images/dummy/no-screenshots-upload-one.svg" - .small-12.medium-8.columns - .row.packagedetails - .subtitle = pkg.description - = pkg.long_description or 'Sorry - no description available.' - - // Second paginator at the bottom so the user does not have to scroll up again - = render 'packages/paginator' - - - else - = render 'packages/noresults' - - // Icon sidebar for options and views - .small-3.medium-2.columns - = render 'packages/sidebar'