diff options
| author | shumakl <shumakl@purdue.edu> | 2014-04-03 12:14:48 -0400 |
|---|---|---|
| committer | shumakl <shumakl@purdue.edu> | 2014-04-03 12:14:48 -0400 |
| commit | 8d5325cd6019b784ba2da66d19c41daaadbc19e0 (patch) | |
| tree | d00f3c4d5bcbfe5f5ef48105ee48cb02c80704f9 | |
| parent | c0b705f1397ce442427638f92b185d630db73ec5 (diff) | |
do things to avoid merge conflicts with clean2
| -rw-r--r-- | app/views/tournaments/show.html.erb | 81 |
1 files changed, 39 insertions, 42 deletions
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index 7bdbdc0..1ebf4c5 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -11,45 +11,45 @@ <span id="tournament-side-params"> +<p> + <strong>Status:</strong> + <% if @tournament.status == 0 %> + Waiting for players... + <% else %> + Started + <% end %> +</p> + +<p> + <strong>Min players per team:</strong> + <%= @tournament.min_players_per_team %> +</p> + +<p> + <strong>Max players per team:</strong> + <%= @tournament.max_players_per_team %> +</p> + +<p> + <strong>Min teams per match:</strong> + <%= @tournament.min_teams_per_match %> +</p> + +<p> + <strong>Max teams per match:</strong> + <%= @tournament.max_teams_per_match %> +</p> + +<p> + <strong>Set rounds:</strong> + <%= @tournament.set_rounds %> +</p> + +<p> + <strong>Randomized teams:</strong> + <%= @tournament.randomized_teams %> +</p> - <p> - <strong>Status:</strong> - <% if @tournament.status == 0 %> - Waiting for players... - <% else %> - Started - <% end %> - </p> - - <p> - <strong>Min players per team:</strong> - <%= @tournament.min_players_per_team %> - </p> - - <p> - <strong>Max players per team:</strong> - <%= @tournament.max_players_per_team %> - </p> - - <p> - <strong>Min teams per match:</strong> - <%= @tournament.min_teams_per_match %> - </p> - - <p> - <strong>Max teams per match:</strong> - <%= @tournament.max_teams_per_match %> - </p> - - <p> - <strong>Set rounds:</strong> - <%= @tournament.set_rounds %> - </p> - - <p> - <strong>Randomized teams:</strong> - <%= @tournament.randomized_teams %> - </p> </span> <div > @@ -120,7 +120,4 @@ function donehandle( tournament ) { $.ajax({url: "<%= url_for @tournament %>.json"}) .done(donehandle); - - - -</script>
\ No newline at end of file +</script> |