diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index 36ae0ed4a..c1cdcebbc 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -36,19 +36,17 @@ module WelcomeHelper
end
def calculate_centered(debates, proposals, budget_investments)
- centered = ""
- if debates.blank? && proposals.blank? ||
- debates.blank? && budget_investments.blank? ||
- proposals.blank? && budget_investments.blank?
+ if debates.blank? && proposals.blank? && budget_investments.any? ||
+ debates.blank? && proposals.any? && budget_investments.blank? ||
+ debates.any? && proposals.blank? && budget_investments.blank?
centered = "medium-centered large-centered"
end
- centered
end
- def calculate_centered_and_size_class(debates, proposals, budget_investments)
+ def calculate_carousel_size(debates, proposals, budget_investments)
size = calculate_size(debates, proposals, budget_investments)
centered = calculate_centered(debates, proposals, budget_investments)
- "#{size} #{centered if centered.present?}"
+ "#{size} #{centered if centered}"
end
def display_recommendeds(debates, proposals, budget_investments)
diff --git a/app/views/welcome/_recommended.html.erb b/app/views/welcome/_recommended.html.erb
index f1e23e081..c47e119c0 100644
--- a/app/views/welcome/_recommended.html.erb
+++ b/app/views/welcome/_recommended.html.erb
@@ -4,14 +4,14 @@
<%= t("welcome.recommended.title") %>
- <% centered_and_size_class = calculate_centered_and_size_class(recommended_debates, recommended_proposals, recommended_budget_investments) %>
+ <% carousel_size = calculate_carousel_size(recommended_debates, recommended_proposals, recommended_budget_investments) %>
<% if recommended_debates.any? %>
<%= render "recommended_carousel", recommendeds: recommended_debates,
key: "debates",
image_field: nil,
image_version: nil,
image_default: "https://dummyimage.com/600x400/000/fff",
- dynamic_display: centered_and_size_class %>
+ carousel_size: carousel_size %>
<% end %>
<% if recommended_proposals.any? %>
@@ -20,7 +20,7 @@
image_field: nil,
image_version: nil,
image_default: "https://dummyimage.com/600x400/000/fff",
- dynamic_display: centered_and_size_class %>
+ carousel_size: carousel_size %>
<% end %>
<% if recommended_budget_investments.any? %>
@@ -29,7 +29,7 @@
image_field: nil, #example value :image (PR#1691)
image_version: nil, #example value :thumb (PR#1691)
image_default: "https://dummyimage.com/600x400/000/fff",
- dynamic_display: centered_and_size_class %>
+ carousel_size: carousel_size %>
<% end %>
diff --git a/app/views/welcome/_recommended_carousel.html.erb b/app/views/welcome/_recommended_carousel.html.erb
index 46d307b8c..6f41fb14d 100644
--- a/app/views/welcome/_recommended_carousel.html.erb
+++ b/app/views/welcome/_recommended_carousel.html.erb
@@ -1,4 +1,4 @@
-
+
<%= t("welcome.recommended.#{key.underscore}.title") %>
diff --git a/spec/features/home_spec.rb b/spec/features/home_spec.rb
index 834434828..9abde050d 100644
--- a/spec/features/home_spec.rb
+++ b/spec/features/home_spec.rb
@@ -88,7 +88,7 @@ feature "Home" do
expect(page).not_to have_content "Recommendations that may interest you"
end
- feature 'Dynamic display' do
+ feature 'Carousel size' do
scenario 'Display debates centered when there are not proposals and investments' do
debate = create(:debate)