Display the current email address and any pending new email address

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

diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb
index 0140534c4ec63453a0280c61ba3338a8939567d5..c9158536b9708836d2017407218f8ad45fd45f2a 100644 (file)
--- a/app/views/user_blocks/blocks_by.html.erb
+++ b/app/views/user_blocks/blocks_by.html.erb
@@ -1,4 +1,8 @@
 <% @title = t('user_block.blocks_by.title', :name => h(@this_user.display_name)) %>
 <h1><%= t('user_block.blocks_by.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h1>
 
 <% @title = t('user_block.blocks_by.title', :name => h(@this_user.display_name)) %>
 <h1><%= t('user_block.blocks_by.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h1>
 

+<% unless @user_blocks.empty? %>

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

+<% else %>
+<p><%= t "user_block.blocks_by.empty", :name => h(@this_user.display_name) %></p>
+<% end %>