X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1a2ccfbb8fd0d5432fe09473af59ec0a1d3457c5..1f7dd79daf44de5f8f8b6c246a269e44bb258175:/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 43b69d13c..e882e6e3b 100644
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -1,13 +1,28 @@
<% @title = t('user_block.show.title',
:block_on => @user_block.user.display_name,
:block_by => @user_block.creator.display_name) %>
-
<%= t('user_block.show.title',
- :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})) %>
+
+<% content_for :heading do %>
+ <%= raw 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.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 %>
+ <% end %>
+ - <%= link_to t('user_block.show.back'), user_blocks_path %>
+
+<% end %>
+
<% if @user_block.revoker %>
<%= t'user_block.show.revoker' %>
@@ -17,18 +32,5 @@
<%= t'user_block.show.status' %>: <%= block_status(@user_block) %>
-
- <%= t'user_block.show.reason' %>
- <%=h @user_block.reason %>
-
-
-
-<% 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 %>
-<% end %>
-<%= link_to t('user_block.show.back'), user_blocks_path %>
+<%= t'user_block.show.reason' %>
+<%= @user_block.reason.to_html %>