diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 20:44:43 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 20:44:43 -0400 |
| commit | 38d6960be1efdb6345445ab293a8cd605193785f (patch) | |
| tree | df37e79b5744b570aded5aa4d7fe38cd772a49fe /app/views/matches/index.html.erb | |
| parent | bcfa571b0328a4b3e94479a31c027621ceb86ad5 (diff) | |
| parent | d14dcf9af11a0f2eab2609efb7d9e59a9cc18bb0 (diff) | |
Merge branch 'master' into luke
Conflicts:
app/controllers/application_controller.rb
app/controllers/tournaments_controller.rb
Diffstat (limited to 'app/views/matches/index.html.erb')
| -rw-r--r-- | app/views/matches/index.html.erb | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 0f86da6..d4ddb0e 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -1,35 +1,30 @@ -<h1><%= @tournament.name %> Matches</h1> +<h1><%= @tournament.name %> - Matches</h1> -<!-- -<table> + +<table class="table"> <thead> <tr> <th>Status</th> - <th>Tournament</th> <th>Name</th> <th>Winner</th> - <th>Remote</th> - <th></th> - <th></th> <th></th> </tr> </thead> - <tbody> + <tbody class="table-hover"> <% @tournament.matches.each do |match| %> <tr> - <td><%= match.tournament.id %></td> <td><%= match.status %></td> - <td><%= match.tournament %></td> + <td><%= match.id%></td> <td><%= match.name %></td> - <td><%= match.winner %></td> + <td><%= link_to "Show", tournament_match_path(@tournament, match) %> </tr> <% end %> </tbody> </table> <br> ---> + <SVG version="1.1" baseProfile="full" @@ -37,7 +32,8 @@ xmlns="http://www.w3.org/2000/svg"> <% (1..@matches.count).each do |i| %> - <g class="svg-match" > + <g class="svg-match"> + <rect rx="10" </g> <% end %> |