From caedd21da87b4ef6d4d5f31abed9c9d93bd192b5 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 21 Apr 2020 12:54:16 +0200 Subject: [PATCH] Move cards to shared partials --- app/views/pages/_cards.html.erb | 7 ------- app/views/pages/custom_page.html.erb | 2 +- app/views/{pages => shared}/_card.html.erb | 0 app/views/{welcome => shared}/_cards.html.erb | 4 +--- app/views/welcome/_card.html.erb | 20 ------------------- app/views/welcome/index.html.erb | 4 +++- 6 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 app/views/pages/_cards.html.erb rename app/views/{pages => shared}/_card.html.erb (100%) rename app/views/{welcome => shared}/_cards.html.erb (54%) delete mode 100644 app/views/welcome/_card.html.erb diff --git a/app/views/pages/_cards.html.erb b/app/views/pages/_cards.html.erb deleted file mode 100644 index 47b4a1ee9..000000000 --- a/app/views/pages/_cards.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -
-
- <% @cards.find_each do |card| %> - <%= render "card", card: card %> - <% end %> -
-
diff --git a/app/views/pages/custom_page.html.erb b/app/views/pages/custom_page.html.erb index cdd06f9e0..e88892ceb 100644 --- a/app/views/pages/custom_page.html.erb +++ b/app/views/pages/custom_page.html.erb @@ -20,7 +20,7 @@ <% if @cards.any? %>
- <%= render "cards" %> + <%= render "shared/cards" %>
<% end %> diff --git a/app/views/pages/_card.html.erb b/app/views/shared/_card.html.erb similarity index 100% rename from app/views/pages/_card.html.erb rename to app/views/shared/_card.html.erb diff --git a/app/views/welcome/_cards.html.erb b/app/views/shared/_cards.html.erb similarity index 54% rename from app/views/welcome/_cards.html.erb rename to app/views/shared/_cards.html.erb index 06f6d9ad3..34768aca7 100644 --- a/app/views/welcome/_cards.html.erb +++ b/app/views/shared/_cards.html.erb @@ -1,9 +1,7 @@ -

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

-
<% @cards.each do |card| %> - <%= render "card", card: card %> + <%= render "shared/card", card: card %> <% end %>
diff --git a/app/views/welcome/_card.html.erb b/app/views/welcome/_card.html.erb deleted file mode 100644 index 4e6c1e459..000000000 --- a/app/views/welcome/_card.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -
- <%= link_to card.link_url do %> -
-
- <% if card.image.present? %> - <%= image_tag(card.image_url(:large), alt: card.image.title) %> - <% end %> -
- <% if card.label.present? %> - <%= card.label %> - <% end %> -
-

<%= card.title %>

-
-
-

<%= card.description %>

-

<%= card.link_text %>

- <% end %> -
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index edc93514d..35b557edc 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -21,7 +21,9 @@
<% if @cards.any? %>
"> - <%= render "cards" %> +

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

+ + <%= render "shared/cards" %>
<% end %>