Merge remote-tracking branch 'openstreetmap/pull/1488'

[rails.git] / app / views / user / list.html.erb

diff --git a/app/views/user/list.html.erb b/app/views/user/list.html.erb
index c91ce71e691db1137355a41822c8274745d9ffa6..fcd0c41fcfd7f49a349ecd2f1035f0f24ad804e2 100644 (file)
--- a/app/views/user/list.html.erb
+++ b/app/views/user/list.html.erb
@@ -1,9 +1,18 @@
 <% @title = t('user.list.title') %>
 
-<h1><%= t('user.list.heading') %></h1>
+<% content_for :head do %>
+  <%= javascript_include_tag "user" %>
+<% end %>
+
+<% content_for :heading do %>
+  <h1><%= t('user.list.heading') %></h1>
+<% end %>
 
 <% unless @users.empty? %>
-  <% form_tag :status => params[:status], :ip => params[:ip] do %>
+  <%= 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">
@@ -15,23 +24,17 @@
               :count => @user_pages.current_page.last_item - @user_pages.current_page.first_item + 1
           %>
           <% if @user_pages.page_count > 1 %>
-          | <%= pagination_links_each(@user_pages, {}) { |n| link_to n, :page => n } %>
+          | <%= raw pagination_links_each(@user_pages, {}) { |n| link_to n, params.merge(:page => n) } %>
           <% end %>
         </td>
         <td>
-          <%=
-            check_box_tag("user_all", "1", false, :onchange => update_page do |page|
-              @users.each do |user|
-                page << "$('user_#{user.id}').checked = $('user_all').checked;"
-              end
-            end)
-          %>
+          <%= check_box_tag "user_all", "1", false %>
         </td>
       </tr>
       <%= render :partial => 'user', :collection => @users %>
     </table>
 
-    <div id="user_list_actions">
+    <div id="user_list_actions buttons">
       <%= submit_tag t('user.list.confirm'), :name => "confirm" %>
       <%= submit_tag t('user.list.hide'), :name => "hide" %>
     </div>