Merge pull request #4680 from tomhughes/validate-page-numbers

[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 2311541d9f49f247050bf022a7106370568eec5a..7b30d19202ee56c34b76868969af639de6045390 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -1,31 +1,39 @@
-<% @title = t('user_block.show.title',
+<% @title = t(".title",
               :block_on => @user_block.user.display_name,
               :block_by => @user_block.creator.display_name) %>
-<h1><%= 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})) %></h1>
-<% 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 %>
-</p>
+
+<% content_for :heading_class, "pb-0" %>
+<% content_for :heading do %>
+  <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>
+  <%= render :partial => "navigation" %>
 <% end %>
 
-<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>
-<%= @user_block.reason.to_html %>
+  <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>
 
-<% 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 %>
+<% if @user_block.ends_at > Time.now.getutc && (current_user&.id == @user_block.creator_id ||
+                                                can?(:revoke, UserBlock)) %>
+  <div>
+    <% if current_user&.id == @user_block.creator_id %>
+      <%= link_to t(".edit"), edit_user_block_path(@user_block), :class => "btn btn-outline-primary" %>
+    <% end %>
+    <% if can?(:revoke, UserBlock) %>
+      <%= link_to t(".revoke"), revoke_user_block_path(@user_block), :class => "btn btn-outline-danger" %>
+    <% end %>
+  </div>
 <% end %>
-<%= link_to t('user_block.show.back'), user_blocks_path %>