From 964f74d6cd9a6518849d4d1472253d8d1df29f10 Mon Sep 17 00:00:00 2001 From: albert Date: Fri, 21 Sep 2012 15:41:05 -0400 Subject: [PATCH] fixes --- .../stylesheets/specific/comments.css.scss | 2 +- app/models/upload.rb | 2 +- app/presenters/post_presenter.rb | 11 + app/views/layouts/default.html.erb | 2 +- app/views/posts/partials/show/_share.html.erb | 9 +- app/views/posts/show.html.erb | 4 +- db/seeds.rb | 7 +- db/structure.sql | 629 ++++++++---------- 8 files changed, 294 insertions(+), 372 deletions(-) diff --git a/app/assets/stylesheets/specific/comments.css.scss b/app/assets/stylesheets/specific/comments.css.scss index b4c6b353f..c7c793c4e 100644 --- a/app/assets/stylesheets/specific/comments.css.scss +++ b/app/assets/stylesheets/specific/comments.css.scss @@ -23,7 +23,7 @@ div.comments-for-post { menu { li { - margin-right: 0.5em; + margin-right: 1em; } } } diff --git a/app/models/upload.rb b/app/models/upload.rb index 5454eb8d4..a0aba0c9c 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -220,7 +220,7 @@ class Upload < ActiveRecord::Base "#{Rails.root}/public/data/preview/#{prefix}#{md5}.jpg" when Danbooru.config.large_image_width - "#{Rails.root}/public/data/sample/#{prefix}#{md5}.jpg" + "#{Rails.root}/public/data/sample/#{Danbooru.config.large_image_prefix}#{prefix}#{md5}.jpg" end end diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb index 50c0370eb..fbe67bd63 100644 --- a/app/presenters/post_presenter.rb +++ b/app/presenters/post_presenter.rb @@ -43,6 +43,17 @@ class PostPresenter < Presenter @tag_set_presenter.tag_list_html(template, options.merge(:show_extra_links => CurrentUser.user.is_privileged?)) end + def post_footer_for_pool_html(template) + if template.params[:pool_id] + pool = Pool.where(:id => template.params[:pool_id]).first + return if pool.nil? + return if pool.neighbors(@post).next.nil? + template.link_to("Next in #{pool.name}", template.post_path(pool.neighbors(@post).next)) + else + nil + end + end + def pool_html(template) html = ["