Merge remote-tracking branch 'upstream/pull/5440'

[rails.git] / 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
index 061989586a255b067cdcf94d219feb7d8b06df86..891315e6eb09b3a8dd69a49a46190fe5b627914f 100644 (file)
--- a/app/views/user_blocks/_navigation.html.erb
+++ b/app/views/user_blocks/_navigation.html.erb
@@ -7,31 +7,31 @@
   <% if current_user&.blocks&.exists? %>
     <li class="nav-item">
       <%= link_to t(".blocks_on_me"),
   <% if current_user&.blocks&.exists? %>
     <li class="nav-item">
       <%= link_to t(".blocks_on_me"),

-                  user_blocks_on_path(current_user),
-                  :class => ["nav-link", { :active => action_name == "blocks_on" && current_user == @user }] %>
+                  user_received_blocks_path(current_user),
+                  :class => ["nav-link", { :active => controller_name == "received_blocks" && current_user == @user }] %>

     </li>
   <% end %>
   <% on_user = @user || @user_block&.user %>
   <% if on_user != current_user && on_user&.blocks&.exists? %>
     <li class="nav-item">
     </li>
   <% end %>
   <% on_user = @user || @user_block&.user %>
   <% if on_user != current_user && on_user&.blocks&.exists? %>
     <li class="nav-item">

-      <%= 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" }] %>
+      <%= link_to t(".blocks_on_user_html", :user => tag.span(on_user.display_name, :class => "username text-truncate d-inline-block align-bottom", :dir => "auto")),
+                  user_received_blocks_path(on_user),
+                  :class => ["nav-link", { :active => controller_name == "received_blocks" }] %>

     </li>
   <% end %>
   <% if current_user&.blocks_created&.exists? %>
     <li class="nav-item">
       <%= link_to t(".blocks_by_me"),
     </li>
   <% end %>
   <% if current_user&.blocks_created&.exists? %>
     <li class="nav-item">
       <%= link_to t(".blocks_by_me"),

-                  user_blocks_by_path(current_user),
-                  :class => ["nav-link", { :active => action_name == "blocks_by" && current_user == @user }] %>
+                  user_issued_blocks_path(current_user),
+                  :class => ["nav-link", { :active => controller_name == "issued_blocks" && current_user == @user }] %>

     </li>
   <% end %>
   <% by_user = @user || @user_block&.creator %>
   <% if by_user != current_user && by_user&.blocks_created&.exists? %>
     <li class="nav-item">
     </li>
   <% end %>
   <% by_user = @user || @user_block&.creator %>
   <% if by_user != current_user && by_user&.blocks_created&.exists? %>
     <li class="nav-item">

-      <%= 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" }] %>
+      <%= link_to t(".blocks_by_user_html", :user => tag.span(by_user.display_name, :class => "username text-truncate d-inline-block align-bottom", :dir => "auto")),
+                  user_issued_blocks_path(by_user),
+                  :class => ["nav-link", { :active => controller_name == "issued_blocks" }] %>

     </li>
   <% end %>
   <% if @user_block&.persisted? %>
     </li>
   <% end %>
   <% if @user_block&.persisted? %>