Merge remote-tracking branch 'upstream/pull/5408'

[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 960cf112854219d138c9f6db1b9df9159a71c8b4..abf0092cebb5c8c695c7369406719b85e64e05c8 100644 (file)
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,44 +1,15 @@
-<% @title = t('.title') %>
+<% @title = t(".title") %>
 
 <% content_for :head do %>
   <%= javascript_include_tag "user" %>
 <% end %>
 
 <% content_for :heading do %>
-  <h1><%= t('.heading') %></h1>
+  <h1><%= t(".heading") %></h1>
 <% end %>
 
 <% unless @users.empty? %>
-  <%= form_tag do %>
-    <%= 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] %>
-    <table id="user_list">
-      <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>
-      </tr>
-      <%= render :partial => 'user', :collection => @users %>
-    </table>
-
-    <div id="user_list_actions buttons">
-      <%= submit_tag t('.confirm'), :name => "confirm" %>
-      <%= submit_tag t('.hide'), :name => "hide" %>
-    </div>
-  <% end %>
+  <%= render :partial => "page" %>
 <% else %>
   <p><%= t ".empty" %></p>
 <% end %>