From a57472d28203459b0765e08a4bd004050b97e0ed Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Wed, 3 Apr 2024 11:21:32 +0300 Subject: [PATCH 1/5] Add "All Blocks" nav tab to block list/show pages --- app/views/user_blocks/_navigation.html.erb | 7 +++++++ app/views/user_blocks/blocks_by.html.erb | 3 +++ app/views/user_blocks/blocks_on.html.erb | 3 +++ app/views/user_blocks/index.html.erb | 3 +++ app/views/user_blocks/show.html.erb | 7 ++----- config/locales/en.yml | 3 ++- 6 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 app/views/user_blocks/_navigation.html.erb diff --git a/app/views/user_blocks/_navigation.html.erb b/app/views/user_blocks/_navigation.html.erb new file mode 100644 index 000000000..5ca67afe5 --- /dev/null +++ b/app/views/user_blocks/_navigation.html.erb @@ -0,0 +1,7 @@ + diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb index 87ff7f5b2..7fa0a4fbb 100644 --- a/app/views/user_blocks/blocks_by.html.erb +++ b/app/views/user_blocks/blocks_by.html.erb @@ -1,6 +1,9 @@ <% @title = t(".title", :name => @user.display_name) %> + +<% content_for :heading_class, "pb-0" %> <% content_for :heading do %>

<%= t(".heading_html", :name => link_to(@user.display_name, @user)) %>

+ <%= render :partial => "navigation" %> <% end %> <% unless @user_blocks.empty? %> diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb index ed03342dc..0c15b8866 100644 --- a/app/views/user_blocks/blocks_on.html.erb +++ b/app/views/user_blocks/blocks_on.html.erb @@ -1,6 +1,9 @@ <% @title = t(".title", :name => @user.display_name) %> + +<% content_for :heading_class, "pb-0" %> <% content_for :heading do %>

<%= t(".heading_html", :name => link_to(@user.display_name, @user)) %>

+ <%= render :partial => "navigation" %> <% end %> <% unless @user_blocks.empty? %> diff --git a/app/views/user_blocks/index.html.erb b/app/views/user_blocks/index.html.erb index 57cef6055..4d200b516 100644 --- a/app/views/user_blocks/index.html.erb +++ b/app/views/user_blocks/index.html.erb @@ -1,6 +1,9 @@ <% @title = t(".title") %> + +<% content_for :heading_class, "pb-0" %> <% content_for :heading do %>

<%= t(".heading") %>

+ <%= render :partial => "navigation" %> <% end %> <% unless @user_blocks.empty? %> diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb index 7e6566365..7b30d1920 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -2,15 +2,12 @@ :block_on => @user_block.user.display_name, :block_by => @user_block.creator.display_name) %> +<% content_for :heading_class, "pb-0" %> <% content_for :heading do %>

<%= t(".heading_html", :block_on => link_to(@user_block.user.display_name, @user_block.user), :block_by => link_to(@user_block.creator.display_name, @user_block.creator)) %>

- + <%= render :partial => "navigation" %> <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 95edb8bb5..d4fedb46e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2970,7 +2970,6 @@ en: revoke: "Revoke!" confirm: "Are you sure?" reason: "Reason for block:" - back: "View all blocks" revoker: "Revoker:" needs_view: "The user needs to log in before this block will be cleared." block: @@ -2986,6 +2985,8 @@ en: revoker_name: "Revoked by" older: "Older Blocks" newer: "Newer Blocks" + navigation: + all_blocks: "All Blocks" user_mutes: index: title: "Muted Users" From 288b8e110418a334296275a3edf0a50969d68c75 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Wed, 3 Apr 2024 11:36:42 +0300 Subject: [PATCH 2/5] Add "Blocks on Me" nav tab to block list/show pages --- app/views/user_blocks/_navigation.html.erb | 7 +++++++ config/locales/en.yml | 1 + 2 files changed, 8 insertions(+) diff --git a/app/views/user_blocks/_navigation.html.erb b/app/views/user_blocks/_navigation.html.erb index 5ca67afe5..63f882f6c 100644 --- a/app/views/user_blocks/_navigation.html.erb +++ b/app/views/user_blocks/_navigation.html.erb @@ -4,4 +4,11 @@ user_blocks_path, :class => ["nav-link", { :active => action_name == "index" }] %> + <% if current_user&.blocks&.exists? %> +
  • + <%= link_to t(".blocks_on_me"), + user_blocks_on_path(current_user), + :class => ["nav-link", { :active => action_name == "blocks_on" && current_user == @user }] %> +
    • + <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index d4fedb46e..72e2ea05c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2987,6 +2987,7 @@ en: newer: "Newer Blocks" navigation: all_blocks: "All Blocks" + blocks_on_me: "Blocks on Me" user_mutes: index: title: "Muted Users" From 1861bcf640c70def4563c500ae9f6f814ac729c6 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Wed, 3 Apr 2024 11:42:49 +0300 Subject: [PATCH 3/5] Add "Blocks by Me" nav tab to block list/show pages --- app/views/user_blocks/_navigation.html.erb | 7 +++++++ config/locales/en.yml | 1 + 2 files changed, 8 insertions(+) diff --git a/app/views/user_blocks/_navigation.html.erb b/app/views/user_blocks/_navigation.html.erb index 63f882f6c..b7cc19ecf 100644 --- a/app/views/user_blocks/_navigation.html.erb +++ b/app/views/user_blocks/_navigation.html.erb @@ -11,4 +11,11 @@ :class => ["nav-link", { :active => action_name == "blocks_on" && current_user == @user }] %> <% end %> + <% if current_user&.blocks_created&.exists? %> +
  • + <%= link_to t(".blocks_by_me"), + user_blocks_by_path(current_user), + :class => ["nav-link", { :active => action_name == "blocks_by" && current_user == @user }] %> +
    • + <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 72e2ea05c..de2a4f89c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2988,6 +2988,7 @@ en: navigation: all_blocks: "All Blocks" blocks_on_me: "Blocks on Me" + blocks_by_me: "Blocks by Me" user_mutes: index: title: "Muted Users" From 031dc0fe1b638a45849c8fa36e51f077fe2cf9c1 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Wed, 3 Apr 2024 12:17:01 +0300 Subject: [PATCH 4/5] Add "Blocks on user" nav tab to block list/show pages --- app/views/user_blocks/_navigation.html.erb | 8 ++++++++ config/locales/en.yml | 1 + 2 files changed, 9 insertions(+) diff --git a/app/views/user_blocks/_navigation.html.erb b/app/views/user_blocks/_navigation.html.erb index b7cc19ecf..bd389edbf 100644 --- a/app/views/user_blocks/_navigation.html.erb +++ b/app/views/user_blocks/_navigation.html.erb @@ -11,6 +11,14 @@ :class => ["nav-link", { :active => action_name == "blocks_on" && current_user == @user }] %> <% end %> + <% on_user = @user || @user_block&.user %> + <% if on_user != current_user && on_user&.blocks&.exists? %> +
  • + <%= link_to t(".blocks_on_user", :user => on_user.display_name), + user_blocks_on_path(on_user), + :class => ["nav-link", { :active => action_name == "blocks_on" }] %> +
    • + <% end %> <% if current_user&.blocks_created&.exists? %>
  • <%= link_to t(".blocks_by_me"), diff --git a/config/locales/en.yml b/config/locales/en.yml index de2a4f89c..96dd67956 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2988,6 +2988,7 @@ en: navigation: all_blocks: "All Blocks" blocks_on_me: "Blocks on Me" + blocks_on_user: "Blocks on %{user}" blocks_by_me: "Blocks by Me" user_mutes: index: From 5273b4357888a931ac9cd0513770d4350eb27723 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Wed, 3 Apr 2024 13:05:48 +0300 Subject: [PATCH 5/5] Add "Blocks by user" nav tab to block list/show pages --- app/views/user_blocks/_navigation.html.erb | 8 ++++++++ config/locales/en.yml | 1 + 2 files changed, 9 insertions(+) diff --git a/app/views/user_blocks/_navigation.html.erb b/app/views/user_blocks/_navigation.html.erb index bd389edbf..a84ba1339 100644 --- a/app/views/user_blocks/_navigation.html.erb +++ b/app/views/user_blocks/_navigation.html.erb @@ -26,4 +26,12 @@ :class => ["nav-link", { :active => action_name == "blocks_by" && current_user == @user }] %>
    • <% end %> + <% by_user = @user || @user_block&.creator %> + <% if by_user != current_user && by_user&.blocks_created&.exists? %> +
  • + <%= link_to t(".blocks_by_user", :user => by_user.display_name), + user_blocks_by_path(by_user), + :class => ["nav-link", { :active => action_name == "blocks_by" }] %> +
    • + <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 96dd67956..0634fc2a0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2990,6 +2990,7 @@ en: blocks_on_me: "Blocks on Me" blocks_on_user: "Blocks on %{user}" blocks_by_me: "Blocks by Me" + blocks_by_user: "Blocks by %{user}" user_mutes: index: title: "Muted Users"