--- /usr/share/redmine/app/views/users/index.html.erb	2012-09-16 15:54:12.000000000 +0300
+++ index.html.erb	2012-09-22 23:03:26.260691074 +0300
@@ -1,52 +1,69 @@
 <div class="contextual">
-<%= link_to l(:label_user_new), new_user_path, :class => 'icon icon-add' %>
+<%= link_to l(:label_user_new), { :action => 'new' }, :class => 'icon icon-add' %>
 </div>
 
 <h2><%=l(:label_user_plural)%></h2>
 
-<%= form_tag({}, :method => :get) do %>
+<% form = form_tag({}, :onsubmit => 'selectAllOptions("selected_columns");', :method => :get, :id => 'user_list_form') do %>
 <fieldset><legend><%= l(:label_filter_plural) %></legend>
 <label for='status'><%= l(:field_status) %>:</label>
-<%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
+<%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.onsubmit(); this.form.submit(); return false;"  %>
 
 <% if @groups.present? %>
 <label for='group_id'><%= l(:label_group) %>:</label>
-<%= select_tag 'group_id', content_tag('option') + options_from_collection_for_select(@groups, :id, :name, params[:group_id].to_i), :onchange => "this.form.submit(); return false;"  %>
+<%= select_tag 'group_id', content_tag('option') + options_from_collection_for_select(@groups, :id, :name, params[:group_id].to_i), :onchange => "this.form.onsubmit(); this.form.submit(); return false;" %>
 <% end %>
 
 <label for='name'><%= l(:label_user) %>:</label>
 <%= text_field_tag 'name', params[:name], :size => 30 %>
-<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
-<%= link_to l(:button_clear), users_path, :class => 'icon icon-reload' %>
 </fieldset>
+
+  <fieldset class="collapsible collapsed">
+    <legend onclick="toggleFieldset(this);"><%= l(:field_column_names) %></legend>
+    <div style="display: none;">
+      <%= render(:partial => 'custom_fields/columns', :locals => { :object => User }) %>
+    </div>
+  </fieldset>
+
+  <%= hidden_field_tag('save', '') %>
+
+  <p class="buttons hide-when-print">
+    <% if defined? observe_field %>
+      <% user_list_form = "$('user_list_form')" %>
+    <% else %>
+      <% user_list_form = "$('#user_list_form')[0]" %>
+    <% end %>
+    <%= link_to_function(l(:button_apply), "var user_list_form = #{user_list_form}; user_list_form.onsubmit(); user_list_form.submit();", :class => 'icon icon-checked') %>
+    <%= link_to(l(:button_clear), { :action => 'index' }, :class => 'icon icon-reload') %>
+    <%= link_to_function(l(:button_save), "var user_list_form = #{user_list_form}; user_list_form['save'].value = '1'; user_list_form.onsubmit(); user_list_form.submit();", :class => 'icon icon-save') %>
+  </p>
+
 <% end %>
-&nbsp;
+<%= form if Rails::VERSION::MAJOR >= 3 %>
 
 <div class="autoscroll">
-<table class="list">
+<table class="list users-listing">
   <thead><tr>
-  <%= sort_header_tag('login', :caption => l(:field_login)) %>
-  <%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
-  <%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
-  <%= sort_header_tag('mail', :caption => l(:field_mail)) %>
-  <%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
-  <%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
-  <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
+      <% @list_settings.columns.each do |column| %>
+        <% if %w(login firstname lastname mail admin created_on last_login_on).include?(column.name.to_s) %>
+          <%= sort_header_tag(column.name.to_s, :caption => column.caption) %>
+        <% else %>
+          <th><%= h(column.caption) %></th>
+        <% end %>
+      <% end %>
     <th></th>
   </tr></thead>
   <tbody>
 <% for user in @users -%>
   <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
-  <td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
-  <td class="firstname"><%= h(user.firstname) %></td>
-  <td class="lastname"><%= h(user.lastname) %></td>
-  <td class="email"><%= mail_to(h(user.mail)) %></td>
-  <td align="center"><%= checked_image user.admin? %></td>
-  <td class="created_on" align="center"><%= format_time(user.created_on) %></td>
-  <td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
+    <% @list_settings.columns.each do |column| %>
+      <td class="<%= h(column.css_classes) %>" align="<%= h(column.align) %>"><%= extended_column_content(column, user) %></td>
+    <% end %>
     <td class="buttons">
       <%= change_status_link(user) %>
-      <%= delete_link user_path(user, :back_url => users_path(params)) unless User.current == user %>
+      <% if UsersController.respond_to?(:destroy) %>
+        <%= link_to(l(:button_delete), user, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') unless User.current == user %>
+      <% end %>
     </td>
   </tr>
 <% end -%>