diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-06 22:20:28 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-06 22:20:28 -0400 |
| commit | bf798e57a760b68c3c7460789cef6389141c067d (patch) | |
| tree | 16cd7400b7f289b4aa6ec90e253c4d30d7a1a08c /app/views/tournaments | |
| parent | 91fee659eadaf6bcc4d063fd5645950da1250896 (diff) | |
| parent | 628173fce3de8f5d3e31109b3aa7c964fdab38ca (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 | 14 | ||||
| -rw-r--r-- | app/views/tournaments/show.html.erb | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index e174de7..72eacba 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -15,13 +15,17 @@ <h3><%= t.name %></h3> <% end %> - <div class="row"> + <div class="row" style="margin-left:2%;"> <div class="col-md-4 host"> Hosted by: <%= t.hosts.first.name %> </div> - <div class="col-md-8 things"> - <p> Players per team </p> - <p> two </p> + <div class="col-md-4 things"> + <p> Players per team: <%= t.min_players_per_team %></p> + <p> Players signed up: <%= t.players.count %> </p> + </div> + <div class="col-md-4 things"> + <p> <%= (t.randomized_teams)? "Teams are Random" : "Teams are Chosen" %></p> + <p> Players signed up: <%= t.players.count %> </p> </div> </div> @@ -36,7 +40,7 @@ <%= submit_tag("Join") %> <% end %> <% else %> - <p> You've signed up for this tournament! </p> + <p style="margin-top:10px;"> You've signed up for this tournament! </p> <% end %> </div> diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index b654804..e80e0e8 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -66,13 +66,13 @@ <% if @tournament.joinable_by?(current_user) && !@tournament.players.include?(current_user) %> <%= form_tag(tournament_path(@tournament), method: "put") do %> <input type="hidden" name="update_action" value="join"> - <%= submit_tag("Join Tournamnet") %> + <%= submit_tag("Join Tournament") %> <% end %> <% elsif @tournament.players.include?(current_user) %> <%= form_tag(tournament_path(@tournament), method: "put") do %> <input type="hidden" name="update_action" value="leave"> - <%= submit_tag("Leave Tournamnet") %> + <%= submit_tag("Leave Tournament") %> <% end %> <% end %> |