diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-02-28 15:46:29 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-02-28 15:46:29 +0100 |
| commit | 47d50b0e3967f1d396bdbe8ea3e8909ce2be599f (patch) | |
| tree | 07b076154cbe66f2d1a31dbb9662892fb24c8156 /app/views | |
| parent | f1654da7ad11920979d335798cfeef2e88118c1b (diff) | |
A lot of fixes from a live test
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/profile/_favourite.html.haml | 5 | ||||
| -rw-r--r-- | app/views/profile/_follow.html.haml | 5 | ||||
| -rw-r--r-- | app/views/profile/_status.html.haml | 2 | ||||
| -rw-r--r-- | app/views/xrd/webfinger.xml.ruby | 4 |
4 files changed, 13 insertions, 3 deletions
diff --git a/app/views/profile/_favourite.html.haml b/app/views/profile/_favourite.html.haml new file mode 100644 index 000000000..85e3a0824 --- /dev/null +++ b/app/views/profile/_favourite.html.haml @@ -0,0 +1,5 @@ +.entry.entry-favourite + .content + %strong= favourite.account.acct + favourited a post by + %strong= favourite.status.account.acct diff --git a/app/views/profile/_follow.html.haml b/app/views/profile/_follow.html.haml new file mode 100644 index 000000000..c1c081374 --- /dev/null +++ b/app/views/profile/_follow.html.haml @@ -0,0 +1,5 @@ +.entry.entry-follow + .content + %strong= follow.account.acct + is now following + %strong= follow.target_account.acct diff --git a/app/views/profile/_status.html.haml b/app/views/profile/_status.html.haml index 1edd8df77..b089036b1 100644 --- a/app/views/profile/_status.html.haml +++ b/app/views/profile/_status.html.haml @@ -14,7 +14,7 @@ .header = render partial: 'status_header', locals: { status: status.reblog? ? status.reblog : status } .content - = status.content + = status.content.html_safe .counters = render partial: 'status_footer', locals: { status: status.reblog? ? status.reblog : status } diff --git a/app/views/xrd/webfinger.xml.ruby b/app/views/xrd/webfinger.xml.ruby index ce21f148a..42adc6551 100644 --- a/app/views/xrd/webfinger.xml.ruby +++ b/app/views/xrd/webfinger.xml.ruby @@ -1,8 +1,8 @@ Nokogiri::XML::Builder.new do |xml| xml.XRD(xmlns: 'http://docs.oasis-open.org/ns/xri/xrd-1.0') do xml.Subject @canonical_account_uri - xml.Alias profile_url(name: @account.username) - xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: profile_url(name: @account.username)) + xml.Alias profile_url(@account) + xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: profile_url(@account)) xml.Link(rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: atom_user_stream_url(id: @account.id)) xml.Link(rel: 'salmon', href: salmon_url(@account)) xml.Link(rel: 'magic-public-key', href: @magic_key) |