From 522c4e2cfcea45714ac0018d8ad42244d98504ba Mon Sep 17 00:00:00 2001 From: taitus Date: Sat, 22 Jul 2017 12:44:03 +0200 Subject: [PATCH] Regroup all carousels on 1 partial. Rename partial --- app/helpers/welcome_helper.rb | 19 +++- .../welcome/_recommended_carousel.html.erb | 35 ++++++ .../welcome/_recommended_no_image.html.erb | 105 +----------------- 3 files changed, 57 insertions(+), 102 deletions(-) create mode 100644 app/views/welcome/_recommended_carousel.html.erb diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index 78c01b141..9ec9c2872 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -7,5 +7,22 @@ module WelcomeHelper def slide_display(index) "display: none;" if index > 0 end - + + def recommended_path(recommended) + case recommended.class + when Debate + debates_path(recommended) + when Proposal + proposals_path(recommended) + when Budget::Investment + budget_investments_path(recommended) + else + '#' + end + end + + def title_key(key) + key.gsub("-", "_") + end + end diff --git a/app/views/welcome/_recommended_carousel.html.erb b/app/views/welcome/_recommended_carousel.html.erb new file mode 100644 index 000000000..2076330fc --- /dev/null +++ b/app/views/welcome/_recommended_carousel.html.erb @@ -0,0 +1,35 @@ +
+
+ +

<%= t("welcome.recommended.#{title_key(key)}.title") %>

+ +
+
+
    + <% recommendeds.each_with_index do |recommended, index| %> +
  • +
    +
    + <%= link_to recommended_path(recommended) do %> +
    <%= recommended.title %>
    + <% end %> +

    <%= recommended.description %>

    +
    +
    +
    • + <% end %> +
+
+
+ + +
+ +
+
diff --git a/app/views/welcome/_recommended_no_image.html.erb b/app/views/welcome/_recommended_no_image.html.erb index 5bf08cc44..ba693fffd 100644 --- a/app/views/welcome/_recommended_no_image.html.erb +++ b/app/views/welcome/_recommended_no_image.html.erb @@ -1,108 +1,11 @@
+

<%= t("welcome.recommended.title") %>

-
-
+ <%= render "recommended_carousel", recommendeds: recommended_debates, key: "debates" %> + <%= render "recommended_carousel", recommendeds: recommended_proposals, key: "proposals" %> + <%= render "recommended_carousel", recommendeds: recommended_budget_investments, key: "budget-investments" %> -

<%= t("welcome.recommended.debates.title") %>

- -
-
-
    - <% recommended_debates.each_with_index do |debate, index| %> -
  • -
    -
    - <%= link_to debate_path(debate) do %> -
    <%= debate.title %>
    - <% end %> -

    <%= debate.description %>

    -
    -
    -
    • - <% end %> -
-
-
- - -
-
-
- -
-
- -

<%= t("welcome.recommended.proposals.title") %>

- -
-
-
    - <% recommended_proposals.each_with_index do |proposal, index| %> -
  • -
    -
    - <%= link_to proposal_path(proposal) do %> -
    <%= proposal.title %>
    - <% end %> -

    <%= proposal.description %>

    -
    -
    -
    • - <% end %> -
-
-
- -
-
-
- -
-
- -

<%= t("welcome.recommended.budget_investments.title") %>

- -
-
-
    - <% recommended_budget_investments.each_with_index do |budget_investment, index| %> -
  • -
    -
    - <%= link_to budget_path(budget_investment) do %> -
    <%= budget_investment.title %>
    - <% end %> -

    <%= budget_investment.description %>

    -
    -
    -
    • - <% end %> -
-
-
- -
-
-