X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/aa37cecc1d690859f17d888a2af69dc6ce1b82c3..572d1adaae6a8f7100c829ce9d3da4dbf07bb7fd:/app/views/user_blocks/show.html.erb?ds=sidebyside
diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index bc405ecce..180406c74 100644
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -1,31 +1,33 @@
-<% @title = t('user_block.show.title',
+<% @title = t(".title",
:block_on => @user_block.user.display_name,
:block_by => @user_block.creator.display_name) %>
-
<%= t('user_block.show.heading',
- :block_on => link_to(
- h(@user_block.user.display_name),
- {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}),
- :block_by => link_to(
- h(@user_block.creator.display_name),
- {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %>
-<% if @user_block.revoker %>
-
- <%= t'user_block.show.revoker' %>
- <%= link_to h(@user_block.revoker.display_name), :controller => 'user', :action => 'view', :display_name => @user_block.revoker.display_name %>
-
+
+<% content_for :heading_class, "pb-0" %>
+<% content_for :heading do %>
+ <%= t(".heading_html",
+ :block_on => link_to(@user_block.user.display_name, @user_block.user),
+ :block_by => link_to(@user_block.creator.display_name, @user_block.creator)) %>
+ <%= render :partial => "navigation" %>
<% end %>
-<%= t'user_block.show.status' %>: <%= block_status(@user_block) %>
+
+ <% if @user_block.revoker %>
+ - <%= t ".revoker" %>
+ - <%= link_to @user_block.revoker.display_name, @user_block.revoker %>
+ <% end %>
-<%= t'user_block.show.reason' %>
-<%= htmlize(@user_block.reason) %>
+ - <%= t ".created" %>
+ - <%= friendly_date_ago(@user_block.created_at) %>
+ - <%= t ".duration" %>
+ - <%= block_duration_in_words(@user_block.ends_at - @user_block.created_at) %>
+ - <%= t ".status" %>
+ - <%= block_status(@user_block) %>
+ - <%= t ".reason" %>
+ <%= @user_block.reason.to_html %>
+
-<% if @user_block.ends_at > Time.now.getutc %>
-<% if @user and @user.id == @user_block.creator_id %>
-<%= link_to t('user_block.show.edit'), edit_user_block_path(@user_block) %> |
-<% end %>
-<% if @user and @user.moderator? %>
-<%= link_to(t('user_block.show.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %> |
-<% end %>
+<% if can?(:edit, @user_block) %>
+
+ <%= link_to t(".edit"), edit_user_block_path(@user_block), :class => "btn btn-outline-primary" %>
+
<% end %>
-<%= link_to t('user_block.show.back'), user_blocks_path %>