diff --git a/app/controllers/public/collections_controller.rb b/app/controllers/public/collections_controller.rb index f19273959..5a97f0194 100644 --- a/app/controllers/public/collections_controller.rb +++ b/app/controllers/public/collections_controller.rb @@ -7,6 +7,7 @@ class Public::CollectionsController < ApplicationController def show @considering = current_page_from @collection.cards.considering.latest, per_page: CardsController::PAGE_SIZE + @on_deck = current_page_from @collection.cards.on_deck.latest, per_page: CardsController::PAGE_SIZE @doing = current_page_from @collection.cards.doing.latest, per_page: CardsController::PAGE_SIZE @closed = current_page_from @collection.cards.closed.recently_closed_first, per_page: CardsController::PAGE_SIZE diff --git a/app/views/public/collections/show.html.erb b/app/views/public/collections/show.html.erb index 98df479b5..ada82683b 100644 --- a/app/views/public/collections/show.html.erb +++ b/app/views/public/collections/show.html.erb @@ -27,6 +27,7 @@ <% end %>
+ <%= render "public/collections/show/on_deck", collection: @collection, page: @on_deck %> <%= render "public/collections/show/considering", collection: @collection, page: @considering %> <%= render "public/collections/show/doing", collection: @collection, page: @doing %>
diff --git a/app/views/public/collections/show/_considering.html.erb b/app/views/public/collections/show/_considering.html.erb index e5ecf213a..be408e633 100644 --- a/app/views/public/collections/show/_considering.html.erb +++ b/app/views/public/collections/show/_considering.html.erb @@ -1,8 +1,4 @@
-

- Considering -

- <% if page.used? %> <%= render partial: "cards/display/public_preview", collection: page.records, as: :card, cached: true %> diff --git a/app/views/public/collections/show/_doing.html.erb b/app/views/public/collections/show/_doing.html.erb index 0e99e1387..557dbd7ff 100644 --- a/app/views/public/collections/show/_doing.html.erb +++ b/app/views/public/collections/show/_doing.html.erb @@ -1,6 +1,6 @@

- Doing + Yes!

<% if page.used? %> diff --git a/app/views/public/collections/show/_on_deck.html.erb b/app/views/public/collections/show/_on_deck.html.erb new file mode 100644 index 000000000..127e0cf50 --- /dev/null +++ b/app/views/public/collections/show/_on_deck.html.erb @@ -0,0 +1,17 @@ +
+

+ Maybe? +

+ + <% if page.used? %> + <%= render partial: "cards/display/public_preview", collection: page.records, as: :card, cached: true %> + + <% unless page.last? %> +
+ <%= public_collection_cards_next_page_link collection, "on-deck-cards", page: page %> +
+ <% end %> + <% else %> +

Nothing here

+ <% end %> +
\ No newline at end of file