From 0e8f59c16fcb21301c736ecbc4424cb4c5388c42 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 29 Feb 2016 19:42:08 +0100 Subject: Refactoring Grape API methods into normal controllers & other things --- app/views/stream_entries/_favourite.html.haml | 5 +++++ app/views/stream_entries/_follow.html.haml | 5 +++++ app/views/stream_entries/_status.html.haml | 29 +++++++++++++++++++++++++++ app/views/stream_entries/show.atom.ruby | 9 +++++++++ app/views/stream_entries/show.html.haml | 5 +++++ 5 files changed, 53 insertions(+) create mode 100644 app/views/stream_entries/_favourite.html.haml create mode 100644 app/views/stream_entries/_follow.html.haml create mode 100644 app/views/stream_entries/_status.html.haml create mode 100644 app/views/stream_entries/show.atom.ruby create mode 100644 app/views/stream_entries/show.html.haml (limited to 'app/views/stream_entries') diff --git a/app/views/stream_entries/_favourite.html.haml b/app/views/stream_entries/_favourite.html.haml new file mode 100644 index 000000000..85e3a0824 --- /dev/null +++ b/app/views/stream_entries/_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/stream_entries/_follow.html.haml b/app/views/stream_entries/_follow.html.haml new file mode 100644 index 000000000..c1c081374 --- /dev/null +++ b/app/views/stream_entries/_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/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml new file mode 100644 index 000000000..89dd53613 --- /dev/null +++ b/app/views/stream_entries/_status.html.haml @@ -0,0 +1,29 @@ +- if status.reply? && include_threads + = render partial: 'status', locals: { status: status.thread, include_threads: false, is_predecessor: true, is_successor: false } + +.entry{ class: entry_classes(status, is_predecessor, is_successor, include_threads) } + - if status.reblog? + .pre-header + %i.fa.fa-retweet + Shared by + = link_to display_name(status.account), url_for_target(status.account), class: 'name' + + .entry__container + .avatar + = image_tag avatar_for_status_url(status) + + .entry__container__container + .header + = link_to url_for_target(status.reblog? ? status.reblog.account : status.account), class: 'name' do + %strong= display_name(status.reblog? ? status.reblog.account : status.account) + = "@#{status.reblog? ? status.reblog.account.acct : status.account.acct}" + = link_to url_for_target(status.reblog? ? status.reblog : status), class: 'time' do + %span{ title: status.reblog? ? status.reblog.created_at : status.created_at } + = relative_time(status.reblog? ? status.reblog.created_at : status.created_at) + + .content + = status.content.html_safe + +- if include_threads + - status.replies.each do |status| + = render partial: 'status', locals: { status: status, include_threads: false, is_successor: true, is_predecessor: false } diff --git a/app/views/stream_entries/show.atom.ruby b/app/views/stream_entries/show.atom.ruby new file mode 100644 index 000000000..e0e089f46 --- /dev/null +++ b/app/views/stream_entries/show.atom.ruby @@ -0,0 +1,9 @@ +Nokogiri::XML::Builder.new do |xml| + entry(xml, true) do + author(xml) do + include_author xml, @entry.account + end + + include_entry xml, @entry + end +end.to_xml diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml new file mode 100644 index 000000000..6286daf53 --- /dev/null +++ b/app/views/stream_entries/show.html.haml @@ -0,0 +1,5 @@ +- content_for :header_tags do + %link{ rel: 'alternate', type: 'application/atom+xml', href: account_stream_entry_url(@account, @stream_entry, format: 'atom') }/ + +.activity-stream + = render partial: @type, locals: { @type.to_sym => @stream_entry.activity, include_threads: true, is_predecessor: false, is_successor: false } -- cgit