diff options
| author | Erwan Leboucher <erwanleboucher@gmail.com> | 2017-04-07 12:43:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 12:43:56 +0200 |
| commit | 0c4e9fdda051d0322608c9abdaa158529c8feacd (patch) | |
| tree | db5e8aae085529913e4567c0a81a00c1d2b22356 /app/views | |
| parent | a0f1f9c6649f44183b9c1525433c1c6e7f052492 (diff) | |
| parent | 624a9a7136159d460228a0c2f5df18a9ead3b7f2 (diff) | |
Merge branch 'master' into patch-4
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/accounts/show.atom.ruby | 27 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 6 | ||||
| -rw-r--r-- | app/views/stream_entries/show.atom.ruby | 9 |
3 files changed, 4 insertions, 38 deletions
diff --git a/app/views/accounts/show.atom.ruby b/app/views/accounts/show.atom.ruby deleted file mode 100644 index e15021178..000000000 --- a/app/views/accounts/show.atom.ruby +++ /dev/null @@ -1,27 +0,0 @@ -# frozen_string_literal: true - -Nokogiri::XML::Builder.new do |xml| - feed(xml) do - simple_id xml, account_url(@account, format: 'atom') - title xml, @account.display_name - subtitle xml, @account.note - updated_at xml, stream_updated_at - logo xml, full_asset_url(@account.avatar.url(:original)) - - author(xml) do - include_author xml, @account - end - - link_alternate xml, TagManager.instance.url_for(@account) - link_self xml, account_url(@account, format: 'atom') - link_next xml, account_url(@account, format: 'atom', max_id: @entries.last.id) if @entries.size == 20 - link_hub xml, api_push_url - link_salmon xml, api_salmon_url(@account.id) - - @entries.each do |stream_entry| - entry(xml, false) do - include_entry xml, stream_entry - end - end - end -end.to_xml diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 7eae6982b..abab14a28 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -11,8 +11,10 @@ %meta{:name => "theme-color", :content => "#282c37"}/ %meta{:name => "apple-mobile-web-app-capable", :content => "yes"}/ - %title - = "#{yield(:page_title)} - " if content_for?(:page_title) + %title< + - if content_for?(:page_title) + = yield(:page_title) + = ' - ' = Setting.site_title = stylesheet_link_tag 'application', media: 'all' diff --git a/app/views/stream_entries/show.atom.ruby b/app/views/stream_entries/show.atom.ruby deleted file mode 100644 index a298f3269..000000000 --- a/app/views/stream_entries/show.atom.ruby +++ /dev/null @@ -1,9 +0,0 @@ -Nokogiri::XML::Builder.new do |xml| - entry(xml, true) do - author(xml) do - include_author xml, @stream_entry.account - end - - include_entry xml, @stream_entry - end -end.to_xml |