Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/5086'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Aug 16, 2024
2 parents 076a811 + b9828d7 commit 9e807ae
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion app/views/user_blocks/_navigation.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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>
9 changes: 3 additions & 6 deletions app/views/user_blocks/edit.html.erb
Original file line number Diff line number Diff line change
@@ -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| %>
Expand Down
2 changes: 0 additions & 2 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 9e807ae

Please sign in to comment.