Include any current search terms in the page title

[rails.git] / app / views / users / index.html.erb

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 960cf112854219d138c9f6db1b9df9159a71c8b4..f1ef5b5380f4460e84b31676b97a3b444c740bf6 100644 (file)
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,11 +1,11 @@
-<% @title = t('.title') %>
+<% @title = t(".title") %>

 
 <% content_for :head do %>
   <%= javascript_include_tag "user" %>
 <% end %>
 
 <% content_for :heading do %>
 
 <% content_for :head do %>
   <%= javascript_include_tag "user" %>
 <% end %>
 
 <% content_for :heading do %>

-  <h1><%= t('.heading') %></h1>
+  <h1><%= t(".heading") %></h1>

 <% end %>
 
 <% unless @users.empty? %>
 <% end %>
 
 <% unless @users.empty? %>


@@ -16,13 +16,12 @@
     <table id="user_list">
       <tr>
         <td colspan="2">
     <table id="user_list">
       <tr>
         <td colspan="2">

-          <%= t '.showing',
-              :page => @user_pages.current_page.number,
-              :first_item => @user_pages.current_page.first_item,
-              :last_item => @user_pages.current_page.last_item,
-              :items => @user_pages.item_count,
-              :count => @user_pages.current_page.last_item - @user_pages.current_page.first_item + 1
-          %>
+          <%= t ".showing",
+                :page => @user_pages.current_page.number,
+                :first_item => @user_pages.current_page.first_item,
+                :last_item => @user_pages.current_page.last_item,
+                :items => @user_pages.item_count,
+                :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) } %>
           <% end %>
           <% if @user_pages.page_count > 1 %>
           | <%= raw pagination_links_each(@user_pages, {}) { |n| link_to n, @params.merge(:page => n) } %>
           <% end %>


@@ -31,12 +30,12 @@
           <%= check_box_tag "user_all", "1", false %>
         </td>
       </tr>
           <%= check_box_tag "user_all", "1", false %>
         </td>
       </tr>

-      <%= render :partial => 'user', :collection => @users %>
+      <%= render @users %>

     </table>
 
     <div id="user_list_actions buttons">
     </table>
 
     <div id="user_list_actions buttons">

-      <%= submit_tag t('.confirm'), :name => "confirm" %>
-      <%= submit_tag t('.hide'), :name => "hide" %>
+      <%= submit_tag t(".confirm"), :name => "confirm" %>
+      <%= submit_tag t(".hide"), :name => "hide" %>

     </div>
   <% end %>
 <% else %>
     </div>
   <% end %>
 <% else %>