Merge remote-tracking branch 'upstream/pull/4562'

[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 51fbcaf49e2ba1f3e9e12e10c49dd13d96ea5ff8..94ea53b6446f983b38eab921c0d2af37a7727d18 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -1,38 +1,38 @@
-<% @title = t('user_block.show.title',
+<% @title = t(".title",

               :block_on => @user_block.user.display_name,
               :block_by => @user_block.creator.display_name) %>
 
 <% content_for :heading do %>
               :block_on => @user_block.user.display_name,
               :block_by => @user_block.creator.display_name) %>
 
 <% content_for :heading do %>

-  <h1><%= raw t('user_block.show.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('user_block.show.edit'), edit_user_block_path(@user_block) %></li>
-    <% end %>
-    <% if current_user and current_user.moderator? %>
-      <li><%= link_to(t('user_block.show.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %></li>
-    <% end %>
-  <% end %>
-  <li><%= link_to t('user_block.show.back'), user_blocks_path %></li>
-</ul>
-<% end %>
-
-<% if @user_block.revoker %>
-<p>
-  <b><%= t'user_block.show.revoker' %></b>
-  <%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>
-</p>
+  <h1><%= 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)) %></h1>
+  <nav class='secondary-actions'>
+    <ul class='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"), revoke_user_block_path(@user_block) %></li>
+        <% end %>
+      <% end %>
+      <li><%= link_to t(".back"), user_blocks_path %></li>
+    </ul>
+  </nav>

 <% end %>
 
 <% end %>
 

-<p><b><%= t'user_block.show.created' %></b>: <%= raw t'user_block.show.ago', :time => friendly_date(@user_block.created_at) %></p>
-
-<p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
+<dl class="row">
+  <% if @user_block.revoker %>
+    <dt class="col-sm-3"><%= t ".revoker" %></dt>
+    <dd class="col-sm-9"><%= link_to @user_block.revoker.display_name, @user_block.revoker %></dd>
+  <% end %>

 
 

-<p><b><%= t'user_block.show.reason' %></b></p>
-<div class="richtext"><%= @user_block.reason.to_html %></div>
+  <dt class="col-sm-3"><%= t ".created" %></dt>
+  <dd class="col-sm-9"><%= friendly_date_ago(@user_block.created_at) %></dd>
+  <dt class="col-sm-3"><%= t ".duration" %></dt>
+  <dd class="col-sm-9"><%= block_duration_in_words(@user_block.ends_at - @user_block.created_at) %></dd>
+  <dt class="col-sm-3"><%= t ".status" %></dt>
+  <dd class="col-sm-9"><%= block_status(@user_block) %></dd>
+  <dt class="col-sm-3"><%= t ".reason" %></dt>
+  <dd class="col-sm-9"><div class="richtext text-break"><%= @user_block.reason.to_html %></div></dd>
+</dl>