diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-07 03:01:35 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-07 03:01:35 -0400 |
| commit | 78bdc2e525c52beff4f7fd0d390c3af87bef5257 (patch) | |
| tree | b8142dc9363fbf2efb711a1439ae2f7bee96e12e /app/views/matches | |
| parent | 29df65e51b2cb38e31b1c377c536e7bba1eecc90 (diff) | |
| parent | 55f1d11f66f216f0aff40fbe3ba90373339beb55 (diff) | |
Merged _selected.
Diffstat (limited to 'app/views/matches')
| -rw-r--r-- | app/views/matches/index.html.erb | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 742de14..78c97bb 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -38,7 +38,8 @@ <SVG version="1.1" baseProfile="full" width="100%" height="<%= @height = [@height, 500].max %>" - xmlns="http://www.w3.org/2000/svg"> + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink"> <% lastrx = 0 lastry = 0 lastrh = 0 @@ -60,8 +61,8 @@ <g id="svg-match-<%= i %>" onclick="redirect(<%= @matches[i-1].id %>)" cursor="pointer"> <rect height="<%= rh = 100/(2**(@depth-1)+1) - 5 %>%" width="<%= rw = 100/(@depth+1) - 5 %>%" - x="<%= rx = 50/(@depth+1) + 100/(@depth+1)*(@depth-(Math.log2(i).ceil+1)) %>%" - y="<%= ry = ( 100/(2**(Math.log2(i).floor+1))) %>%" + x="<%= rx = 50/(@depth+1) + 100/(@depth+1)*(@depth-(Math.log2(i).floor+1)) %>%" + y="<%= ry = ( 100/(2**(Math.log2(i).floor)+1) + rh * 1.1 * (2**Math.log2(i).ceil-i)) %>%" fill="url(#gradMatch)" rx="5px" stroke-width="2" @@ -81,16 +82,16 @@ stroke="grey" <% end %> /> - <rect width="<%= rw-5 %>%" height="<%= rh/4 %>%" x="<%= rx + 2.5 %>%" y="<%= ry + 4 %>%" fill="<%= @matches[i-1].teams.first and @matches[i-1].teams.first.users.include?(current_user) ? "#BCED91" : "white" %>" stroke="black" /> - <text x="<%= rx + rw/4 %>%" y="<%= ry + 10 %>%" font-size="<%= rh %>"> + <rect width="<%= rw-5 %>%" height="<%= rh/4 %>%" x="<%= rx + 2.5 %>%" y="<%= ry + rh/6 %>%" fill="<%= @matches[i-1].teams.first and @matches[i-1].teams.first.users.include?(current_user) ? "#BCED91" : "white" %>" stroke="black" /> + <text x="<%= rx + rw/4 %>%" y="<%= ry + rh/3 %>%" font-size="<%= rh %>"> <% if @matches[i-1].teams.first %> Team <%= @matches[i-1].teams.first.id %> <% end %> </text> - <text x="<%= rx + rw/2 - 2 %>%" y="<%= ry + 16 %>%" font-size="<%= rh %>"> VS </text> + <text x="<%= rx + 1.3*rw/3 %>%" y="<%= ry + 5.2*rh/9 %>%" font-size="<%= rh %>"> VS </text> - <rect width="<%= rw-5 %>%" height="<%= rh/4 %>%" x="<%= rx + 2.5 %>%" y="<%= ry + 17 %>%" fill="<%= @matches[i-1].teams[1] and @matches[i-1].teams[1].users.include?(current_user) ? "#BCED91" : "white" %>" stroke="black" /> - <text x="<%= rx + rw/4 %>%" y="<%= ry + 23 %>%" font-size="<%= rh %>"> + <rect width="<%= rw-5 %>%" height="<%= rh/4 %>%" x="<%= rx + 2.5 %>%" y="<%= ry + 3*rh/5 %>%" fill="<%= @matches[i-1].teams[1] and @matches[i-1].teams[1].users.include?(current_user) ? "#BCED91" : "white" %>" stroke="black" /> + <text x="<%= rx + rw/4 %>%" y="<%= ry + 4*rh/5 %>%" font-size="<%= rh %>"> <% if @matches[i-1].teams[1] %> Team <%= @matches[i-1].teams[1].id %> <% end %> @@ -98,10 +99,12 @@ <% if i > 1 %> <line x1="<%= rx+rw %>%" y1="<%= ry+rh/2 %>%" x2="<%= lastrx %>%" y2="<%= lastry+lastrh/2 %>%" stroke="black" stroke-width="2" > <% end %> - <% lastrx = rx - lastry = ry - lastrh = rh - lastrw = rw %> + <% if Math.log2(i+1) == Math.log2(i+1).ceil %> + <% lastrx = rx + lastry = ry + lastrh = rh + lastrw = rw %> + <% end %> </g> <% end %> |