diff options
author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-23 13:19:56 -0400 |
---|---|---|
committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-23 13:19:56 -0400 |
commit | 9d6dc1e5959590eeca5f9ea19cf731d73c735bd6 (patch) | |
tree | fd135e0f543a7f78388c91992fcfa85b5b7564dd /app/views/matches | |
parent | b2ceff6667461a6db587c4077ef56bdb4fe9f44b (diff) | |
parent | 21d6ddb3b2e85fa24f331dbf547133a34b0d37bd (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/matches')
-rw-r--r-- | app/views/matches/index.html.erb | 20 | ||||
-rw-r--r-- | app/views/matches/show.html.erb | 28 |
2 files changed, 24 insertions, 24 deletions
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index fda8582..8a50fee 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -2,16 +2,16 @@ <table id="matches-table" class="table"> - <thead> - <tr> - <th>Name</th> - <th>Status</th> - <th>Winner</th> - <th></th> - </tr> - </thead> - - <tbody class="table-hover"> + <thead> + <tr> + <th>Name</th> + <th>Status</th> + <th>Winner</th> + <th><!-- link to --></th> + <th><!-- start button --></th> + </tr> + </thead> + <tbody> <% @tournament.stages_ordered.keys.sort.each do |stage_key| %> <% stage = @tournament.stages_ordered[stage_key] %> <% stage.matches_ordered.keys.sort.reverse.each do |match_key| %><tr> diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index a10139f..e61d6b3 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -1,3 +1,17 @@ +<script type="text/javascript"> +function score_peers() { + //get each player in order and assign score here! + var $lisp = $('ol#boxes'); + var comma = "," + for(var i=0; i < $lisp.length; i++) { + if ( i == lisp.length-1) { + comma = ""; + } + $('review_action').value += $('ol#boxes:eq(' + i + ')').text() + comma; + } +} +</script> + <p> <strong>Status:</strong> <%= @match.status %> @@ -113,17 +127,3 @@ <% end # case %> <% end # form %> </div> - -<script type="text/javascript"> -function score_peers() { - //get each player in order and assign score here! - var $lisp = $('ol#boxes'); - var comma = "," - for(var i=0; i < $lisp.length; i++) { - if ( i == lisp.length-1) { - comma = ""; - } - $('review_action').value += $('ol#boxes:eq(' + i + ')').text() + comma; - } -} -</script> |