Merged _selected.

3 files changed, 47 insertions, 20 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 %>
diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb
index 1be1adf..c0f8367 100644
--- a/app/views/tournaments/_selected.html.erb
+++ b/app/views/tournaments/_selected.html.erb
@@ -23,9 +23,9 @@
         <% when 0 %>
            <%= setting_fields.text_field( setting.name, :name ) %>
         <% when 1 %>
-           <%#setting_fields.text_area( setting.name, setting.name ) %>
+           <%# setting_fields.text_area( setting.name, setting.name ) %>
         <% when 2 %>
-           <%#setting_fields.collection_radio_buttons( setting.name, setting.type_opt.split(',') ) %>
+           <%# setting_fields.collection_radio_buttons( setting.name, setting.type_opt.split(',') ) %>
         <% when 3 %>
            <%= setting_fields.collection_check_boxes( setting.name, setting.type_opt.split(',') ) %>
         <% when 4 %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 7bda009..c2b5c75 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,10 +1,8 @@
-<p>
-  <%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(@user.email) + '?s=100&d=mm' %>
-</p>
+
+<h1> <%= @user.user_name %>'s Profile </h1>
 
 <p>
-  <strong>Name:</strong>
-  <%= @user.name %>
+  <%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(@user.email) + '?s=100&d=mm' %>
 </p>
 
 <p>
@@ -13,9 +11,35 @@
 </p>
 
 <p>
-  <strong>User name:</strong>
+  <strong>Preferred name:</strong>
   <%= @user.user_name %>
 </p>
 
+<p>
+  <strong>Relationship Status:</strong>
+  too single
+</p>
+
+<div class="row">
+	<div class="col-md-6">
+	  	<h3> Recent Tournaments Players </h3>
+		<ul>
+			<% @user.tournaments_played.each do |t| %>
+				<li><%= t.name %></li>
+			<% end %>
+		</ul>
+	  </div>
+    <div class="col-md-6">
+    	<h3> Recent Tournaments Hosted </h3>
+    	<% if  @user.tournaments_hosted.count == 0 %> <p> <%= @user.user_name %> has never hosted a tournament </p> <%end %>
+		<ul>
+			<% @user.tournaments_hosted.each do |t| %>
+				<li><%= t.name %></li>
+			<% end %>
+		</ul>
+	  </div>
+    </div>
+</div>
+
 <%= link_to 'Edit', edit_user_path(@user) %> |
 <%= link_to 'Users', users_path %>