diff options
| author | tkimia <tkimia@purdue.edu> | 2014-04-07 02:48:17 -0400 |
|---|---|---|
| committer | tkimia <tkimia@purdue.edu> | 2014-04-07 02:48:17 -0400 |
| commit | 55f1d11f66f216f0aff40fbe3ba90373339beb55 (patch) | |
| tree | 29cd9eff77bfd00f07d98cf69406afe64df2cfe3 | |
| parent | b7ddee6cc5255355e3f89833548917610760e5e8 (diff) | |
profiles updated
| -rw-r--r-- | app/views/matches/index.html.erb | 3 | ||||
| -rw-r--r-- | app/views/users/show.html.erb | 36 |
2 files changed, 32 insertions, 7 deletions
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index def97ba..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 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 %> |