Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Re-enabled user popovers.

Browse source
This commit is contained in:
Martin Edenhofer 2014-08-27 02:55:42 +02:00
parent 6005f9484a
commit 8d88baa040
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/_application_controller.js.coffee
View file

@ -235,7 +235,7 @@ class App.Controller extends Spine.Controller
)
)
userPopups: (position = 'right') ->
userPopups: (position) ->
# remove old popovers
$('.popover').remove()

7
app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
View file

@ -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 %>