When a user hasn't made any blocks or been blocked don't display a

skeleton table. Just a <p> saying there's nothing here.

diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb
index fa279e9b0f8806fade14ef477d7a0ba7f7bdb802..cdb224c2e36ee44444276531056f3556dfd45412 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -1,3 +1,4 @@
+<% unless @user_blocks.empty? %>

 <table id="block_list" cellpadding="3">
   <tr>
     <% if show_user_name %>
 <table id="block_list" cellpadding="3">
   <tr>
     <% if show_user_name %>


@@ -15,5 +16,8 @@
     <th></th>
     <% end %>
   </tr>
     <th></th>
     <% end %>
   </tr>

-  <%= render :partial => 'block', :locals => {:show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks unless @user_blocks.nil? %>
+  <%= render :partial => 'block', :locals => {:show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %>

 </table>
 </table>

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

diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb
index 0140534c4ec63453a0280c61ba3338a8939567d5..1a910001f807ea449284fb3b9d12e2cf49ef84d3 100644 (file)
--- a/app/views/user_blocks/blocks_by.html.erb
+++ b/app/views/user_blocks/blocks_by.html.erb
@@ -1,4 +1,4 @@
 <% @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>
 

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

diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb
index f4632e9989e73b4951a85df434762fba16efe9cd..9a2b8bc5f3cbd8e251c209af063e8cc2278dadb9 100644 (file)
--- a/app/views/user_blocks/blocks_on.html.erb
+++ b/app/views/user_blocks/blocks_on.html.erb
@@ -1,4 +1,4 @@
 <% @title = t('user_block.blocks_on.title', :name => h(@this_user.display_name)) %>
 <h1><%= t('user_block.blocks_on.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_on.title', :name => h(@this_user.display_name)) %>
 <h1><%= t('user_block.blocks_on.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h1>
 

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 412d9259ff0639452705a919e0e5189d61590af7..684b0f5d57f77dbbc817bc9a4b3bb139c0d2a2cb 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1090,9 +1090,11 @@ en:
     blocks_on:
       title: "Blocks on {{name}}"
       heading: "List of blocks on {{name}}"
     blocks_on:
       title: "Blocks on {{name}}"
       heading: "List of blocks on {{name}}"

+      empty: "{{name}} has not made any blocks yet."

     blocks_by:
       title: "Blocks by {{name}}"
       heading: "List of blocks by {{name}}"
     blocks_by:
       title: "Blocks by {{name}}"
       heading: "List of blocks by {{name}}"

+      empty: "{{name}} has not been blocked yet."

     show:
       heading: "Block on {{block_on}} by {{block_by}}"
       time_future: "Ends in {{time}}"
     show:
       heading: "Block on {{block_on}} by {{block_by}}"
       time_future: "Ends in {{time}}"