Tried to DRY the user_blocks controller. Moved the configuration of the blocking...

[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 f8e8b523e3aaf6da60af85132379a8769e03b342..a1123e21e269a6c29a33b529af49ed6319c5d889 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -1,6 +1,6 @@
 <h1><%= t('user_block.show.heading', 
        :block_on => @user_block.user.display_name, 
 <h1><%= t('user_block.show.heading', 
        :block_on => @user_block.user.display_name, 

-        :block_by => @user_block.moderator.display_name) %></h1>
+        :block_by => @user_block.creator.display_name) %></h1>

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


@@ -9,17 +9,7 @@
 </p>
 <% end %>
 
 </p>
 <% end %>
 

-<p>
-  <% if @user_block.end_at > Time.now %>
-    <%= t('user_block.show.time_future', :time => distance_of_time_in_words_to_now(@user_block.end_at)) %>
-  <% else %>
-    <%= t('user_block.show.time_past', :time => distance_of_time_in_words_to_now(@user_block.end_at)) %>
-  <% end %>
-</p>
-
-<% if @user_block.needs_view %>
-<p><%= t'user_block.show.needs_view' %></p>
-<% end %>
+<p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>

 
 <p>
   <b><%= t'user_block.show.reason' %></b>
 
 <p>
   <b><%= t'user_block.show.reason' %></b>


@@ -27,8 +17,8 @@
 </p>
 
 
 </p>
 
 

-<% if @user_block.end_at > Time.now.getutc %>
-<% if @user and @user.id == @user_block.moderator_id %>
+<% 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.edit'), edit_user_block_path(@user_block) %> |
 <% end %>
 <% if @user and @user.moderator? %>