Merge remote-tracking branch 'upstream/pull/3915'

[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 deb0eab4c315bef77f2d94ab37ccbb89331a823d..12d5ae7af232edb801b0f5340d86435a1a2c2d39 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 %>
-  <h1><%= t('.heading') %></h1>
+  <h1><%= t(".heading") %></h1>
 <% end %>
 
 <% unless @users.empty? %>
@@ -13,29 +13,31 @@
     <%= hidden_field_tag :status, params[:status] if params[:status] %>
     <%= hidden_field_tag :ip, params[:ip] if params[:ip] %>
     <%= hidden_field_tag :page, params[:page] if params[:page] %>
-    <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 %>
-          <% if @user_pages.page_count > 1 %>
-          | <%= raw pagination_links_each(@user_pages, {}) { |n| link_to n, @params.merge(:page => n) } %>
-          <% end %>
-        </td>
-        <td>
-          <%= check_box_tag "user_all", "1", false %>
-        </td>
-      </tr>
-      <%= render :partial => 'user', :collection => @users %>
+    <table id="user_list" class="table table-borderless table-striped">
+      <thead>
+        <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 %>
+            <% if @user_pages.page_count > 1 %>
+            | <%= raw pagination_links_each(@user_pages, {}) { |n| link_to n, @params.merge(:page => n) } %>
+            <% end %>
+          </td>
+          <td>
+            <%= check_box_tag "user_all", "1", false %>
+          </td>
+        </tr>
+      </thead>
+      <%= render @users %>
     </table>
 
-    <div id="user_list_actions buttons">
-      <%= submit_tag t('.confirm'), :name => "confirm" %>
-      <%= submit_tag t('.hide'), :name => "hide" %>
+    <div>
+      <%= submit_tag t(".confirm"), :name => "confirm", :class => "btn btn-primary" %>
+      <%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-primary" %>
     </div>
   <% end %>
 <% else %>