From 8d88baa0402ecc8f3c92e880617dbb67514ba5b8 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Wed, 27 Aug 2014 02:55:42 +0200
Subject: [PATCH] Re-enabled user popovers.

---
 .../app/controllers/_application_controller.js.coffee      | 2 +-
 .../javascripts/app/views/ticket_zoom/article_view.jst.eco | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee
index 17b73780a..a180860fb 100644
--- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee
@@ -235,7 +235,7 @@ class App.Controller extends Spine.Controller
         )
     )
 
-  userPopups: (position = 'right') ->
+  userPopups: (position) ->
 
     # remove old popovers
     $('.popover').remove()
diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
index af59eb8b2..92910a4e4 100644
--- a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
@@ -31,9 +31,8 @@
     </div>
   </div>
 
-
   <div class="article-content horizontal<%= ' reverse' if article.sender.name isnt 'Agent' %>">
-    <div class="avatar" style="background-image: url(<%= article.created_by.imageUrl %>)"></div>
+    <div class="avatar user-popover" data-placement="<% if article.sender.name isnt 'Agent': %>left<% else: %>right<% end %>" data-id="<%= article.created_by_id %>" style="background-image: url(<%= article.created_by.imageUrl %>)"></div>
     <div class="flex text-bubble <%= ' internal' if article.internal is true %>"><div class="bubble-arrow"></div><%- article.html %></div>
   </div>
 
@@ -57,7 +56,7 @@
       <% end %>
       </div>
     <% end %>
-    
+
     <% if article.actions: %>
     <div class="article-actions horizontal stretch">
       <% for action in article.actions: %>
@@ -72,4 +71,4 @@
 
   <small class="task-subline"><time class="humanTimeFromNow" datetime="<%- article.created_at %>" data-time="<%- article.created_at %>">?</time></small>
 </div>
-<% end %>
+<% end %>
\ No newline at end of file