diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:56:33 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:56:33 -0500 |
| commit | a1700f50ee800cfbfb93bd7dfff7b5d79ae2cb2f (patch) | |
| tree | c9db0b8bdd4818f5ce2ff982657e2aedfda98f8f /app/views/tournaments/index.html.erb | |
| parent | 706392b7c4520382ddd8f827b31205c6b71f5320 (diff) | |
| parent | 63830b0f939db5f6911218950525428420c4d467 (diff) | |
Merge branch 'master2'
Conflicts:
app/controllers/tournaments_controller.rb
app/models/tournament.rb
app/views/tournaments/_selected.html.erb
app/views/tournaments/new.html.erb
config/routes.rb
Diffstat (limited to 'app/views/tournaments/index.html.erb')
| -rw-r--r-- | app/views/tournaments/index.html.erb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index 3d54b8c..80d68a3 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -1,6 +1,7 @@ -<h1>Listing tournaments</h1> +<h1>Listing Tournaments</h1> -<table> +<% if @tournaments.length > 0 %> +<table class="table table-hover"> <thead> <tr> <th>Game</th> @@ -35,7 +36,9 @@ <% end %> </tbody> </table> - +<% else %> + <p class="no-entries"> No tournaments going on right now... Why not start your own? </p> +<% end %> <br> <%= link_to 'New Tournament', new_tournament_path, :class => "btn btn-warning btn-lg" %> |