diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css index ef3e5b37a..675f3fe13 100644 --- a/app/assets/stylesheets/card-columns.css +++ b/app/assets/stylesheets/card-columns.css @@ -417,10 +417,6 @@ display: initial; } } - - .cards--grid &:not(.blank-slate-for-grid) { - display: none; - } } } diff --git a/app/views/public/_footer.html.erb b/app/views/public/_footer.html.erb new file mode 100644 index 000000000..6f97a0b70 --- /dev/null +++ b/app/views/public/_footer.html.erb @@ -0,0 +1,3 @@ +
+ <%= link_to "Fizzy", "https://www.fizzy.do", class: "txt-subtle" %> is designed, built, and backed by <%= icon_tag "37signals", class: "v-align-middle" %> 37signals. +
diff --git a/app/views/public/boards/columns/closeds/show.html.erb b/app/views/public/boards/columns/closeds/show.html.erb index 02e8aa46c..b3212aa81 100644 --- a/app/views/public/boards/columns/closeds/show.html.erb +++ b/app/views/public/boards/columns/closeds/show.html.erb @@ -1,11 +1,34 @@ -<%= turbo_frame_tag :closed_column do %> - <% if @page.used? %> - <%= with_automatic_pagination :closed_column, @page do %> - <%= render "public/boards/columns/list", cards: @page.records %> +<% @page_title = "Column: Closed" %> + +<% content_for :header do %> +
+ <%= link_to published_board_url(@board), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + + Back to <%= @board.name %> + + <% end %> - <% else %> -
-

No cards here

-
- <% end %> +
+ +

+ <%= @page_title %> +

+<% end %> + +
+ <%= turbo_frame_tag :closed_column do %> + <% if @page.used? %> + <%= with_automatic_pagination :closed_column, @page do %> + <%= render "public/boards/columns/list", cards: @page.records %> + <% end %> + <% else %> +
+

No cards here

+
+ <% end %> + <% end %> +
+ +<% content_for :footer do %> + <%= render "public/footer" %> <% end %> diff --git a/app/views/public/boards/columns/not_nows/show.html.erb b/app/views/public/boards/columns/not_nows/show.html.erb index 8f818cfe0..d6ceb0da5 100644 --- a/app/views/public/boards/columns/not_nows/show.html.erb +++ b/app/views/public/boards/columns/not_nows/show.html.erb @@ -1,11 +1,34 @@ -<%= turbo_frame_tag :not_now_column do %> - <% if @page.used? %> - <%= with_automatic_pagination :not_now_column, @page do %> - <%= render "public/boards/columns/list", cards: @page.records %> +<% @page_title = "Column: Not now" %> + +<% content_for :header do %> +
+ <%= link_to published_board_url(@board), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + + Back to <%= @board.name %> + + <% end %> - <% else %> -
-

No cards here

-
- <% end %> +
+ +

+ <%= @page_title %> +

+<% end %> + +
+ <%= turbo_frame_tag :not_now_column do %> + <% if @page.used? %> + <%= with_automatic_pagination :not_now_column, @page do %> + <%= render "public/boards/columns/list", cards: @page.records %> + <% end %> + <% else %> +
+

No cards here

+
+ <% end %> + <% end %> +
+ +<% content_for :footer do %> + <%= render "public/footer" %> <% end %> diff --git a/app/views/public/boards/columns/show.html.erb b/app/views/public/boards/columns/show.html.erb index 5844926fe..e23e4e370 100644 --- a/app/views/public/boards/columns/show.html.erb +++ b/app/views/public/boards/columns/show.html.erb @@ -1,11 +1,35 @@ -<%= turbo_frame_tag @column, :cards do %> - <% if @page.used? %> - <%= with_automatic_pagination dom_id(@column, :cards), @page do %> - <%= render "public/boards/columns/list", cards: @page.records %> +<% @page_title = "Column: #{ @column.name }" %> + +<% content_for :header do %> +
+ <%= link_to published_board_url(@column.board), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + + Back to <%= @column.board.name %> + + <% end %> - <% else %> -
-

No cards here

-
- <% end %> +
+ +

+ <%= @page_title %> +

<% end %> + +
+ <%= turbo_frame_tag @column, :cards do %> + <% if @page.used? %> + <%= with_automatic_pagination dom_id(@column, :cards), @page do %> + <%= render "public/boards/columns/list", cards: @page.records %> + <% end %> + <% else %> +
+

No cards here

+
+ <% end %> + <% end %> +
+ +<% content_for :footer do %> + <%= render "public/footer" %> +<% end %> + diff --git a/app/views/public/boards/columns/streams/show.html.erb b/app/views/public/boards/columns/streams/show.html.erb index f165d6250..0a75e1179 100644 --- a/app/views/public/boards/columns/streams/show.html.erb +++ b/app/views/public/boards/columns/streams/show.html.erb @@ -1,11 +1,34 @@ -<%= turbo_frame_tag :stream_column do %> - <% if @page.used? %> - <%= with_automatic_pagination :stream_column, @page do %> - <%= render "public/boards/columns/list", cards: @page.records %> +<% @page_title = "Column: Maybe?" %> + +<% content_for :header do %> +
+ <%= link_to published_board_url(@board), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + + Back to <%= @board.name %> + + <% end %> - <% else %> -
-

No cards here

-
- <% end %> +
+ +

+ <%= @page_title %> +

<% end %> + +
+ <%= turbo_frame_tag :stream_column do %> + <% if @page.used? %> + <%= with_automatic_pagination :stream_column, @page do %> + <%= render "public/boards/columns/list", cards: @page.records %> + <% end %> + <% else %> +
+

No cards here

+
+ <% end %> + <% end %> +
+ +<% content_for :footer do %> + <%= render "public/footer" %> +<% end %> \ No newline at end of file diff --git a/app/views/public/boards/show.html.erb b/app/views/public/boards/show.html.erb index f5585f5e9..f0e91cfd2 100644 --- a/app/views/public/boards/show.html.erb +++ b/app/views/public/boards/show.html.erb @@ -25,3 +25,7 @@ <% end %> <%= render "public/boards/show/columns", page: @page, board: @board %> + +<% content_for :footer do %> + <%= render "public/footer" %> +<% end %> diff --git a/app/views/public/boards/show/_closed.html.erb b/app/views/public/boards/show/_closed.html.erb index e83f2eae0..9f1e1c930 100644 --- a/app/views/public/boards/show/_closed.html.erb +++ b/app/views/public/boards/show/_closed.html.erb @@ -6,6 +6,11 @@
<%= render "boards/show/expander", title: "Done", count: board.cards.closed.count, column_id: "closed-cards" %> + + <%= link_to public_board_columns_closed_url(board.publication.key), class: "cards__maximize-button btn btn--circle txt-x-small borderless", data: { turbo_frame: "_top" } do %> + <%= icon_tag "grid", class: "translucent" %> + Maximize column + <% end %>
<%= column_frame_tag :closed_column, src: public_board_columns_closed_path(board.publication.key) %> diff --git a/app/views/public/boards/show/_column.html.erb b/app/views/public/boards/show/_column.html.erb index ae6b515fd..b95c49ebd 100644 --- a/app/views/public/boards/show/_column.html.erb +++ b/app/views/public/boards/show/_column.html.erb @@ -7,6 +7,11 @@
<%= render "boards/show/expander", title: column.name, count: column.cards.active.count, column_id: dom_id(column) %> + + <%= link_to public_board_column_url(column.board.publication.key, column), class: "cards__maximize-button btn btn--circle txt-x-small borderless", data: { turbo_frame: "_top" } do %> + <%= icon_tag "grid", class: "translucent" %> + Maximize column + <% end %>
<%= column_frame_tag dom_id(column, :cards), src: public_board_column_path(column.board.publication.key, column) %> diff --git a/app/views/public/boards/show/_considering.html.erb b/app/views/public/boards/show/_considering.html.erb deleted file mode 100644 index 057871543..000000000 --- a/app/views/public/boards/show/_considering.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -
- <% if page.used? %> - <%= render "cards/display/public_previews", cards: page.records %> - - <% unless page.last? %> -
- <%= public_board_cards_next_page_link board, "considering-cards", page: page %> -
- <% end %> - <% else %> -

Nothing here

- <% end %> -
diff --git a/app/views/public/boards/show/_doing.html.erb b/app/views/public/boards/show/_doing.html.erb deleted file mode 100644 index b6b3cdc8a..000000000 --- a/app/views/public/boards/show/_doing.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -
-

- Working On -

- - <% if page.used? %> - <%= render "cards/display/public_previews", cards: page.records %> - - <% unless page.last? %> -
- <%= public_board_cards_next_page_link board, "doing-cards", page: page %> -
- <% end %> - <% else %> -

Nothing here

- <% end %> -
diff --git a/app/views/public/boards/show/_not_now.html.erb b/app/views/public/boards/show/_not_now.html.erb index f108596b2..d66103117 100644 --- a/app/views/public/boards/show/_not_now.html.erb +++ b/app/views/public/boards/show/_not_now.html.erb @@ -6,6 +6,11 @@
<%= render "boards/show/expander", title: "Not Now", count: board.cards.postponed.count, column_id: "not-now" %> + + <%= link_to public_board_columns_not_now_url(board.publication.key), class: "cards__maximize-button btn btn--circle txt-x-small borderless", data: { turbo_frame: "_top" } do %> + <%= icon_tag "grid", class: "translucent" %> + Maximize column + <% end %>
<%= column_frame_tag :not_now_column, src: public_board_columns_not_now_path(board.publication.key) %> diff --git a/app/views/public/boards/show/_on_deck.html.erb b/app/views/public/boards/show/_on_deck.html.erb deleted file mode 100644 index 539efa64c..000000000 --- a/app/views/public/boards/show/_on_deck.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -
-

- On Deck -

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

Nothing here

- <% end %> -
diff --git a/app/views/public/boards/show/_stream.html.erb b/app/views/public/boards/show/_stream.html.erb index 55c4b363b..8fea976b6 100644 --- a/app/views/public/boards/show/_stream.html.erb +++ b/app/views/public/boards/show/_stream.html.erb @@ -5,16 +5,13 @@

Maybe?

+ + <%= link_to public_board_columns_stream_url(board.publication.key), class: "cards__maximize-button btn btn--circle txt-x-small borderless", data: { turbo_frame: "_top" } do %> + <%= icon_tag "grid", class: "translucent" %> + Maximize column + <% end %> - <% if page.used? %> - <%= with_automatic_pagination "the-stream", @page do %> - <%= render "public/boards/columns/list", cards: page.records %> - <% end %> - <% else %> -
-

No cards here

-
- <% end %> + <%= column_frame_tag :stream_column, src: public_board_columns_stream_path(board.publication.key) %>
diff --git a/app/views/public/cards/show.html.erb b/app/views/public/cards/show.html.erb index ec228eea9..b6446ea7b 100644 --- a/app/views/public/cards/show.html.erb +++ b/app/views/public/cards/show.html.erb @@ -48,3 +48,7 @@ <%= render "layouts/lightbox" %> + +<% content_for :footer do %> + <%= render "public/footer" %> +<% end %>