diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 19:51:46 -0500 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 19:51:46 -0500 |
| commit | d73a82b74685df29eb37c1a8b250951827dc164b (patch) | |
| tree | e9fc3e56cc60e4262f4870e834b7dbc5f13e31d2 /app/views/tournaments/new.html.erb | |
| parent | 7ea754bef9e07405a86ce3fc9b0597fef3c1aa35 (diff) | |
| parent | 6db29eb669a85e5b0aac7a1e8879781a1cb77772 (diff) | |
I REALLY hope I'm not overwriting anything
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/custom.css.scss
Diffstat (limited to 'app/views/tournaments/new.html.erb')
| -rw-r--r-- | app/views/tournaments/new.html.erb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/views/tournaments/new.html.erb b/app/views/tournaments/new.html.erb index f1dec90..a6dfa4d 100644 --- a/app/views/tournaments/new.html.erb +++ b/app/views/tournaments/new.html.erb @@ -1,11 +1,19 @@ +<%= javascript_include_tag :defaults %> + <h1>New tournament</h1> -<%= select_tag 'tournament_id', options_for_select(["Select a Game Type"] + Game.all.collect {|game| game.name}), :onchange => 'populate()' %> +<%= select_tag 'tournament_id', options_for_select(["Select a Game Type"] + Game.all.collect {|game| game.name}), :onchange => 'populate()' %> <%= link_to 'Select', 'new?game=1', :class => "btn btn-warning btn-lg" %> + + <br /> <div id='ajax-form'> - <% render :partial => "selected" %> + <% if not @game.nil? %> + <%= render 'selected' %> + <% end %> </div> <br /><br /> +<%= link_to 'Select', 'selected', :class => "btn btn-warning btn-lg" %> + <%= link_to 'Back', tournaments_path %> |