Use before/after pagination on users page

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

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index cc71702222121efcdde10c9b3f88656baabd1532..22a916c8bb0b0a793ceb1287bb9d63a4ed80dd8b 100644 (file)
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -10,6 +10,12 @@
 
 <% unless @users.empty? %>
   <%= form_tag do %>
 
 <% unless @users.empty? %>
   <%= form_tag do %>

+    <%= render "shared/pagination",
+               :newer_key => "users.index.newer",
+               :older_key => "users.index.older",
+               :newer_id => @newer_users_id,
+               :older_id => @older_users_id %>
+

     <%= hidden_field_tag :status, params[:status] if params[:status] %>
     <%= hidden_field_tag :ip, params[:ip] if params[:ip] %>
     <%= hidden_field_tag :page, params[:page] if params[:page] %>
     <%= hidden_field_tag :status, params[:status] if params[:status] %>
     <%= hidden_field_tag :ip, params[:ip] if params[:ip] %>
     <%= hidden_field_tag :page, params[:page] if params[:page] %>


@@ -17,15 +23,6 @@
       <thead>
         <tr>
           <td colspan="2">
       <thead>
         <tr>
           <td colspan="2">

-            <%= t ".showing",
-                  :page => @user_pages.current_page.number,
-                  :first_item => @user_pages.current_page.first_item,
-                  :last_item => @user_pages.current_page.last_item,
-                  :items => @user_pages.item_count,
-                  :count => @user_pages.current_page.last_item - @user_pages.current_page.first_item + 1 %>
-            <% if @user_pages.page_count > 1 %>
-            | <%= raw pagination_links_each(@user_pages, {}) { |n| link_to n, @params.merge(:page => n) } %>
-            <% end %>

           </td>
           <td>
             <%= check_box_tag "user_all", "1", false %>
           </td>
           <td>
             <%= check_box_tag "user_all", "1", false %>


@@ -35,9 +32,15 @@
       <%= render @users %>
     </table>
 
       <%= render @users %>
     </table>
 

-    <div id="user_list_actions buttons">
-      <%= submit_tag t(".confirm"), :name => "confirm" %>
-      <%= submit_tag t(".hide"), :name => "hide" %>
+    <%= render "shared/pagination",
+               :newer_key => "users.index.newer",
+               :older_key => "users.index.older",
+               :newer_id => @newer_users_id,
+               :older_id => @older_users_id %>
+
+    <div>
+      <%= submit_tag t(".confirm"), :name => "confirm", :class => "btn btn-primary" %>
+      <%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-primary" %>

     </div>
   <% end %>
 <% else %>
     </div>
   <% end %>
 <% else %>