tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add OEmbed iframe HTML, convert emojis on public pages, increase size of attachment thumbnails

Browse Source
This commit is contained in:
Eugen Rochko
2016-12-18 15:20:39 +01:00
parent 6de079a5af
commit aed25932b5
11 changed files with 72 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/api/oembed/show.json.rabl
View File

@ -9,6 +9,6 @@ node(:author_url) { |entry| account_url(entry.account) }
node(:provider_name) { Rails.configuration.x.local_domain }
node(:provider_url) { root_url }
node(:cache_age) { 86_400 }
node(:html, &:content)
node(:html) { |entry| "<div style=\"position: relative; height: 0; overflow: hidden; padding-top: 30px; padding-bottom: 56.25%\"><iframe src=\"#{embed_account_stream_entry_url(entry.account, entry)}\" style=\"position: absolute; top: 0; left: 0; width: 100%; height: 100%; overflow: hidden\" frameborder=\"0\" width=\"#{@width}\" scrolling=\"no\"></iframe></div>" }
node(:width) { @width }
node(:height) { @height }
node(:height) { nil }

8
app/views/layouts/embedded.html.haml Normal file
View File

@ -0,0 +1,8 @@
!!! 5
%html{:lang => 'en'}
%head
%meta{:charset => 'utf-8'}/
= stylesheet_link_tag 'application', media: 'all'
= javascript_include_tag 'application_public'
%body.embed
= yield

2
app/views/stream_entries/embed.html.haml Normal file
View File

@ -0,0 +1,2 @@
.activity-stream.activity-stream-headless
= render partial: @type, locals: { @type.to_sym => @stream_entry.activity }