Merge branch 'master' of github.com:rocketslide/soup

app/views/homepage/index.html.erb

@@ -1,5 +1,5 @@
 
-    
+
     <h1>Are you game?</h1>
 
     <p>Welcome to Restaurant Bingo, the game where you eat your way to success!</p>

app/views/sessions/_loginpartial.html.erb

@@ -0,0 +1,27 @@
+<div class="login">
+  <% if flash[:alert] %>
+    <p id="notice">
+    <%= flash[:alert] %></p>
+  <% end %>
+
+  <%= form_tag do %>
+  <fieldset>
+    <legend>Please Log In</legend>
+    <div class="loginfield">
+      <label for="name">Name:</label>
+      <%= text_field_tag :username, params[:username] %>
+    </div>
+
+    <div class="loginfield">
+      <label for="password">Password:</label>
+      <%= password_field_tag :password, params[:password] %>
+    </div>
+
+    <div>
+      <%= submit_tag "Login" %>
+    </div>
+
+  </fieldset>
+
+  <% end %>
+</div>

app/views/users/index.html.erb

@@ -7,7 +7,7 @@
     <th>Lastname</th>
     <th>Username</th>
     <th>Timestamp</th>
-    <th>Hash password</th>
+    <!--<th>Hash password</th>-->
     <th></th>
     <th></th>
     <th></th>
@@ -20,7 +20,7 @@
     <td><%= user.lastname %></td>
     <td><%= user.username %></td>
     <td><%= user.timestamp %></td>
-    <td><%= user.hash_password %></td>
+    <!--<td><%= user.hash_password %></td>-->
     <td><%= link_to 'Show', user %></td>
     <td><%= link_to 'Edit', edit_user_path(user) %></td>
     <td><%= link_to 'Destroy', user, :confirm => 'Are you sure?', :method => :delete %></td>