diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-03 20:40:08 -0500 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-03 20:40:08 -0500 |
| commit | 25ec3364c15751207cd9dd56157e103a4ee9d782 (patch) | |
| tree | 77385201bc1907e39b941af1ea8afba85ac23ff5 /app | |
| parent | b8c14b654255376d79fae55e139a968930be4569 (diff) | |
dont see log in if logged in
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/static/homepage.html.erb | 5 | ||||
| -rw-r--r-- | app/views/users/index.html.erb | 5 |
2 files changed, 5 insertions, 5 deletions
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> |