4 files changed, 7 insertions, 35 deletions
diff --git a/app/views/users/already_signed_in.html.erb b/app/views/users/already_signed_in.html.erb
deleted file mode 100644
index 04b4248..0000000
--- a/app/views/users/already_signed_in.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<h1>You are currently signed in</h1>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 89e369a..3692112 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,9 +1,8 @@
 <h1>Listing users</h1>
 
-<table class="table table-hover">
+<table>
   <thead>
     <tr>
-      <th>Username</th>
       <th>Name</th>
       <th>Email</th>
       <th>User name</th>
@@ -16,9 +15,8 @@
   <tbody>
     <% @users.each do |user| %>
       <tr>
-        <td><%= link_to("#{user.user_name}", user, nil) %></td>
         <td><%= user.name %></td>
-        <td> ******* </td>
+        <td><%= user.email %></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 c23f76d..efc0404 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,32 +1,5 @@
-<h1> Sign Up </h1>
+<h1>New user</h1>
 
-<%= form_for @user do |f| %>
-  <%= render "common/error_messages", :target => @user %>
-  <p>
-    <%= f.label :name %><br>
-    <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.label :email %><br>
-    <%= f.text_field :email %>
-  </p>
-  <p>
-    <%= f.label :user_name %><br>
-    <%= f.text_field :user_name %>
-  </p>
-  <p>
-    <%= f.label :password %><br>
-    <%= f.password_field :password %>
-  </p>
-  <p>
-    <%= f.label(:password_confirmation, "Confirm Password") %><br>
-    <%= f.password_field :password_confirmation %>
-  </p>
-  <p>
-    <%= f.submit("Be a Leaguer", :class => "signup") %>
-  </p>
-<% end %>
-
-
-<%= link_to 'Already Have an Account? Log in', new_session_path, :class => "signin" %>
+<%= render 'form' %>
 
+<%= link_to 'Back', users_path %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index d8cc82b..9455a3c 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,3 +1,5 @@
+<p id="notice"><%= notice %></p>
+
 <p>
   <strong>Name:</strong>
   <%= @user.name %>