From ad5c642da349554bb4c0348f3439a0697f7d5fa8 Mon Sep 17 00:00:00 2001 From: Bruno Michel Date: Mon, 1 Jul 2013 23:08:29 +0200 Subject: [PATCH] Add a link to download epub in atom feeds --- README.md | 2 +- app/views/diaries/index.atom.builder | 3 ++- app/views/forums/index.atom.builder | 3 ++- app/views/forums/show.atom.builder | 3 ++- app/views/news/index.atom.builder | 6 ++++-- app/views/polls/index.atom.builder | 3 ++- app/views/sections/show.atom.builder | 4 +++- app/views/wiki_pages/index.atom.builder | 4 +++- 8 files changed, 19 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index a51ac9dbc..238992794 100644 --- a/README.md +++ b/README.md @@ -96,9 +96,9 @@ See also If you want the full stack for running LinuxFr.org, you should also look at: * [The admin files](https://github.com/nono/admin-linuxfr.org) +* [The migration script](https://github.com/nono/migration-linuxfr.org) * [The board daemon](https://github.com/nono/board-sse-linuxfr.org) * [The share daemon](https://github.com/nono/share-LinuxFr.org) -* [The migration script](https://github.com/nono/migration-linuxfr.org) * [The epub daemon](https://github.com/nono/epub-LinuxFr.org) * [The img daemon](https://github.com/nono/img-LinuxFr.org) diff --git a/app/views/diaries/index.atom.builder b/app/views/diaries/index.atom.builder index a48e703d3..9988e8415 100644 --- a/app/views/diaries/index.atom.builder +++ b/app/views/diaries/index.atom.builder @@ -14,7 +14,8 @@ atom_feed(:root_url => diaries_url, "xmlns:wfw" => "http://wellformedweb.org/Com if diary.node.cc_licensed entry.rights("Licence CC by-sa http://creativecommons.org/licenses/by-sa/3.0/deed.fr") end - entry.content(diary.body + atom_comments_link(url), :type => 'html') + epub = content_tag(:div, link_to("Télécharger ce contenu au format Epub", "#{url}.epub")) + entry.content(diary.body + epub + atom_comments_link(url), :type => 'html') entry.author do |author| author.name(diary.owner.name) end diff --git a/app/views/forums/index.atom.builder b/app/views/forums/index.atom.builder index f00f515b6..de7fd1314 100644 --- a/app/views/forums/index.atom.builder +++ b/app/views/forums/index.atom.builder @@ -12,7 +12,8 @@ atom_feed(:root_url => forums_url, "xmlns:wfw" => "http://wellformedweb.org/Comm url = forum_post_url(:forum_id => post.forum, :id => post) feed.entry(post, :url => url) do |entry| entry.title(post.title) - entry.content(post.body + atom_comments_link(url), :type => 'html') + epub = content_tag(:div, link_to("Télécharger ce contenu au format Epub", "#{url}.epub")) + entry.content(post.body + epub + atom_comments_link(url), :type => 'html') entry.author do |author| author.name(post.user.name) end diff --git a/app/views/forums/show.atom.builder b/app/views/forums/show.atom.builder index b754b0cbc..49333c9c3 100644 --- a/app/views/forums/show.atom.builder +++ b/app/views/forums/show.atom.builder @@ -6,8 +6,9 @@ atom_feed(:root_url => forum_url(@forum), "xmlns:wfw" => "http://wellformedweb.o @posts.each do |post| url = url_for([@forum, post]) feed.entry([@forum, post], :id => "tag:linuxfr.org,2005:ForumPost/#{post.id}") do |entry| + epub = content_tag(:div, link_to("Télécharger ce contenu au format Epub", "#{url}.epub")) entry.title(post.title) - entry.content(post.body + atom_comments_link(url), :type => 'html') + entry.content(post.body + epub + atom_comments_link(url), :type => 'html') entry.author do |author| author.name(post.user.name) end diff --git a/app/views/news/index.atom.builder b/app/views/news/index.atom.builder index 3f7f6fa1b..68e1ef633 100644 --- a/app/views/news/index.atom.builder +++ b/app/views/news/index.atom.builder @@ -10,6 +10,7 @@ atom_feed(:root_url => news_index_url, "xmlns:wfw" => "http://wellformedweb.org/ @nodes.map(&:content).each do |news| feed.entry(news, :published => news.node.created_at) do |entry| + url = news_url news entry.title(news.title) if news.node.cc_licensed entry.rights("Licence CC by-sa http://creativecommons.org/licenses/by-sa/3.0/deed.fr") @@ -20,8 +21,9 @@ atom_feed(:root_url => news_index_url, "xmlns:wfw" => "http://wellformedweb.org/ link_to(l.title, "http://#{MY_DOMAIN}/redirect/#{l.id}", :title => l.url, :hreflang => l.lang)) end.join.html_safe) second = content_tag(:div, news.second_part) - comments = atom_comments_link(news_url news) - entry.content(first + links + second + comments, :type => 'html') + epub = content_tag(:div, link_to("Télécharger ce contenu au format Epub", "#{url}.epub")) + comments = atom_comments_link(url) + entry.content(first + links + second + epub + comments, :type => 'html') news.attendees.each do |attendee| entry.author do |author| author.name(attendee.name) diff --git a/app/views/polls/index.atom.builder b/app/views/polls/index.atom.builder index 06d1ee631..3bddb1f03 100644 --- a/app/views/polls/index.atom.builder +++ b/app/views/polls/index.atom.builder @@ -7,7 +7,8 @@ atom_feed(:root_url => polls_url, "xmlns:wfw" => "http://wellformedweb.org/Comme feed.entry(poll, :published => poll.node.created_at) do |entry| url = poll_url(poll) entry.title(poll.title) - entry.content(poll_body(poll) + atom_comments_link(url), :type => 'html') + epub = content_tag(:div, link_to("Télécharger ce contenu au format Epub", "#{url}.epub")) + entry.content(poll_body(poll) + epub + atom_comments_link(url), :type => 'html') entry.author do |author| author.name(poll.node.user.name) end diff --git a/app/views/sections/show.atom.builder b/app/views/sections/show.atom.builder index 6256e6399..719181b92 100644 --- a/app/views/sections/show.atom.builder +++ b/app/views/sections/show.atom.builder @@ -7,7 +7,9 @@ atom_feed(:root_url => section_url(@section), "xmlns:wfw" => "http://wellformedw @news.each do |news| feed.entry(news) do |entry| entry.title(news.title) - entry.content(news.body + atom_comments_link(news_url news), :type => 'html') + url = news_url news + epub = content_tag(:div, link_to("Télécharger ce contenu au format Epub", "#{url}.epub")) + entry.content(news.body + epub + atom_comments_link(url), :type => 'html') entry.author do |author| author.name(news.author_name) end diff --git a/app/views/wiki_pages/index.atom.builder b/app/views/wiki_pages/index.atom.builder index f820edcb2..e0fecf961 100644 --- a/app/views/wiki_pages/index.atom.builder +++ b/app/views/wiki_pages/index.atom.builder @@ -7,7 +7,9 @@ atom_feed(:root_url => wiki_pages_url, "xmlns:wfw" => "http://wellformedweb.org/ @wiki_pages.each do |page| feed.entry(page) do |entry| entry.title(page.title) - entry.content(page.body + atom_comments_link(wiki_page_url page), :type => 'html') + url = wiki_page_url page + epub = content_tag(:div, link_to("Télécharger ce contenu au format Epub", "#{url}.epub")) + entry.content(page.body + epub + atom_comments_link(url), :type => 'html') entry.author do |author| author.name(page.node.user.try :name) end