From 01882851d9b7ad71286823a90c9fad8b532159a0 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Thu, 24 Jul 2014 02:19:54 +0200
Subject: [PATCH] Moved to real avatar images.

---
 .../app/controllers/_dashboard/activity_stream.js.coffee        | 2 +-
 .../javascripts/app/controllers/_default_navbar.js.coffee       | 1 +
 .../javascripts/app/views/dashboard/activity_stream.jst.eco     | 2 +-
 app/assets/javascripts/app/views/navigation.jst.eco             | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

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 2fa6576c8..8c6aafb9e 100644
--- a/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee
+++ b/app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee
@@ -54,7 +54,7 @@ class App.DashboardActivityStream extends App.Controller
         item.title       = object.displayName()
         item.object_name = object.objectDisplayName()
 
-      item.created_by = App.User.find( item.created_by_id )
+      item.created_by = App.User.retrieve( item.created_by_id )
 
     html = App.view('dashboard/activity_stream')(
       head: 'Activity Stream',
diff --git a/app/assets/javascripts/app/controllers/_default_navbar.js.coffee b/app/assets/javascripts/app/controllers/_default_navbar.js.coffee
index 1f0d1d39d..72391f094 100644
--- a/app/assets/javascripts/app/controllers/_default_navbar.js.coffee
+++ b/app/assets/javascripts/app/controllers/_default_navbar.js.coffee
@@ -4,6 +4,7 @@ App.Config.set( 'User', {
   callback: ->
     item = {}
     item['name'] = App.Session.get( 'login' )
+    item['image'] = App.Session.get( 'image' )
     return item
   target: '#current_user',
   class:  'user'
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 4683ac703..56283d4c6 100644
--- a/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco
+++ b/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco
@@ -1,7 +1,7 @@
 <h2 class="can-move"><%- @T( @head ) %></h2>
 <% for item in @items: %>
 <div class="level-1 activity-entry horizontal">
-  <div class="avatar" style="background-image: url(https://pbs.twimg.com/profile_images/3510491848/156dbaec406561cb3e680dc3795b0f86.jpeg)"></div>
+  <div class="avatar" style="background-image: url(<%- item.created_by.image %>)"></div>
   <div class="activity-body flex horizontal">
     <div class="activity-message flex">
       <span class="user-popover" data-id="<%= item.created_by_id %>"><%= item.created_by.displayName() %></span> <%- @T( item.type ) %> <a href="<%- item.link %>"><%= item.object_name %><% if item.title: %> (<%= item.title %>)<% end %></a>
diff --git a/app/assets/javascripts/app/views/navigation.jst.eco b/app/assets/javascripts/app/views/navigation.jst.eco
index c49a708d5..c54b4c7b0 100644
--- a/app/assets/javascripts/app/views/navigation.jst.eco
+++ b/app/assets/javascripts/app/views/navigation.jst.eco
@@ -48,7 +48,7 @@
         <a class="list-button horizontal centered dropdown-toggle" data-toggle="dropdown" href="<%= item.target %>" title="<%- @T( item.name ) %>">
           <span class="dropdown-nose"></span>
           <% if item.class is 'user': %>
-            <span class="user avatar" style="background-image: url(https://pbs.twimg.com/profile_images/3510491848/156dbaec406561cb3e680dc3795b0f86.jpeg)"></span>
+            <span class="user avatar" style="background-image: url(<%- item.image %>)"></span>
           <% else: %>
             <span class="green plus icon"></span>
             <span class="white plus icon"></span>