From 02130572aa4dfa420d259b8a15cd26c88b538c45 Mon Sep 17 00:00:00 2001
From: Nathan Broadbent <nathan.f77@gmail.com>
Date: Wed, 29 Aug 2012 11:53:09 +1200
Subject: [PATCH] Show gravatar on users index table, and in heading bar of users show page

---
 app/assets/stylesheets/errbit.css       |  9 +++++++++
 app/helpers/errs_helper.rb              |  8 +++++---
 app/views/layouts/application.html.haml |  3 ++-
 app/views/users/index.html.haml         |  6 +++++-
 app/views/users/show.html.haml          |  6 +++++-
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/errbit.css b/app/assets/stylesheets/errbit.css
index 61aff8b..a4423f1 100644
--- a/app/assets/stylesheets/errbit.css
+++ b/app/assets/stylesheets/errbit.css
@@ -893,3 +893,12 @@ table.errs tr td.message .inline_comment em.commenter {
 
 .current.asc:after { content: ' ↑'; }
 .current.desc:after { content: ' ↓'; }
+
+
+table.users td {
+  vertical-align: middle;
+}
+table.users td img.gravatar {
+  vertical-align: middle;
+  margin-left: 3px;
+}
diff --git a/app/helpers/errs_helper.rb b/app/helpers/errs_helper.rb
index f6a0813..d87a088 100644
--- a/app/helpers/errs_helper.rb
+++ b/app/helpers/errs_helper.rb
@@ -15,15 +15,17 @@ module ErrsHelper
   end
 
   def gravatar_tag(email, options = {})
+    image_tag gravatar_url(email, options), :alt => email, :class => 'gravatar'
+  end
+
+  def gravatar_url(email, options = {})
     default_options = {
       :d => Errbit::Config.gravatar_default,
-      :alt => email,
-      :class => 'gravatar'
     }
     options.reverse_merge! default_options
     params = options.extract!(:s, :d).delete_if { |k, v| v.blank? }
     email_hash = Digest::MD5.hexdigest(email)
-    image_tag "http://www.gravatar.com/avatar/#{email_hash}?#{params.to_query}", options
+    "http://www.gravatar.com/avatar/#{email_hash}?#{params.to_query}"
   end
 end
 
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 8a6b127..a9d5e0f 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -18,7 +18,7 @@
         = render 'shared/navigation' if current_user
         = render 'shared/session'
     #content-wrapper
-      #content-title{ :class => (yield :title_css_class).to_s }
+      #content-title{ :class => (yield :title_css_class).to_s, :style => (yield :title_style) }
         %h1= yield :title
         %span.meta= yield :meta
         - if (action_bar = yield(:action_bar)).present?
@@ -33,3 +33,4 @@
     #footer= "Powered by #{link_to 'Errbit', 'http://github.com/errbit/errbit', :target => '_blank'}: the open source error catcher.".html_safe
     = yield :scripts
 
+= yield :before_title
\ No newline at end of file
diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
index 8f123f4..50102cd 100644
--- a/app/views/users/index.html.haml
+++ b/app/views/users/index.html.haml
@@ -2,9 +2,11 @@
 - content_for :action_bar do
   %span= link_to('Add a New User', new_user_path, :class => 'add')
 
-%table
+%table.users
   %thead
     %tr
+      - if Errbit::Config.use_gravatar
+        %th
       %th Name
       - if Errbit::Config.user_has_username
         %th Username
@@ -13,6 +15,8 @@
   %tbody
     - @users.each do |user|
       %tr
+        - if Errbit::Config.use_gravatar
+          %td= gravatar_tag user.email, :s => 24
         %td.nowrap= link_to user.name, user_path(user)
         - if Errbit::Config.user_has_username
           %td= user.username
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 5d8f8b5..ee1e941 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,11 +1,15 @@
 - content_for :title, @user.name
+- if Errbit::Config.use_gravatar
+  - content_for :title_style do
+    background: url('#{gravatar_url @user.email, :s => 86}') no-repeat;
+    padding-left: 106px;
+
 - content_for :action_bar do
   = render 'shared/link_github_account', :user => @user
   %span= link_to('Add a New User', new_user_path, :class => 'add')
   = link_to 'edit', edit_user_path(@user), :class => 'button'
   = link_to 'destroy', user_path(@user), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button'
 
-
 %table.single_user
   %tr
     %th Email
--
libgit2 0.21.2