From: Tom Hughes <tom@compton.nu>
Date: Fri, 16 Aug 2024 16:22:59 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5086'
X-Git-Tag: live~1123
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9e807aeca0105497ced7e75bb434a88f41865204?hp=076a8114ef719f2fd0e72c94ed43e766e2d798bc

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

diff --git a/app/views/user_blocks/_navigation.html.erb b/app/views/user_blocks/_navigation.html.erb
index f53f5cf28..f4f9b04f8 100644
--- a/app/views/user_blocks/_navigation.html.erb
+++ b/app/views/user_blocks/_navigation.html.erb
@@ -38,7 +38,7 @@
     <li class="nav-item">
       <%= link_to t(".block", :id => @user_block.id),
                   user_block_path(@user_block),
-                  :class => ["nav-link", { :active => action_name == "show" }] %>
+                  :class => "nav-link active" %>
     </li>
   <% end %>
 </ul>
diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb
index 6e030051d..2d8956ffc 100644
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,12 +1,9 @@
 <% @title = t ".title", :name => @user_block.user.display_name %>
+
+<% content_for :heading_class, "pb-0" %>
 <% content_for :heading do %>
   <h1><%= t(".heading_html", :name => link_to(@user_block.user.display_name, @user_block.user)) %></h1>
-  <nav class='secondary-actions'>
-    <ul class='clearfix'>
-      <li><%= link_to t(".show"), @user_block %></li>
-      <li><%= link_to t(".back"), user_blocks_path %></li>
-    </ul>
-  </nav>
+  <%= render :partial => "navigation" %>
 <% end %>
 
 <%= bootstrap_form_for(@user_block) do |f| %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c4cae4b22..a97eca9c0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2941,8 +2941,6 @@ en:
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."
-      show: "View this block"
-      back: "View all blocks"
     filter:
       block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create: