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 f53f5cf2806bfc022e10ffed06518095c0fdcf6f..f4f9b04f82b4794e58d13f2f4f6c1e31486ba1d5 100644 (file)
--- 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 6e030051dcda7a17b55334cb5cca2c4b79a72ef2..2d8956ffca730f29c1498074e05110c3a681ca48 100644 (file)
--- 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 c4cae4b221b79bfbba7559635ef4f145f053451b..a97eca9c016c3104d6697596a29e5cbb74404820 100644 (file)
--- 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: