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

[rails.git] / app / views / user_blocks / index.html.erb

diff --git a/app/views/user_blocks/index.html.erb b/app/views/user_blocks/index.html.erb
index 8d645f46589b7fe8d281da3c7492c57af7da97b6..ce7f12b9150db41336b1d0c778cf1f0b9bdabbf8 100644 (file)
--- a/app/views/user_blocks/index.html.erb
+++ b/app/views/user_blocks/index.html.erb
@@ -1,4 +1,10 @@
 <% @title = t('user_block.index.title') %>
-<h1><%= t('user_block.index.heading') %></h1>
+<% content_for :heading do %>
+  <h1><%= t('user_block.index.heading') %></h1>
+<% end %>
 
-<%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => true } %>
+<% unless @user_blocks.empty? %>
+<%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => true, :show_creator_name => true } %>
+<% else %>
+<p><%= t "user_block.index.empty" %></p>
+<% end %>