Refactor user blocks information to use a dl

This also standardises the labels to have the colon, in common with
oauth_clients#show.

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 0204908dd2f85de324739bfd8ad8e8b6d465da8a..64f7299eff306aa122325e7929827fb0092ae1d9 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -21,18 +21,18 @@
 </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>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index eb6d0e07827dfb30bd88bbc02eff49a7612fb013..cfe717fe261ca16c3084f82c61766797146db2c2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2610,9 +2610,9 @@ en:
     show:
       title: "%{block_on} blocked by %{block_by}"
       heading_html: "%{block_on} blocked by %{block_by}"
-      created: "Created"
-      duration: "Duration"
-      status: "Status"
+      created: "Created:"
+      duration: "Duration:"
+      status: "Status:"
       show: "Show"
       edit: "Edit"
       revoke: "Revoke!"