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

Moved to real avatar images.

Browse source
This commit is contained in:
Martin Edenhofer 2014-07-24 02:19:54 +02:00
parent 43ac0e2872
commit 01882851d9
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee
View file

@ -54,7 +54,7 @@ class App.DashboardActivityStream extends App.Controller
item.title = object.displayName() item.title = object.displayName()
item.object_name = object.objectDisplayName() 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')( html = App.view('dashboard/activity_stream')(
head: 'Activity Stream', head: 'Activity Stream',

1
app/assets/javascripts/app/controllers/_default_navbar.js.coffee
View file

@ -4,6 +4,7 @@ App.Config.set( 'User', {
callback: -> callback: ->
item = {} item = {}
item['name'] = App.Session.get( 'login' ) item['name'] = App.Session.get( 'login' )
item['image'] = App.Session.get( 'image' )
return item return item
target: '#current_user', target: '#current_user',
class: 'user' class: 'user'

2
app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco
View file

@ -1,7 +1,7 @@
<h2 class="can-move"><%- @T( @head ) %></h2> <h2 class="can-move"><%- @T( @head ) %></h2>
<% for item in @items: %> <% for item in @items: %>
<div class="level-1 activity-entry horizontal"> <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-body flex horizontal">
<div class="activity-message flex"> <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> <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>

2
app/assets/javascripts/app/views/navigation.jst.eco
View file

@ -48,7 +48,7 @@
<a class="list-button horizontal centered dropdown-toggle" data-toggle="dropdown" href="<%= item.target %>" title="<%- @T( item.name ) %>"> <a class="list-button horizontal centered dropdown-toggle" data-toggle="dropdown" href="<%= item.target %>" title="<%- @T( item.name ) %>">
<span class="dropdown-nose"></span> <span class="dropdown-nose"></span>
<% if item.class is 'user': %> <% 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: %> <% else: %>
<span class="green plus icon"></span> <span class="green plus icon"></span>
<span class="white plus icon"></span> <span class="white plus icon"></span>