diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:27:11 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:27:11 -0500 |
| commit | 2eb8e1c090071abf3108828efc831f12128e17df (patch) | |
| tree | a1410e2cc118db1b410808b7f339e4c5f52bd43c /app/views/static | |
| parent | fb76b4db64583def6db3aac43e31c25d3bd489df (diff) | |
| parent | aca85cf084702c29014a17eafb090421061fae8b (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/scaffolds.css.scss
app/views/games/index.html.erb
db/migrate/20140304043618_create_servers.rb
db/migrate/20140304043622_create_matches.rb
db/migrate/20140304043631_create_games.rb
Diffstat (limited to 'app/views/static')
| -rw-r--r-- | app/views/static/homepage.html.erb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/views/static/homepage.html.erb b/app/views/static/homepage.html.erb index 4d52e5b..3ca8176 100644 --- a/app/views/static/homepage.html.erb +++ b/app/views/static/homepage.html.erb @@ -1,10 +1,18 @@ <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"><%= 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"> + <% if !signed_in? %> + <%= link_to 'Log In', new_session_path, :class => "btn btn-warning btn-lg", :role => "button" %> + <%= link_to 'Sign Up', new_user_path, :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> </div> |