diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index cefd6fd37..b3657c76e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -18,7 +18,7 @@ module ApplicationHelper def back_link_to(label, url, action, **options) link_to url, class: "btn btn--back", data: { controller: "hotkey", action: action }, **options do - icon_tag("arrow-left") + tag.strong("Back to #{label}", class: "overflow-ellipsis") + tag.kbd("←", class: "txt-x-small hide-on-touch").html_safe + icon_tag("arrow-left") + tag.strong("Back to #{label}", class: "overflow-ellipsis") + tag.kbd("ESC", class: "txt-x-small hide-on-touch").html_safe end end end diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb index 54c09a407..a1960b341 100644 --- a/app/helpers/boards_helper.rb +++ b/app/helpers/boards_helper.rb @@ -1,6 +1,6 @@ module BoardsHelper def link_back_to_board(board) - back_link_to board.name, board, "keydown.left@document->hotkey#click click->turbo-navigation#backIfSamePath" + back_link_to board.name, board, "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click click->turbo-navigation#backIfSamePath" end def link_to_edit_board(board) diff --git a/app/views/account/join_codes/edit.html.erb b/app/views/account/join_codes/edit.html.erb index 7f22b9318..bca92e58f 100644 --- a/app/views/account/join_codes/edit.html.erb +++ b/app/views/account/join_codes/edit.html.erb @@ -2,13 +2,7 @@ <% content_for :header do %>
- <%= link_to account_join_code_path, class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> - - <%= icon_tag "arrow-left" %> - Back to Invite link - ← - - <% end %> + <%= back_link_to "Invite link", account_join_code_path, "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
<% end %> diff --git a/app/views/account/join_codes/show.html.erb b/app/views/account/join_codes/show.html.erb index e9fd72d71..f3cfb1e37 100644 --- a/app/views/account/join_codes/show.html.erb +++ b/app/views/account/join_codes/show.html.erb @@ -2,13 +2,7 @@ <% content_for :header do %>
- <%= link_to account_settings_path, class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> - - <%= icon_tag "arrow-left" %> - Back to Account Settings - ← - - <% end %> + <%= back_link_to "Account Settings", account_settings_path, "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
<% end %> diff --git a/app/views/events/day_timeline/columns/show.html.erb b/app/views/events/day_timeline/columns/show.html.erb index 3ef8e09e2..5df324465 100644 --- a/app/views/events/day_timeline/columns/show.html.erb +++ b/app/views/events/day_timeline/columns/show.html.erb @@ -2,13 +2,7 @@ <% content_for :header do %>
- <%= link_to events_path, class: "btn btn--back", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> - - <%= icon_tag "arrow-left" %> - Back to Actvity - ← - - <% end %> + <%= back_link_to "Actvity", root_path, "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>

diff --git a/app/views/public/boards/columns/closeds/show.html.erb b/app/views/public/boards/columns/closeds/show.html.erb index 260eaa70b..6b6106dbc 100644 --- a/app/views/public/boards/columns/closeds/show.html.erb +++ b/app/views/public/boards/columns/closeds/show.html.erb @@ -2,7 +2,7 @@ <% content_for :header do %>
- <%= back_link_to @board.name, published_board_url(@board), "keydown.left@document->hotkey#click" %> + <%= back_link_to @board.name, published_board_url(@board), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>

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 38961b509..dfdc7365c 100644 --- a/app/views/public/boards/columns/not_nows/show.html.erb +++ b/app/views/public/boards/columns/not_nows/show.html.erb @@ -2,7 +2,7 @@ <% content_for :header do %>
- <%= back_link_to @board.name, published_board_url(@board), "keydown.left@document->hotkey#click" %> + <%= back_link_to @board.name, published_board_url(@board), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>

diff --git a/app/views/public/boards/columns/show.html.erb b/app/views/public/boards/columns/show.html.erb index 772789685..bb5010b51 100644 --- a/app/views/public/boards/columns/show.html.erb +++ b/app/views/public/boards/columns/show.html.erb @@ -2,7 +2,7 @@ <% content_for :header do %>
- <%= back_link_to @column.board.name, published_board_url(@column.board), "keydown.left@document->hotkey#click" %> + <%= back_link_to @column.board.name, published_board_url(@column.board), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>

diff --git a/app/views/public/boards/columns/streams/show.html.erb b/app/views/public/boards/columns/streams/show.html.erb index 337f37e8f..225e0f711 100644 --- a/app/views/public/boards/columns/streams/show.html.erb +++ b/app/views/public/boards/columns/streams/show.html.erb @@ -2,7 +2,7 @@ <% content_for :header do %>
- <%= back_link_to @board.name, published_board_url(@board), "keydown.left@document->hotkey#click" %> + <%= back_link_to @board.name, published_board_url(@board), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>

diff --git a/app/views/public/cards/show.html.erb b/app/views/public/cards/show.html.erb index 0fb1a8fc6..ae2e1fb1a 100644 --- a/app/views/public/cards/show.html.erb +++ b/app/views/public/cards/show.html.erb @@ -14,7 +14,7 @@ <% content_for :header do %>
- <%= back_link_to @card.board.name, published_board_url(@card.board), "keydown.left@document->hotkey#click", style: "view-transistion-name: card-board-title;" %> + <%= back_link_to @card.board.name, published_board_url(@card.board), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click", style: "view-transistion-name: card-board-title;" %>
<% end %> diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 1646c3944..ab189c6ab 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -2,13 +2,7 @@ <% content_for :header do %>
- <%= link_to user_path(@user), class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> - - <%= icon_tag "arrow-left" %> - Back to profile - ← - - <% end %> + <%= back_link_to "profile", user_path(@user), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
<% end %> diff --git a/app/views/users/email_addresses/create.html.erb b/app/views/users/email_addresses/create.html.erb index 158dfc312..0ed95d7cc 100644 --- a/app/views/users/email_addresses/create.html.erb +++ b/app/views/users/email_addresses/create.html.erb @@ -2,12 +2,7 @@ <% content_for :header do %>
- <%= link_to edit_user_path(@user, script_name: @user.account.slug), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> - - Back to My profile - ← - - <% end %> + <%= back_link_to "My profile", edit_user_path(@user, script_name: @user.account.slug), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
<% end %> diff --git a/app/views/users/email_addresses/new.html.erb b/app/views/users/email_addresses/new.html.erb index 8b0f1cbcf..397e62300 100644 --- a/app/views/users/email_addresses/new.html.erb +++ b/app/views/users/email_addresses/new.html.erb @@ -2,13 +2,7 @@ <% content_for :header do %>
- <%= link_to edit_user_path(@user, script_name: @user.account.slug), class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> - - <%= icon_tag "arrow-left" %> - Back to My profile - ← - - <% end %> + <%= back_link_to "My profile", edit_user_path(@user, script_name: @user.account.slug), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
<% end %> diff --git a/app/views/webhooks/edit.html.erb b/app/views/webhooks/edit.html.erb index 695aac8b5..9075683a4 100644 --- a/app/views/webhooks/edit.html.erb +++ b/app/views/webhooks/edit.html.erb @@ -2,7 +2,7 @@ <% content_for :header do %>
- <%= back_link_to @page_title, @webhook, "keydown.left@document->hotkey#click" %> + <%= back_link_to @page_title, @webhook, "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
<% end %> diff --git a/app/views/webhooks/new.html.erb b/app/views/webhooks/new.html.erb index 791341b0c..02522aedb 100644 --- a/app/views/webhooks/new.html.erb +++ b/app/views/webhooks/new.html.erb @@ -2,7 +2,7 @@ <% content_for :header do %>
- <%= back_link_to "Webhooks", board_webhooks_path, "keydown.left@document->hotkey#click" %> + <%= back_link_to "Webhooks", board_webhooks_path, "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>

<%= @page_title %>

diff --git a/app/views/webhooks/show.html.erb b/app/views/webhooks/show.html.erb index ef0604909..598cbb532 100644 --- a/app/views/webhooks/show.html.erb +++ b/app/views/webhooks/show.html.erb @@ -3,7 +3,7 @@ <% content_for :header do %>
- <%= back_link_to "Webhooks", board_webhooks_path, "keydown.left@document->hotkey#click" %> + <%= back_link_to "Webhooks", board_webhooks_path, "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>