From ce881343e26bd926690082d8c74c19c1d5f6ad0d Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Mon, 20 Apr 2020 20:12:10 +0200 Subject: [PATCH] Using new access methods for ActiveStorage instead of Paperclip --- app/views/json/package.json.jbuilder | 4 ++-- app/views/json/screenshots.json.jbuilder | 4 ++-- app/views/moderate/index.slim | 8 ++++---- app/views/my/uploads.slim | 4 ++-- app/views/packages/_grid_thumbnail.slim | 2 +- app/views/packages/details.slim | 4 ++-- app/views/packages/list.slim | 2 +- app/views/packages/upload.slim | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/views/json/package.json.jbuilder b/app/views/json/package.json.jbuilder index 3a6f3b3..0fca495 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.url(:thumb, timestamp: false)}" - json.large_image_url "https://#{request.host_with_port}#{s.image.url(:large, timestamp: false)}" + 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.version s.version end diff --git a/app/views/json/screenshots.json.jbuilder b/app/views/json/screenshots.json.jbuilder index 46429c9..0dac6d6 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.url(:thumb, timestamp: false)}" - json.large_image_url "https://#{request.host_with_port}#{s.image.url(:large, timestamp: false)}" + 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")}" end end diff --git a/app/views/moderate/index.slim b/app/views/moderate/index.slim index cc117de..4b45b92 100644 --- a/app/views/moderate/index.slim +++ b/app/views/moderate/index.slim @@ -19,8 +19,8 @@ - @pending_screenshots.each do |screenshot| .container.listview / = screenshot.status - a.black.fancybox href=screenshot.image.url(:large, timestamp: false) rel='fancybox-thumb' title=screenshot.caption - = image_tag(screenshot.image.url(:large, timestamp: false), alt: screenshot.caption) + a.black.fancybox href=screenshot.image.variant("800x600") rel='fancybox-thumb' title=screenshot.caption + = image_tag(screenshot.image.variant("800x600"), alt: screenshot.caption) .imgcaption =screenshot.caption em.imgcaption =screenshot.adminstatus @@ -43,8 +43,8 @@ - @package.screenshots.each do |screenshot| - if screenshot.approved==true and screenshot.markedfordelete==false .container.listview - a.black.fancybox href=screenshot.image.url(:large, timestamp: false) rel='fancybox-thumb' title=screenshot.caption - = image_tag(screenshot.image.url(:large, timestamp: false), alt: screenshot.caption) + a.black.fancybox href=screenshot.image.variant("800x600", timestamp: false) rel='fancybox-thumb' title=screenshot.caption + = image_tag(screenshot.image.variant("800x600"), alt: screenshot.caption) .imgcaption =screenshot.caption - else diff --git a/app/views/my/uploads.slim b/app/views/my/uploads.slim index 1c7a22a..be4838d 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=screenshot.image.url(:large, timestamp: false) + a.black.fancybox href=screenshot.image.variant(resize: "800x600", timestamp: false) div.grid-thumbnail - = image_tag(screenshot.image.url(:thumb, timestamp: false), alt: screenshot.caption, class: 'thumbnail') + = image_tag(screenshot.image.variant(resize: "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 500f782..a0f99fb 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.url(:thumb, timestamp: false), alt: screenshot.caption, class: 'thumbnail') + = image_tag(screenshot.image.variant(resize: "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 a390396..b3e8ff4 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -12,8 +12,8 @@ h1 =@package.name - screenshots_visible_to_user(@package).each do |screenshot| .listview .text-center - a.black.fancybox href=screenshot.image.url(:large, timestamp: false) rel='fancybox-thumb' title=screenshot.caption - = image_tag(screenshot.image.url(:large, timestamp: false), alt: screenshot.caption) + a.black.fancybox href=screenshot.image.variant(resize: "800x600") rel='fancybox-thumb' title=screenshot.caption + = image_tag(screenshot.image.variant(resize: "800x600"), alt: screenshot.caption) - if screenshot.description .imgcaption =screenshot.description - if screenshot.version.present? diff --git a/app/views/packages/list.slim b/app/views/packages/list.slim index 1edb254..d320e34 100644 --- a/app/views/packages/list.slim +++ b/app/views/packages/list.slim @@ -19,7 +19,7 @@ // 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) + = image_tag(screenshot.image.variant("800x600", timestamp: false), alt: screenshot.caption) /- if pkg.screenshots.length > 1 a.black href=package_path(name: pkg.name) 'and #{pluralize(pkg.screenshots.length-1, 'screenshot')} more… diff --git a/app/views/packages/upload.slim b/app/views/packages/upload.slim index 9b709e9..cb091cf 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=ss.image.url(:large, timestamp: false) rel='fancybox-thumb' title=ss.caption - = image_tag(ss.image.url(:thumb, timestamp: false), alt: ss.caption, class: 'thumbnail') + a.black.fancybox href=ss.image.variant(resize: "800x600") rel='fancybox-thumb' title=ss.caption + = image_tag(ss.image.variant(resize: "160x120"), alt: ss.caption, class: 'thumbnail') // = render partial: 'packages/grid_thumbnail', locals: { pkg: pkg }