maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove random onboarding background images (#10683)

Browse source 
* Fix misleading alt tags

* Make random fallback images optional
This commit is contained in:
Jacob Herrington 2020-10-07 09:19:18 -05:00 • committed by GitHub
parent 83b3baeac3
commit c53522a8a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/helpers/application_helper.rb
View file

@ -76,8 +76,10 @@ module ApplicationHelper
"https://res.cloudinary.com/#{ApplicationConfig['CLOUDINARY_CLOUD_NAME']}/image/upload/#{postfix}"
end
def optimized_image_url(url, width: 500, quality: 80, fetch_format: "auto")
image_url = url.presence || asset_path("#{rand(1..40)}.png")
def optimized_image_url(url, width: 500, quality: 80, fetch_format: "auto", random_fallback: true)
fallback_image = asset_path("#{rand(1..40)}.png") if random_fallback
return unless (image_url = url.presence || fallback_image)
Images::Optimizer.call(SimpleIDN.to_ascii(image_url), width: width, quality: quality, fetch_format: fetch_format)
end

4
app/views/admin/configs/show.html.erb
View file

@ -778,7 +778,7 @@
placeholder: Constants::SiteConfig::DETAILS[:onboarding_background_image][:placeholder] %>
<div class="row mt-2">
<div class="col-12">
<img alt="main social image" class="img-fluid" src="<%= SiteConfig.onboarding_background_image %>" />
<img alt="onboarding background image" class="img-fluid" src="<%= SiteConfig.onboarding_background_image %>" />
</div>
<div class="col-12">
<div class="alert alert-info"><%= Constants::SiteConfig::DETAILS[:onboarding_background_image][:description] %></div>
@ -794,7 +794,7 @@
placeholder: Constants::SiteConfig::DETAILS[:onboarding_taskcard_image][:placeholder] %>
<div class="row mt-2">
<div class="col-12">
<img alt="main social image" class="img-fluid" src="<%= SiteConfig.onboarding_taskcard_image %>" />
<img alt="onboarding taskcard image" class="img-fluid" src="<%= SiteConfig.onboarding_taskcard_image %>" />
</div>
<div class="col-12">
<div class="alert alert-info"><%= Constants::SiteConfig::DETAILS[:onboarding_taskcard_image][:description] %></div>

2
app/views/onboardings/show.html.erb
View file

@ -15,7 +15,7 @@
data-community-name="<%= community_name %>"
data-community-description="<%= SiteConfig.community_description %>"
data-community-logo="<%= optimized_image_url(safe_logo_url(SiteConfig.onboarding_logo_image)) %>"
data-community-background="<%= optimized_image_url(SiteConfig.onboarding_background_image, width: 1680, quality: 75) %>">
data-community-background="<%= optimized_image_url(SiteConfig.onboarding_background_image, width: 1680, quality: 75, random_fallback: false) %>">
<%= javascript_packs_with_chunks_tag "Onboarding", defer: true %>
</div>

5
spec/helpers/application_helper_spec.rb
View file

@ -207,6 +207,11 @@ RSpec.describe ApplicationHelper, type: :helper do
it "keeps an ASCII domain as ASCII" do
expect(helper.optimized_image_url("https://www.xn--vnx.dev/image.png")).to include("https://www.xn--vnx.dev")
end
it "returns random fallback images as expected" do
expect(helper.optimized_image_url("")).not_to be_nil
expect(helper.optimized_image_url("", random_fallback: false)).to be_nil
end
end
describe "#optimized_image_tag" do