Merge branch 'master' into feature/add-communities-page

[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 0204908dd2f85de324739bfd8ad8e8b6d465da8a..d686bda105014dfb726c17994a18f32c9cdcdd6e 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -14,25 +14,25 @@
       <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>
+      <li><%= link_to t(".revoke"), revoke_user_block_path(@user_block) %></li>
     <% end %>
   <% end %>
   <li><%= link_to t(".back"), user_blocks_path %></li>
 </ul>
 <% end %>
 
-<% if @user_block.revoker %>
-<p>
-  <b><%= t ".revoker" %></b>
-  <%= link_to @user_block.revoker.display_name, user_path(@user_block.revoker) %>
-</p>
-<% end %>
-
-<p><b><%= t ".created" %></b>: <%= friendly_date_ago(@user_block.created_at) %></p>
-
-<p><b><%= t ".duration" %></b>: <%= block_duration_in_words(@user_block.ends_at - @user_block.created_at) %></p>
-
-<p><b><%= t ".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_path(@user_block.revoker) %></dd>
+  <% end %>
 
-<p><b><%= t ".reason" %></b></p>
-<div class="richtext text-break"><%= @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>