Use a current_user helper for accessing the logged in user in all views.

[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 398debe1eed046cfb0ccd9d706f76eb4ef75fe4a..903a51c5bb6bbbb7d308db77247d9ac57f58a981 100644 (file)
--- a/app/views/user/list.html.erb
+++ b/app/views/user/list.html.erb
@@ -1,6 +1,12 @@
 <% @title = t('user.list.title') %>
 
 <% @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 do %>
 
 <% unless @users.empty? %>
   <%= form_tag do %>


@@ -18,7 +24,7 @@
               :count => @user_pages.current_page.last_item - @user_pages.current_page.first_item + 1
           %>
           <% if @user_pages.page_count > 1 %>
               :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>
           <% end %>
         </td>
         <td>


@@ -28,16 +34,10 @@
       <%= render :partial => 'user', :collection => @users %>
     </table>
 
       <%= 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>
       <%= 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>
   <% end %>
 <% else %>
   <p><%= t "user.list.empty" %></p>