Set X-Entity-Ref-ID header on notification emails

[rails.git] / app / views / user_blocks / show.html.erb

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 43b69d13c0de79941e39d6343df3c25f61f22c35..7e225bf14e34b2cec45d43c221469a55d2d55af2 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -1,34 +1,36 @@
-<% @title = t('user_block.show.title',
+<% @title = t(".title",

               :block_on => @user_block.user.display_name,
               :block_by => @user_block.creator.display_name) %>
               :block_on => @user_block.user.display_name,
               :block_by => @user_block.creator.display_name) %>

-<h1><%= 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})) %></h1>
+
+<% content_for :heading do %>
+  <h1><%= raw t(".heading",
+                :block_on => link_to(h(@user_block.user.display_name),
+                                     user_path(@user_block.user)),
+                :block_by => link_to(h(@user_block.creator.display_name),
+                                     user_path(@user_block.creator))) %></h1>
+<ul class='secondary-actions clearfix'>
+  <% if @user_block.ends_at > Time.now.getutc %>
+    <% if current_user and current_user.id == @user_block.creator_id %>
+      <li><%= link_to t(".edit"), edit_user_block_path(@user_block) %></li>
+    <% end %>
+    <% if can?(:revoke, UserBlock) %>
+      <li><%= link_to(t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => @user_block.id) %></li>
+    <% end %>
+  <% end %>
+  <li><%= link_to t(".back"), user_blocks_path %></li>
+</ul>
+<% end %>
+

 <% if @user_block.revoker %>
 <p>
 <% if @user_block.revoker %>
 <p>

-  <b><%= t'user_block.show.revoker' %></b>
-  <%= link_to h(@user_block.revoker.display_name), :controller => 'user', :action => 'view', :display_name => @user_block.revoker.display_name %>
+  <b><%= t ".revoker" %></b>
+  <%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>

 </p>
 <% end %>
 
 </p>
 <% end %>
 

-<p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
+<p><b><%= t ".created" %></b>: <%= friendly_date_ago(@user_block.created_at) %></p>

 
 

-<p>
-  <b><%= t'user_block.show.reason' %></b>
-  <%=h @user_block.reason %>
-</p>
+<p><b><%= t ".status" %></b>: <%= block_status(@user_block) %></p>

 
 

-
-<% 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 %>
+<p><b><%= t ".reason" %></b></p>
+<div class="richtext"><%= @user_block.reason.to_html %></div>