diff --git a/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee b/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee index 931927d0b..4a3c47903 100644 --- a/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee +++ b/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee @@ -49,7 +49,7 @@ class App.DashboardActivityStream extends App.Controller @html html # start user popups - @userPopups('right') + @userPopups('left') # update time @frontendTimeUpdate() diff --git a/app/assets/javascripts/app/controllers/_default_navbar.js.coffee b/app/assets/javascripts/app/controllers/_default_navbar.js.coffee index 7f257d9a2..0a7ed0f11 100644 --- a/app/assets/javascripts/app/controllers/_default_navbar.js.coffee +++ b/app/assets/javascripts/app/controllers/_default_navbar.js.coffee @@ -3,8 +3,9 @@ App.Config.set( 'User', { parent: '', callback: -> item = {} - item['name'] = App.Session.get( 'login' ) - item['image'] = App.Session.get( 'imageUrl' ) + item['name'] = App.Session.get( 'login' ) + item['image'] = App.Session.get( 'imageUrl' ) + item['avatar'] = App.User.fullLocal( App.Session.get('id') ).avatar() return item target: '#current_user', class: 'user' diff --git a/app/assets/javascripts/app/models/user.js.coffee b/app/assets/javascripts/app/models/user.js.coffee index d80d49d0d..54346870a 100644 --- a/app/assets/javascripts/app/models/user.js.coffee +++ b/app/assets/javascripts/app/models/user.js.coffee @@ -36,6 +36,28 @@ class App.User extends App.Model icon: (user) -> "user icon" + initials: -> + @firstname[0] + @lastname[0] + + avatar: (big = false, placement = '', cssClass = '') -> + if big + cssClass = ' big' + if placement + placement = "data-placement=\"#{placement}\"" + + if @image is 'none' + width = 300 + height = 226 + size = if big then 50 else 40 + + rng = new Math.seedrandom(@id) + x = rng() * (width - size) + y = rng() * (height - size) + + "#{ @initials() }" + else + "" + @_fillUp: (data) -> # set socal media links diff --git a/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco b/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco index 1b44962e8..b9cc85b36 100644 --- a/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco +++ b/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco @@ -1,8 +1,8 @@

<%- @T( @head ) %>

<% for item in @items: %>
- - + + <%- item.created_by.avatar() %> diff --git a/app/assets/javascripts/app/views/navigation/personal.jst.eco b/app/assets/javascripts/app/views/navigation/personal.jst.eco index 9abfd83e1..eb2f03061 100644 --- a/app/assets/javascripts/app/views/navigation/personal.jst.eco +++ b/app/assets/javascripts/app/views/navigation/personal.jst.eco @@ -4,7 +4,7 @@ <% if item.class is 'user': %> - + <%- item.avatar %> <% else: %> diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco index f6f10d874..c09dbb990 100644 --- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco @@ -4,7 +4,7 @@