Merge branch 'master' into openid

[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..2baf91e5f25559e7975e281333d35c3b98805a96 100644 (file)
--- a/app/views/user_blocks/index.html.erb
+++ b/app/views/user_blocks/index.html.erb
@@ -1,4 +1,8 @@
 <% @title = t('user_block.index.title') %>
 <h1><%= t('user_block.index.heading') %></h1>
 
 <% @title = t('user_block.index.title') %>
 <h1><%= t('user_block.index.heading') %></h1>
 

+<% unless @user_blocks.empty? %>

 <%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => true } %>
 <%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => true } %>

+<% else %>
+<p><%= t "user_block.index.empty" %></p>
+<% end %>