From 5522a6702e4586d219c8b332f1e311ca94746158 Mon Sep 17 00:00:00 2001
From: Tomer Kimia <tkimia@purdue.edu>
Date: Mon, 3 Mar 2014 19:37:26 -0500
Subject: made two distinct buttons on homepage

---
 app/views/static/homepage.html.erb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/views/static')

diff --git a/app/views/static/homepage.html.erb b/app/views/static/homepage.html.erb
index 4d52e5b..29ae4f0 100644
--- a/app/views/static/homepage.html.erb
+++ b/app/views/static/homepage.html.erb
@@ -4,7 +4,11 @@
       <div class="jumbotron">
         <h1>Welcome to Leaguer</h1>
         <p>This is a tournment management system designed to be used for any team sport. Our peer review system ensures that the best players move on to the next round! Try creating a new tournament and having people sign up for it. </p>
-        <p id="jumbo-buttons"><%= link_to 'Log In / Sign Up', "signup", :class => "btn btn-warning btn-lg", :role => "button" %> <%= link_to 'See Ongoing Tournaments', tournaments_path, :class => "btn btn-warning btn-lg", :role => "button" %> </p>
+        <p id="jumbo-buttons">
+        <%= link_to 'Log In', "/signin", :class => "btn btn-warning btn-lg", :role => "button" %> 
+        <%= link_to 'Sign Up', "/signup", :class => "btn btn-warning btn-lg", :role => "button" %> 
+        <%= link_to 'See Ongoing Tournaments', tournaments_path, :class => "btn btn-warning btn-lg", :role => "button" %>
+         </p>
       </div>
 
     </div>
-- 
cgit v1.2.3-54-g00ecf


From 25ec3364c15751207cd9dd56157e103a4ee9d782 Mon Sep 17 00:00:00 2001
From: Tomer Kimia <tkimia@purdue.edu>
Date: Mon, 3 Mar 2014 20:40:08 -0500
Subject: dont see log in if logged in

---
 app/views/static/homepage.html.erb | 5 +++--
 app/views/users/index.html.erb     | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/views/static')

diff --git a/app/views/static/homepage.html.erb b/app/views/static/homepage.html.erb
index 29ae4f0..5887d5f 100644
--- a/app/views/static/homepage.html.erb
+++ b/app/views/static/homepage.html.erb
@@ -1,12 +1,13 @@
 <div role="main" class="container theme-showcase">
 
-      <!-- Main jumbotron for a primary marketing message or call to action -->
       <div class="jumbotron">
         <h1>Welcome to Leaguer</h1>
         <p>This is a tournment management system designed to be used for any team sport. Our peer review system ensures that the best players move on to the next round! Try creating a new tournament and having people sign up for it. </p>
         <p id="jumbo-buttons">
+        <% if !signed_in? %>
         <%= link_to 'Log In', "/signin", :class => "btn btn-warning btn-lg", :role => "button" %> 
-        <%= link_to 'Sign Up', "/signup", :class => "btn btn-warning btn-lg", :role => "button" %> 
+        <%= link_to 'Sign Up', "/signup", :class => "btn btn-warning btn-lg", :role => "button" %>
+        <% end %>
         <%= link_to 'See Ongoing Tournaments', tournaments_path, :class => "btn btn-warning btn-lg", :role => "button" %>
          </p>
       </div>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 10f19f4..c128661 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -6,7 +6,7 @@
       <th>Name</th>
       <th>Pw hash</th>
       <th></th>
-      <th></th>
+
       <th></th>
     </tr>
   </thead>
@@ -14,9 +14,8 @@
   <tbody>
     <% @users.each do |user| %>
       <tr>
-        <td><%= user.name %></td>
+        <td><%= link_to("#{user.name}", user, nil) %></td>
         <td> ******* </td>
-        <td><%= link_to 'Show', user %></td>
         <td><%= link_to 'Edit', edit_user_path(user) %></td>
         <td><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
-- 
cgit v1.2.3-54-g00ecf


From d8ce62fa89705ff9d93d28c3ce626ce9268a01af Mon Sep 17 00:00:00 2001
From: Tomer Kimia <tkimia@purdue.edu>
Date: Mon, 3 Mar 2014 20:46:18 -0500
Subject: signed in people see a link to make a new tournament

---
 app/views/static/homepage.html.erb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/views/static')

diff --git a/app/views/static/homepage.html.erb b/app/views/static/homepage.html.erb
index 5887d5f..8b96e11 100644
--- a/app/views/static/homepage.html.erb
+++ b/app/views/static/homepage.html.erb
@@ -7,8 +7,11 @@
         <% if !signed_in? %>
         <%= link_to 'Log In', "/signin", :class => "btn btn-warning btn-lg", :role => "button" %> 
         <%= link_to 'Sign Up', "/signup", :class => "btn btn-warning btn-lg", :role => "button" %>
+        <% else %>
+        <%= link_to 'Start a Tournament', new_tournament_path, :class => "btn btn-warning btn-lg", :role => "button" %> 
         <% end %>
         <%= link_to 'See Ongoing Tournaments', tournaments_path, :class => "btn btn-warning btn-lg", :role => "button" %>
+
          </p>
       </div>
 
-- 
cgit v1.2.3-54-g00ecf