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

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2015-01-12 08:29:02 +01:00
commit d65fcc87fe
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/app/controllers/widget/online_notification.js.coffee
View file

@ -75,15 +75,12 @@ class App.OnlineNotificationWidget extends App.Controller
App.i18n.translateInline( 'Notifications' ) + " <span>#{counter}</span>" App.i18n.translateInline( 'Notifications' ) + " <span>#{counter}</span>"
content: => content: =>
# insert data # insert data
html = $( App.view('widget/online_notification')( $( App.view('widget/online_notification')(items: items))
items: items
))
html.on('click', (e) =>
e.preventDefault()
@markAllAsSeen(items)
)
).on('shown.bs.popover', => ).on('shown.bs.popover', =>
# show frontend times # show frontend times
$('#markAllAsSeen').bind('click', (e) =>
@markAllAsSeen(items)
);
@frontendTimeUpdate() @frontendTimeUpdate()
) )

2
app/assets/javascripts/app/views/widget/online_notification.jst.eco
View file

@ -1,5 +1,5 @@
<% if @items.length: %> <% if @items.length: %>
<a href="#"><%- @T( 'Mark all as seen.' ) %></a> <a href="#" id="markAllAsSeen"><%- @T( 'Mark all as seen.' ) %></a>
<% for item in @items: %> <% for item in @items: %>
<div class="activity-entry horizontal"> <div class="activity-entry horizontal">
<a class="activity-avatar user-popover" data-id="<%= item.created_by_id %>" href="<%- item.created_by.uiUrl() %>"> <a class="activity-avatar user-popover" data-id="<%= item.created_by_id %>" href="<%- item.created_by.uiUrl() %>">