From 12b9f96b4003ec384e1583e4d6d53fcb8d5f960c Mon Sep 17 00:00:00 2001 From: nfoy Date: Sun, 27 Apr 2014 20:51:49 -0400 Subject: More tournament index stuff. --- app/assets/images/hearthstone.png | Bin 0 -> 10229 bytes app/assets/images/rock_paper_scissors.png | Bin 0 -> 4951 bytes app/assets/images/rock_paper_scissors.svg | 108 +++++++++++++++++++++++++++++ app/views/common/_show_tournament.html.erb | 6 +- app/views/users/index.html.erb | 2 +- app/views/users/show.html.erb | 2 +- 6 files changed, 113 insertions(+), 5 deletions(-) create mode 100644 app/assets/images/hearthstone.png create mode 100644 app/assets/images/rock_paper_scissors.png create mode 100644 app/assets/images/rock_paper_scissors.svg diff --git a/app/assets/images/hearthstone.png b/app/assets/images/hearthstone.png new file mode 100644 index 0000000..15d20b4 Binary files /dev/null and b/app/assets/images/hearthstone.png differ diff --git a/app/assets/images/rock_paper_scissors.png b/app/assets/images/rock_paper_scissors.png new file mode 100644 index 0000000..294916c Binary files /dev/null and b/app/assets/images/rock_paper_scissors.png differ diff --git a/app/assets/images/rock_paper_scissors.svg b/app/assets/images/rock_paper_scissors.svg new file mode 100644 index 0000000..67bb6bd --- /dev/null +++ b/app/assets/images/rock_paper_scissors.svg @@ -0,0 +1,108 @@ + + + Rock Scissors Paper + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + Rock Scissors Paper + 2010-05-31T17:54:35 + Rock Scissors Paper hand game depiction. Rock, scissors, and paper by Francesco 'Architetto' Rollandin from openclipart.org + http://openclipart.org/detail/63805/rock-scissors-paper-by-mazeo + + + mazeo + + + + + clip art + clipart + fingers + fist + hand + hands + paper + paper rock scissors + paper scissors rock + remix + rock + rock paper scissors + rock scissors paper + scissor + scissors + scissors paper rock + scissors rock paper + + + + + + + + + + + diff --git a/app/views/common/_show_tournament.html.erb b/app/views/common/_show_tournament.html.erb index 280d59d..a1d01d2 100644 --- a/app/views/common/_show_tournament.html.erb +++ b/app/views/common/_show_tournament.html.erb @@ -1,6 +1,6 @@
- <%= image_tag(target.game.name.downcase.tr(" ", "_") + ".png", class: "t-image") %> + <%= image_tag(target.game.name.downcase.tr(" ", "_").tr(",", "") + ".png", class: "t-image") %>

<%= Game.find(target.game_id).name %>

@@ -8,8 +8,8 @@ <%= link_to(target) do %>

<%= target.name %>

<% end %>
- Hosted by: <%= target.hosts.first.name %> - <%= image_tag('http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(target.hosts.first.email) + '?s=45&d=identicon', class: "t-image") %> + <%= image_tag('http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(target.hosts.first.email) + '?s=45&d=identicon') %> + <%= target.hosts.first.name %>'s tournament

Players per team: <%= target.min_players_per_team %>

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 89e369a..e4251cd 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -16,7 +16,7 @@ <% @users.each do |user| %> - <%= link_to("#{user.user_name}", user, nil) %> + <%= image_tag('http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(user.email) + '?s=30&d=identicon') %> <%= link_to("#{user.user_name}", user, nil) %> <%= user.name %> ******* <%= user.user_name %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index b408589..b247b7d 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -54,4 +54,4 @@
<%= link_to 'Edit', edit_user_path(@user) %> | -<%= link_to 'Users', users_path %> +<%= link_to 'All Users', users_path %> -- cgit v1.2.3