6 files changed, 50 insertions, 8 deletions
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 4d28738..ae63f06 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -23,6 +23,14 @@
     <%= f.label :user_name %><br>
     <%= f.text_field :user_name %>
   </div>
+  <p>
+    <%= f.label(:password, "New Password (or use old)") %><br>
+    <%= f.password_field :password %>
+  </p>
+  <div>
+    <%= f.label(:password_confirmation, "Confirm Password") %><br>
+    <%= f.password_field :password_confirmation %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>
diff --git a/app/views/users/already_signed_in.html.erb b/app/views/users/already_signed_in.html.erb
new file mode 100644
index 0000000..04b4248
--- /dev/null
+++ b/app/views/users/already_signed_in.html.erb
@@ -0,0 +1 @@
+<h1>You are currently signed in</h1>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 99bd4cc..52f32a2 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -3,4 +3,4 @@
 <%= render 'form' %>
 
 <%= link_to 'Show', @user %> |
-<%= link_to 'Back', users_path %>
+<%= link_to 'Users', users_path %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 3692112..89e369a 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,8 +1,9 @@
 <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>
@@ -15,8 +16,9 @@
   <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 efc0404..5e369ac 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,5 +1,34 @@
-<h1>New user</h1>
+<h1> Sign Up </h1>
 
-<%= render 'form' %>
+<%= 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>
+	<%= show_simple_captcha %>
+
+    <%= f.submit("Be a Leaguer", :class => "signup") %>
+  </p>
+<% end %>
+
+
+<%= link_to 'Already Have an Account? Log in', new_session_path, :class => "signin" %>
 
-<%= link_to 'Back', users_path %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 9455a3c..7bda009 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,4 +1,6 @@
-<p id="notice"><%= notice %></p>
+<p>
+  <%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(@user.email) + '?s=100&d=mm' %>
+</p>
 
 <p>
   <strong>Name:</strong>
@@ -16,4 +18,4 @@
 </p>
 
 <%= link_to 'Edit', edit_user_path(@user) %> |
-<%= link_to 'Back', users_path %>
+<%= link_to 'Users', users_path %>