nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
danielgrippi 2012-02-10 15:18:49 -08:00
commit b866d9356a
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/post.rb
View file

@ -72,6 +72,7 @@ class Post < ActiveRecord::Base
def raw_message; ""; end def raw_message; ""; end
def mentioned_people; []; end def mentioned_people; []; end
def photos; []; end
def self.excluding_blocks(user) def self.excluding_blocks(user)
people = user.blocks.map{|b| b.person_id} people = user.blocks.map{|b| b.person_id}

2
public/javascripts/app/templates/likes-info.handlebars
View file

@ -2,7 +2,7 @@
<div class="comment"> <div class="comment">
<div class="media"> <div class="media">
<span class="img"> <span class="img">
<img alt="Heart" src="/images/icons/pin.png" /> <img alt="Heart" src="{{imageUrl "/images/icons/pin.png"}}" />
</span> </span>
<div class="bd"> <div class="bd">

6
public/javascripts/app/templates/stream-element.handlebars
View file

@ -4,14 +4,14 @@
<div class="controls"> <div class="controls">
{{#if authorIsCurrentUser}} {{#if authorIsCurrentUser}}
<a href="#" rel=nofollow> <a href="#" rel=nofollow>
<img src="/images/icons/ignoreuser.png" alt="Ignoreuser" class="block_user control_icon" title="{{t "ignore"}}" /> <img src="{{imageUrl "/images/icons/ignoreuser.png"}}"" alt="Ignoreuser" class="block_user control_icon" title="{{t "ignore"}}" />
</a> </a>
<a href="#" rel=nofollow> <a href="#" rel=nofollow>
<img src="/images/deletelabel.png" class="delete control_icon hide_post" title="{{t "stream.hide"}}" /> <img src="{{imageUrl"/images/deletelabel.png"}}" class="delete control_icon hide_post" title="{{t "stream.hide"}}" />
</a> </a>
{{else}} {{else}}
<a href="#" rel=nofollow> <a href="#" rel=nofollow>
<img src="/images/deletelabel.png" class="delete control_icon remove_post" title="{{t "delete"}}" /> <img src="{{imageUrl "/images/deletelabel.png"}}" class="delete control_icon remove_post" title="{{t "delete"}}" />
</a> </a>
{{/if}} {{/if}}
</div> </div>