jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix rel attrs for pool links

Browse Source
This commit is contained in:
albert
2013-02-25 09:43:17 -05:00
parent 00934a1e13
commit 10b6dcebd0
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/specific/comments.css.scss
View File

@@ -1,6 +1,10 @@
@import "../common/000_vars.css.scss"; @import "../common/000_vars.css.scss";
div.comments-for-post { div.comments-for-post {
div.notices {
margin: 1em 0;
}
div.list-of-comments { div.list-of-comments {
article.comment { article.comment {
margin-bottom: 2em; margin-bottom: 2em;

16
app/presenters/post_presenter.rb
View File

@@ -93,7 +93,7 @@ class PostPresenter < Presenter
if template.params[:pool_id].present? if template.params[:pool_id].present?
pool = Pool.where(:id => template.params[:pool_id]).first pool = Pool.where(:id => template.params[:pool_id]).first
return if pool.nil? return if pool.nil?
html = pool_link_html(html, template, pool) html = pool_link_html(html, template, pool, :include_rel => true)
@post.pools.active.where("id <> ?", template.params[:pool_id]).each do |other_pool| @post.pools.active.where("id <> ?", template.params[:pool_id]).each do |other_pool|
html = pool_link_html(html, template, other_pool) html = pool_link_html(html, template, other_pool)
@@ -108,19 +108,27 @@ class PostPresenter < Presenter
html.join("\n").html_safe html.join("\n").html_safe
end end
def pool_link_html(html, template, pool) def pool_link_html(html, template, pool, options = {})
pool_html = ["<li>"] pool_html = ["<li>"]
match_found = false match_found = false
if options[:include_rel]
prev_rel = "prev"
next_rel = "next"
else
prev_rel = nil
next_rel = nil
end
if pool.neighbors(@post).previous if pool.neighbors(@post).previous
pool_html << template.link_to("&laquo;prev".html_safe, template.post_path(pool.neighbors(@post).previous, :pool_id => pool.id), :rel => "prev") pool_html << template.link_to("&laquo;prev".html_safe, template.post_path(pool.neighbors(@post).previous, :pool_id => pool.id), :rel => prev_rel)
match_found = true match_found = true
else else
pool_html << "&laquo;prev" pool_html << "&laquo;prev"
end end
if pool.neighbors(@post).next if pool.neighbors(@post).next
pool_html << template.link_to("next&raquo;".html_safe, template.post_path(pool.neighbors(@post).next, :pool_id => pool.id), :rel => "next") pool_html << template.link_to("next&raquo;".html_safe, template.post_path(pool.neighbors(@post).next, :pool_id => pool.id), :rel => next_rel)
match_found = true match_found = true
else else
pool_html << "next&raquo;" pool_html << "next&raquo;"