Merge branch 'master' of github.com:LukeShu/leager

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/index.html.erb

2 files changed, 9 insertions, 6 deletions

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 3692112..d7b46da 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,22 +1,25 @@
 <h1>Listing users</h1>
 
-<table>
+<table class="table table-hover">
   <thead>
     <tr>
+      <th>Username</th>
       <th>Name</th>
       <th>Email</th>
       <th>User name</th>
       <th></th>
       <th></th>
       <th></th>
+      <th></th>
     </tr>
   </thead>
 
   <tbody>
     <% @users.each do |user| %>
       <tr>
+        <td><%= link_to("#{user.user_name}", user, nil) %></td>
         <td><%= user.name %></td>
-        <td><%= user.email %></td>
+        <td> ******* </td>
         <td><%= user.user_name %></td>
         <td><%= link_to 'Show', user %></td>
         <td><%= link_to 'Edit', edit_user_path(user) %></td>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 2a745cc..aa71f00 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -16,11 +16,11 @@
   </p>
    <p>
     <%= f.label :password %><br>
-    <%= f.text_field :password %>
+    <%= f.password_field :password %>
   </p>
   <p>
     <%= f.label :password_confirm %><br>
-    <%= f.text_field :password_confirmation %>
+    <%= f.password_field :password_confirmation %>
   </p>
   <p>
     <%= f.submit %>
@@ -45,11 +45,11 @@
   </p>
    <p>
     <label for="user_password">Password</label><br>
-    <input id="user_password" name="user[password]" type="text" />
+    <input id="user_password" name="user[password]" type="password" />
   </p>
   <p>
     <label for="user_password_confirm">Password confirm</label><br>
-    <input id="user_password_confirmation" name="user[password_confirmation]" type="text" />
+    <input id="user_password_confirmation" name="user[password_confirmation]" type="password" />
   </p>
   <p>
     <input name="commit" type="submit" value="Save User" />