Merge pull request #1597 from tomhughes/current-user

[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 240a7590ddb16532d3bef28ce6f5b345901ab048..903a51c5bb6bbbb7d308db77247d9ac57f58a981 100644 (file)
--- a/app/views/user/list.html.erb
+++ b/app/views/user/list.html.erb
@@ -1,5 +1,9 @@
 <% @title = t('user.list.title') %>
 
+<% content_for :head do %>
+  <%= javascript_include_tag "user" %>
+<% end %>
+
 <% content_for :heading do %>
   <h1><%= t('user.list.heading') %></h1>
 <% end %>
@@ -20,7 +24,7 @@
               :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) } %>
+          | <%= raw pagination_links_each(@user_pages, {}) { |n| link_to n, @params.merge(:page => n) } %>
           <% end %>
         </td>
         <td>
@@ -30,16 +34,10 @@
       <%= 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>
-
-    <script type="text/javascript">
-     $("#user_all").change(function () {
-       $("#user_list input[type=checkbox]").prop("checked", $("#user_all").prop("checked"));
-     });
-    </script>
   <% end %>
 <% else %>
   <p><%= t "user.list.empty" %></p>