not api endpoints, moved to button, fixed notifier message, fixed tests

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

diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb
index cdb224c2e36ee44444276531056f3556dfd45412..d3908dab3e84caa102d9bdb568a9691eb9f9c317 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -1,4 +1,3 @@
-<% 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 %>


@@ -18,6 +17,19 @@
   </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 %>
 </table>
   </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 %>
 </table>

-<% else %>
-<p><%= t "user_block.#{blocks_by_on}.empty", :name => h(@this_user.display_name) %></p>
-<% end %>
+
+<ul class='secondary-actions'>
+  <% if @user_blocks_pages.current_page.number > 1 -%>
+    <li><%= link_to t('user_block.partial.previous'), params.merge({ :page => @user_blocks_pages.current_page.number - 1 }) %></li>
+  <% else -%>
+    <li><%= t('user_block.partial.previous') %></li>
+  <% end -%>
+
+  <li><%= t('user_block.partial.showing_page', :page => @user_blocks_pages.current_page.number) %></li>
+
+  <% if @user_blocks_pages.current_page.number < @user_blocks_pages.page_count -%>
+    <li><%= link_to t('user_block.partial.next'), params.merge({ :page => @user_blocks_pages.current_page.number + 1 }) %></li>
+  <% else -%>
+    <li><%= t('user_block.partial.next') %></li>
+  <% end -%>
+</ul>