diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-03 12:25:39 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-03 12:25:39 -0500 |
commit | 257ccb19453c1d609e724a29349d390e5978b739 (patch) | |
tree | 1b4ce40e8b624ee9169e9b481cb7774c0a8cdb46 /app/views/tournaments | |
parent | d6cd8be7b4b5453e93faf11858c3e888f23a8ed9 (diff) | |
parent | 764d9c06affc962428615b53574dbd5d3db62a7d (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/tournaments')
-rw-r--r-- | app/views/tournaments/index.html.erb | 8 | ||||
-rw-r--r-- | app/views/tournaments/new.html.erb | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index 8ab3c15..73b064e 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -1,9 +1,9 @@ <h1>Listing tournaments</h1> -<table class="table table-hover"> +<table> <thead> <tr> - <th>Game</th> + <th></th> <th></th> <th></th> <th></th> @@ -13,7 +13,7 @@ <tbody> <% @tournaments.each do |tournament| %> <tr> - <td><%= %></td> + <td><%= tournament.game %></td> <td><%= link_to 'Show', tournament %></td> <td><%= link_to 'Edit', edit_tournament_path(tournament) %></td> <td><%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' } %></td> @@ -24,4 +24,4 @@ <br> -<%= link_to 'New Tournament', new_tournament_path, :class => "btn btn-warning" %> +<%= link_to 'New Tournament', new_tournament_path %> diff --git a/app/views/tournaments/new.html.erb b/app/views/tournaments/new.html.erb new file mode 100644 index 0000000..de80fb7 --- /dev/null +++ b/app/views/tournaments/new.html.erb @@ -0,0 +1,12 @@ +<h1>New tournament</h1> + +<%= select_tag 'tournament_id', options_for_select(["Select a Game Type"] + Game.all.collect {|game| game.name}), :onchange => 'populate()' %> + +<br /> +<div id='ajax-form'> +</div> +<br /><br /> +<p id=jumbo-buttons> +<%= link_to 'Create Tournament', "create", :class => "btn btn-warning btn-lg", :role => "submit" %> + +<%= link_to 'Back', tournaments_path %> |