diff --git a/app/views/pages/_card.html.erb b/app/views/pages/_card.html.erb
new file mode 100644
index 000000000..18e642a5b
--- /dev/null
+++ b/app/views/pages/_card.html.erb
@@ -0,0 +1,16 @@
+
+ <%= link_to card.link_url do %>
+
+
+ <% if card.image.present? %>
+ <%= image_tag(card.image_url(:large), alt: card.image.title) %>
+ <% end %>
+
+ <%= card.label %>
+ <%= card.title %>
+
+
+
<%= card.description %>
+
<%= card.link_text %>
+ <% end %>
+
diff --git a/app/views/pages/_cards.html.erb b/app/views/pages/_cards.html.erb
new file mode 100644
index 000000000..d579e6e75
--- /dev/null
+++ b/app/views/pages/_cards.html.erb
@@ -0,0 +1,7 @@
+
<%= t("welcome.cards.title") %>
+
+
+ <% @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 61e167549..2af339117 100644
--- a/app/views/pages/custom_page.html.erb
+++ b/app/views/pages/custom_page.html.erb
@@ -1,3 +1,4 @@
+<%= content_for :body_class, "custom-page" %>
<% provide :title do %><%= @custom_page.title %><% end %>
@@ -16,4 +17,11 @@
<%= render '/shared/print' %>
<% end %>
+
+ <% if @cards.any? %>
+
+ <%= render "cards" %>
+
+ <% end %>
+
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 0b51d9556..4d3495493 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -1448,6 +1448,23 @@ en:
status_published: Published
title: Title
slug: Slug
+ cards_title: Cards
+ see_cards: See Cards
+ cards:
+ cards_title: cards
+ create_card: Create card
+ no_cards: There are no cards.
+ title: Title
+ description: Description
+ link_text: Link text
+ link_url: Link URL
+ create:
+ notice: "Success"
+ update:
+ notice: "Updated"
+ destroy:
+ notice: "Removed"
+
homepage:
title: Homepage
description: The active modules appear in the homepage in the same order as here.
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index dc8e66fb0..8a1ca7315 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -1448,6 +1448,16 @@ es:
status_published: Publicada
title: Título
slug: Slug
+ cards_title: Tarjetas
+ see_cards: Ver tarjetas
+ cards:
+ cards_title: tarjetas
+ create_card: Crear tarjeta
+ no_cards: No hay tarjetas.
+ title: Título
+ description: Descripción
+ link_text: Texto del enlace
+ link_url: URL del enlace
homepage:
title: Título
description: Los módulos activos aparecerán en la homepage en el mismo orden que aquí.
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 52740e9d6..65c343aba 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -217,7 +217,9 @@ namespace :admin do
resources :geozones, only: [:index, :new, :create, :edit, :update, :destroy]
namespace :site_customization do
- resources :pages, except: [:show]
+ resources :pages, except: [:show] do
+ resources :cards, only: [:index]
+ end
resources :images, only: [:index, :update, :destroy]
resources :content_blocks, except: [:show]
delete '/heading_content_blocks/:id', to: 'content_blocks#delete_heading_content_block', as: 'delete_heading_content_block'
diff --git a/db/migrate/20181218164126_add_site_customization_page_to_widget_cards.rb b/db/migrate/20181218164126_add_site_customization_page_to_widget_cards.rb
new file mode 100644
index 000000000..f4dad35fc
--- /dev/null
+++ b/db/migrate/20181218164126_add_site_customization_page_to_widget_cards.rb
@@ -0,0 +1,5 @@
+class AddSiteCustomizationPageToWidgetCards < ActiveRecord::Migration
+ def change
+ add_reference :widget_cards, :site_customization_page, index: true
+ end
+end
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 0d5ed3d1a..830ca56de 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1520,11 +1520,14 @@ ActiveRecord::Schema.define(version: 20190103132925) do
t.string "link_text"
t.string "link_url"
t.string "label"
- t.boolean "header", default: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.boolean "header", default: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.integer "site_customization_page_id"
end
+ add_index "widget_cards", ["site_customization_page_id"], name: "index_widget_cards_on_site_customization_page_id", using: :btree
+
create_table "widget_feeds", force: :cascade do |t|
t.string "kind"
t.integer "limit", default: 3
diff --git a/spec/features/admin/widgets/cards_spec.rb b/spec/features/admin/widgets/cards_spec.rb
index 97571bf32..27f6a4d2b 100644
--- a/spec/features/admin/widgets/cards_spec.rb
+++ b/spec/features/admin/widgets/cards_spec.rb
@@ -130,6 +130,58 @@ feature 'Cards' do
end
end
+ context "Page card" do
+ let!(:custom_page) { create(:site_customization_page) }
+
+ scenario "Create", :js do
+ visit admin_site_customization_pages_path
+ click_link "See Cards"
+ click_link "Create card"
+
+ fill_in "Title", with: "Card for a custom page"
+ click_button "Create card"
+
+ expect(page).to have_current_path admin_site_customization_page_cards_path(custom_page)
+ expect(page).to have_content "Card for a custom page"
+ end
+
+ scenario "Edit", :js do
+ create(:widget_card, page: custom_page, title: "Original title")
+
+ visit admin_site_customization_page_cards_path(custom_page)
+
+ expect(page).to have_content("Original title")
+
+ click_link "Edit"
+
+ within(".translatable-fields") do
+ fill_in "Title", with: "Updated title"
+ end
+
+ click_button "Save card"
+
+ expect(page).to have_current_path admin_site_customization_page_cards_path(custom_page)
+ expect(page).to have_content "Updated title"
+ expect(page).not_to have_content "Original title"
+ end
+
+ scenario "Destroy", :js do
+ create(:widget_card, page: custom_page, title: "Card title")
+
+ visit admin_site_customization_page_cards_path(custom_page)
+
+ expect(page).to have_content("Card title")
+
+ accept_confirm do
+ click_link "Delete"
+ end
+
+ expect(page).to have_current_path admin_site_customization_page_cards_path(custom_page)
+ expect(page).not_to have_content "Card title"
+ end
+
+ end
+
end
pending "add image expectactions"
diff --git a/spec/features/site_customization/custom_pages_spec.rb b/spec/features/site_customization/custom_pages_spec.rb
index 662388ef2..b3b478698 100644
--- a/spec/features/site_customization/custom_pages_spec.rb
+++ b/spec/features/site_customization/custom_pages_spec.rb
@@ -135,6 +135,15 @@ feature "Custom Pages" do
expect(page).to have_selector("h1", text: "Another custom page")
expect(page).to have_content("Subtitle for custom page")
end
+
+ scenario "Show widget cards for that page" do
+ custom_page = create(:site_customization_page, :published)
+ create(:widget_card, page: custom_page, title: "Card Highlights")
+
+ visit custom_page.url
+
+ expect(page).to have_content "Card Highlights"
+ end
end
end
end
diff --git a/spec/models/widget/card_spec.rb b/spec/models/widget/card_spec.rb
index 70c13eafa..b9816f213 100644
--- a/spec/models/widget/card_spec.rb
+++ b/spec/models/widget/card_spec.rb
@@ -26,11 +26,27 @@ describe Widget::Card do
it "returns cards for the homepage body" do
header = create(:widget_card, header: true)
- card1 = create(:widget_card, header: false, title: "Card 1")
- card2 = create(:widget_card, header: false, title: "Card 2")
- card3 = create(:widget_card, header: false, title: "Card 3")
+ card1 = create(:widget_card, header: false)
+ card2 = create(:widget_card, header: false)
+ page_card = create(:widget_card, header: false, page: create(:site_customization_page))
- expect(Widget::Card.body).to eq([card1, card2, card3])
+ expect(Widget::Card.body).to include(card1)
+ expect(Widget::Card.body).to include(card2)
+ expect(Widget::Card.body).not_to include(header)
+ expect(Widget::Card.body).not_to include(page_card)
+ end
+ end
+
+ describe "#custom page" do
+
+ it "return cards for the custom pages" do
+ header = create(:widget_card, header: true)
+ card = create(:widget_card, header: false)
+ card1 = create(:widget_card, header: false, title: "Card 1", site_customization_page_id: 1)
+ card2 = create(:widget_card, header: false, title: "Card 2", site_customization_page_id: 1)
+ card3 = create(:widget_card, header: false, title: "Card 3", site_customization_page_id: 1)
+
+ expect(Widget::Card.page(1)).to eq([card1, card2, card3])
end
end