diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-02-28 14:26:26 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-02-28 14:26:26 +0100 |
| commit | ad5ae3f60e5e0745912bfbc0926f6cf8bc6e9eb4 (patch) | |
| tree | 628535474e7f446869cab55f8cdcde56798229be /app/views | |
| parent | 2825991e09272d6e7227da9d9b8dc387614a83df (diff) | |
Update profile information and download avatar of remote accounts
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/atom/user_stream.xml.ruby | 3 | ||||
| -rw-r--r-- | app/views/profile/_status_footer.html.haml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/atom/user_stream.xml.ruby b/app/views/atom/user_stream.xml.ruby index d7e0d5843..00b2cdc14 100644 --- a/app/views/atom/user_stream.xml.ruby +++ b/app/views/atom/user_stream.xml.ruby @@ -4,12 +4,13 @@ Nokogiri::XML::Builder.new do |xml| title xml, @account.display_name subtitle xml, @account.note updated_at xml, stream_updated_at + logo xml, asset_url(@account.avatar.url(:medium)) author(xml) do include_author xml, @account end - link_alternate xml, profile_url(name: @account.username) + link_alternate xml, profile_url(@account) link_self xml, atom_user_stream_url(id: @account.id) link_hub xml, HUB_URL link_salmon xml, salmon_url(@account) diff --git a/app/views/profile/_status_footer.html.haml b/app/views/profile/_status_footer.html.haml index 817d19a68..59197f26a 100644 --- a/app/views/profile/_status_footer.html.haml +++ b/app/views/profile/_status_footer.html.haml @@ -7,4 +7,4 @@ %span.num= status.favourites.count - if status.reply? - = link_to 'View conversation', status_url(status.thread), class: 'conversation-link' + = link_to "In response to #{status.thread.account.acct}", status_url(status.thread), class: 'conversation-link' |