From: Anton Khorev Date: Wed, 11 Sep 2024 10:38:02 +0000 (+0300) Subject: Rename _blocks partial template to _page X-Git-Tag: live~139^2 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/de344eea836d0694dead47508f114bb5a369eca2 Rename _blocks partial template to _page --- diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 7d61366be..c42c2659d 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -25,7 +25,7 @@ class UserBlocksController < ApplicationController @show_user_name = true @show_creator_name = true - render :partial => "blocks" if turbo_frame_request_id == "pagination" + render :partial => "page" if turbo_frame_request_id == "pagination" end def show @@ -127,7 +127,7 @@ class UserBlocksController < ApplicationController @show_user_name = false @show_creator_name = true - render :partial => "blocks" if turbo_frame_request_id == "pagination" + render :partial => "page" if turbo_frame_request_id == "pagination" end ## @@ -142,7 +142,7 @@ class UserBlocksController < ApplicationController @show_user_name = true @show_creator_name = false - render :partial => "blocks" if turbo_frame_request_id == "pagination" + render :partial => "page" if turbo_frame_request_id == "pagination" end private diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_page.html.erb similarity index 100% rename from app/views/user_blocks/_blocks.html.erb rename to app/views/user_blocks/_page.html.erb diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb index 38254a5a3..73748e557 100644 --- a/app/views/user_blocks/blocks_by.html.erb +++ b/app/views/user_blocks/blocks_by.html.erb @@ -7,7 +7,7 @@ <% end %> <% unless @user_blocks.empty? %> -<%= render :partial => "blocks" %> +<%= render :partial => "page" %> <% else %>

<%= t ".empty", :name => @user.display_name %>

<% end %> diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb index 38254a5a3..73748e557 100644 --- a/app/views/user_blocks/blocks_on.html.erb +++ b/app/views/user_blocks/blocks_on.html.erb @@ -7,7 +7,7 @@ <% end %> <% unless @user_blocks.empty? %> -<%= render :partial => "blocks" %> +<%= render :partial => "page" %> <% else %>

<%= t ".empty", :name => @user.display_name %>

<% end %> diff --git a/app/views/user_blocks/index.html.erb b/app/views/user_blocks/index.html.erb index 854d62037..5b040e2b5 100644 --- a/app/views/user_blocks/index.html.erb +++ b/app/views/user_blocks/index.html.erb @@ -7,7 +7,7 @@ <% end %> <% unless @user_blocks.empty? %> -<%= render :partial => "blocks" %> +<%= render :partial => "page" %> <% else %>

<%= t ".empty" %>

<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 9a383569e..926189809 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2927,7 +2927,7 @@ en: not_revoked: "(not revoked)" show: "Show" edit: "Edit" - blocks: + page: display_name: "Blocked User" creator_name: "Creator" reason: "Reason for block"