diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-27 20:13:23 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-27 20:13:23 -0400 |
| commit | 8891daf9f1b38dadd5d5873fd3703d246876cabc (patch) | |
| tree | 8c8312aebc4118379656e0d9531fd065f3f67a6c | |
| parent | 70690fe168e88ad54be83e7a1ac45bdc32f1a54a (diff) | |
| parent | 95542d38ddae5700e7fa35c166260a51ce17e46a (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
| -rw-r--r-- | app/assets/images/chess.png (renamed from app/assets/images/chess_icon.png) | bin | 893 -> 893 bytes | |||
| -rw-r--r-- | app/assets/images/league_icon.gif | bin | 8207 -> 0 bytes | |||
| -rw-r--r-- | app/assets/images/league_of_legends.png | bin | 0 -> 10078 bytes | |||
| -rw-r--r-- | app/views/common/_show_tournament.html.erb | 4 | ||||
| -rw-r--r-- | app/views/users/show.html.erb | 2 |
5 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/images/chess_icon.png b/app/assets/images/chess.png Binary files differindex 6bcffe6..6bcffe6 100644 --- a/app/assets/images/chess_icon.png +++ b/app/assets/images/chess.png diff --git a/app/assets/images/league_icon.gif b/app/assets/images/league_icon.gif Binary files differdeleted file mode 100644 index 1f0fa43..0000000 --- a/app/assets/images/league_icon.gif +++ /dev/null diff --git a/app/assets/images/league_of_legends.png b/app/assets/images/league_of_legends.png Binary files differnew file mode 100644 index 0000000..9a78047 --- /dev/null +++ b/app/assets/images/league_of_legends.png diff --git a/app/views/common/_show_tournament.html.erb b/app/views/common/_show_tournament.html.erb index a9569b6..280d59d 100644 --- a/app/views/common/_show_tournament.html.erb +++ b/app/views/common/_show_tournament.html.erb @@ -1,5 +1,6 @@ <div class="row tournament-listing"> - <div class="col-md-2 col-sm-3 col-xs-6"><%= image_tag('http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(target.hosts.first.email) + '?s=100&d=mm', class: "t-image") %> + <div class="col-md-2 col-sm-3 col-xs-6"> + <%= image_tag(target.game.name.downcase.tr(" ", "_") + ".png", class: "t-image") %> <p class="t-game"> <%= Game.find(target.game_id).name %></p> </div> <div class="col-md-8 col-sm-7 col-xs-6"> @@ -8,6 +9,7 @@ <div class="row" style="margin-left:2%;"> <div class="col-md-4 host"> 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") %> </div> <div class="col-md-4 things"> <p> Players per team: <%= target.min_players_per_team %></p> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index a67aed9..b408589 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -2,7 +2,7 @@ <h1> <%= @user.user_name %>'s Profile </h1> <p> - <%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(@user.email) + '?s=100&d=mm' %> + <%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(@user.email) + '?s=100&d=identicon' %> </p> <p> |
