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/_selected.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/_selected.html.erb')
-rw-r--r-- | app/views/tournaments/_selected.html.erb | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb index 302283d..3b14404 100644 --- a/app/views/tournaments/_selected.html.erb +++ b/app/views/tournaments/_selected.html.erb @@ -1,25 +1,5 @@ -<form accept-charset="UTF-8" action="/users" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /><input name="authenticity_token" type="hidden" value="6WQoPLFISlDYCsi4LhAgT0hgrht19yydD3w5TlKfb7I=" /></div> - <p> - <label for="GameType">Game</label><br> - <input id="GameType" name="League of Legends" type="text" /> - </p> - <p> - <label for="players_per_team">Number of Players</label><br> - <input id="players_per_team" name="5" type="text" /> - </p> - <p> - <label for="teams_per_match">Teams per Match</label><br> - <input id="teams_per_match" name="2" type="text" /> - </p> - <p> - <label for="set_rounds">Set Number of Rounds?</label><br> - <input id="set_rounds" name="1" type="text" /> - </p> - <p> - <label for="randomized_teams">Randomized Teams?</label><br> - <input id="randomized_teams" name="0" type="text" /> - </p> - <p> - <input name="create" type="submit" value="Create Tournament" /> - </p> -</form>
\ No newline at end of file + + <%= content_tag(:p, "Hello World") %> + + +<%= tag(:label, for: 'GameType') %>
\ No newline at end of file |