diff --git a/app/views/admin/articles/index.html.erb b/app/views/admin/articles/index.html.erb index 9b4635bb1..490956018 100644 --- a/app/views/admin/articles/index.html.erb +++ b/app/views/admin/articles/index.html.erb @@ -130,18 +130,12 @@
<% if @featured_articles.present? %>

Manually Featured Articles

- <% @featured_articles.each do |article| %> - <%= render "individual_article", article: article %> - <% end %> + <%= render partial: "individual_article", collection: @featured_articles, as: :article %> <% end %>
<%= paginate @articles %> - - <% @articles.each do |article| %> - <%= render "individual_article", article: article %> - <% end %> - + <%= render partial: "individual_article", collection: @articles, as: :article %> <%= paginate @articles %>
diff --git a/app/views/articles/_sidebar.html.erb b/app/views/articles/_sidebar.html.erb index 3644e0761..4e1db07f8 100644 --- a/app/views/articles/_sidebar.html.erb +++ b/app/views/articles/_sidebar.html.erb @@ -12,12 +12,10 @@ <%= SiteConfig.sponsor_headline %> <%= inline_svg_tag("twemoji/heart.svg", aria: true, class: "crayons-icon crayons-icon--default ml-1", title: "Love") %> -
- <% @sponsorships.each do |sponsorship| %> - <%= render "articles/single_sponsor", sponsorship: sponsorship %> - <% end %> - Become a sponsor -
+
+ <%= render partial: "articles/single_sponsor", collection: @sponsorships, as: :sponsorship %> + Become a sponsor +
<% end %> <% end %> diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb index ada63e5e2..669b03318 100644 --- a/app/views/events/index.html.erb +++ b/app/views/events/index.html.erb @@ -24,9 +24,7 @@ Upcoming Events - <% @events.each do |event| %> - <%= render "event", event: event %> - <% end %> + <%= render partial: "event", collection: @events, as: :event %> <% if @events.none? %>
@@ -38,11 +36,7 @@

Past Events

+ <%= render partial: "event", collection: @past_events, as: :event %> <% end %> - - <% @past_events.each do |event| %> - <%= render "event", event: event %> - <% end %> -
diff --git a/app/views/organizations/_main_feed.html.erb b/app/views/organizations/_main_feed.html.erb index b04e177e1..e3254a8bf 100644 --- a/app/views/organizations/_main_feed.html.erb +++ b/app/views/organizations/_main_feed.html.erb @@ -1,7 +1,5 @@
-<% @stories.each_with_index do |story, i| %> - <%= render "articles/single_story", story: story, featured: false %> -<% end %> +<%= render partial: "articles/single_story", collection: @stories, as: :story, locals: { featured: false } %> <% if @stories.size > 1 %>
<% end %> diff --git a/app/views/users/_main_feed.html.erb b/app/views/users/_main_feed.html.erb index 9e56494af..3c25e525a 100644 --- a/app/views/users/_main_feed.html.erb +++ b/app/views/users/_main_feed.html.erb @@ -7,21 +7,17 @@
- <% @pinned_stories.each do |story| %> - <%= render "articles/single_story", story: story, featured: false %> - <% end %> + <%= render partial: "articles/single_story", collection: @pinned_stories, as: :story, locals: { featured: false } %>
<% end %> -<% @stories.each_with_index do |story, i| %> - <%= render "articles/single_story", story: story, featured: false %> - <% if i == 0 && @comments.present? %> +<% if @stories.present? %> + <%= render "articles/single_story", story: @stories.first, featured: false %> + <% if @comments.present? %> <%= render "users/comments_section" %> <% end %> -<% end %> -<% if @stories.none? && @comments.present? %> + <%= render partial: "articles/single_story", collection: @stories[1, @stories.size], as: :story, locals: { featured: false } %> +
+<% elsif @comments.present? %> <%= render "users/comments_section" %> <% end %> -<% if @stories.size > 1 %> -
-<% end %>