Resolve conflict

[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 c19c0ac6c52544cbaf766f5bca37869446669ae1..93839cbe8d5276ef7b50f399e7cd23aefe4e9d7c 100644 (file)
--- a/app/views/user/list.html.erb
+++ b/app/views/user/list.html.erb
@@ -1,6 +1,8 @@
 <% @title = t('user.list.title') %>
 
 <% @title = t('user.list.title') %>
 

-<h1><%= t('user.list.heading') %></h1>
+<% 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 +20,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 %>

-          | <%= 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,7 +30,7 @@
       <%= 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>