diff --git a/app/views/json/package.json.jbuilder b/app/views/json/package.json.jbuilder index 0fca495..c430b26 100644 --- a/app/views/json/package.json.jbuilder +++ b/app/views/json/package.json.jbuilder @@ -1,7 +1,7 @@ json.package @p.name json.screenshots @p.screenshots do |s| - json.small_image_url "https://#{request.host_with_port}#{s.image.variant(resize: "160x120", timestamp: false)}" - json.large_image_url "https://#{request.host_with_port}#{s.image.variant(resize: "800x600", timestamp: false)}" + json.small_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: "160x120", timestamp: false)}" + json.large_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: "800x600", timestamp: false)}" json.version s.version end diff --git a/app/views/json/screenshots.json.jbuilder b/app/views/json/screenshots.json.jbuilder index 0dac6d6..b6eb7b2 100644 --- a/app/views/json/screenshots.json.jbuilder +++ b/app/views/json/screenshots.json.jbuilder @@ -4,7 +4,7 @@ json.cache! ['json_screenshots'], expires_in: 1.hour do json.extract! s, :version json.extract! p, :maintainer, :name, :section, :maintainer_email, :homepage, :description json.url package_url(p.name, protocol: 'https') - json.small_image_url "https://#{request.host_with_port}#{s.image.variant(resize: "160x120")}" - json.large_image_url "https://#{request.host_with_port}#{s.image.variant(resize: "800x600")}" + json.small_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: "160x120")}" + json.large_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: "800x600")}" end end diff --git a/app/views/my/uploads.slim b/app/views/my/uploads.slim index 9661212..7e85e4b 100644 --- a/app/views/my/uploads.slim +++ b/app/views/my/uploads.slim @@ -16,8 +16,8 @@ - @current_users_screenshots.each do |screenshot| .column - a.black.fancybox href=rails_representation_url(screenshot.image.variant(resize: "800x600", timestamp: false)) + a.black.fancybox href=rails_representation_url(screenshot.image.variant(resize_to_limit: "800x600", timestamp: false)) div.grid-thumbnail - = image_tag(screenshot.image.variant(resize: "160x120"), alt: screenshot.caption, class: 'thumbnail') + = image_tag(screenshot.image.variant(resize_to_limit: "160x120"), alt: screenshot.caption, class: 'thumbnail') div = screenshot.description diff --git a/app/views/packages/_grid_thumbnail.slim b/app/views/packages/_grid_thumbnail.slim index a0f99fb..ab1ab32 100644 --- a/app/views/packages/_grid_thumbnail.slim +++ b/app/views/packages/_grid_thumbnail.slim @@ -4,7 +4,7 @@ a.black href=package_path(name: pkg.name) - if pkg.screenshots_approved.any? // TODO: smarter selection of the most useful screenshot instead of taking the first one - screenshot = pkg.screenshots.first - = image_tag(screenshot.image.variant(resize: "160x120"), alt: screenshot.caption, class: 'thumbnail') + = image_tag(screenshot.image.variant(resize_to_limit: "160x120"), alt: screenshot.caption, class: 'thumbnail') - else img.screenshot.thumbnail src="/images/dummy/no-screenshots-upload-one.svg" div diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index 2dbb145..2388a4e 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -20,8 +20,8 @@ h1 =@package.name - screenshots_visible_to_user(@package).each do |screenshot| .listview .text-center - a.black.fancybox href=rails_representation_url(screenshot.image.variant(resize: "800x600")) rel='fancybox-thumb' title=screenshot.caption - = image_tag(screenshot.image.variant(resize: "800x600"), alt: screenshot.caption) + a.black.fancybox href =rails_representation_url(screenshot.image.variant(resize_to_limit: [800,600])) rel='fancybox-thumb' title=screenshot.caption + = image_tag(screenshot.image.variant(resize_to_limit: [800,600]), alt: screenshot.caption) - if screenshot.description .imgcaption =screenshot.description - if screenshot.version.present? diff --git a/app/views/packages/upload.slim b/app/views/packages/upload.slim index 984a3a8..4181f52 100644 --- a/app/views/packages/upload.slim +++ b/app/views/packages/upload.slim @@ -32,8 +32,8 @@ h1 = "Upload screenshots for #{@package.name}" .small-up-1.medium-up-3.large-up-4.grid-thumbnails - @package.screenshots.all.each do |ss| .column - a.black.fancybox href=rails_representation_url(ss.image.variant(resize: "800x600")) rel='fancybox-thumb' title=ss.caption - = image_tag(ss.image.variant(resize: "160x120"), alt: ss.caption, class: 'thumbnail') + a.black.fancybox href=rails_representation_url(ss.image.variant(resize_to_limit: "800x600")) rel='fancybox-thumb' title=ss.caption + = image_tag(ss.image.variant(resize_to_limit: "160x120"), alt: ss.caption, class: 'thumbnail') // = render partial: 'packages/grid_thumbnail', locals: { pkg: pkg } //- else diff --git a/app/views/welcome/home.slim b/app/views/welcome/home.slim index 3a62dea..8732cd9 100644 --- a/app/views/welcome/home.slim +++ b/app/views/welcome/home.slim @@ -30,7 +30,7 @@ h2 Newest upload .thumb-height a href=package_path(@newest_upload.package.name) - = image_tag(@newest_upload.image.variant(resize: "160x120"), alt: @newest_upload.caption) + = image_tag(@newest_upload.image.variant(resize_to_limit: "160x120"), alt: @newest_upload.caption) p strong =@newest_upload.package.name @@ -41,7 +41,7 @@ .thumb-height - if @most_popular_package a href=package_path(@most_popular_package.name) - = image_tag(@most_popular_package.screenshots.first.image.variant(resize: "160x120")) + = image_tag(@most_popular_package.screenshots.first.image.variant(resize_to_limit: "160x120")) - else 'No uploaded screenshots yet. p