From 56436aec0885fe99dfb4a359067b2bf0fdbb59a7 Mon Sep 17 00:00:00 2001 From: Toks Date: Wed, 24 Apr 2013 15:27:40 -0400 Subject: [PATCH] fixes #1390 --- app/assets/javascripts/posts.js | 25 +++++++++++++++++++ .../stylesheets/specific/posts.css.scss | 1 + app/controllers/posts_controller.rb | 2 ++ .../posts/partials/show/_notices.html.erb | 6 +++-- 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 6983d0633..ace0055b3 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -133,6 +133,31 @@ $("#post_tag_string").trigger("focus"); e.preventDefault(); }); + + $("#parent-relationship-preview").hide(); + $("#child-relationship-preview").hide(); + + $("#parent-relationship-preview-link").click(function(e) { + $("#parent-relationship-preview").toggle(); + if ($("#parent-relationship-preview").is(":visible")) { + $(this).html("« hide"); + } + else { + $(this).html("show »"); + } + e.preventDefault(); + }); + + $("#child-relationship-preview-link").click(function(e) { + $("#child-relationship-preview").toggle(); + if ($("#child-relationship-preview").is(":visible")) { + $(this).html("« hide"); + } + else { + $(this).html("show »"); + } + e.preventDefault(); + }); } Danbooru.Post.initialize_favlist = function() { diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index 98186892a..c1d23fbd7 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -128,6 +128,7 @@ div#c-posts { font-size: 0.8em; padding: 1em; margin-bottom: 1em; + overflow: hidden; ul { margin-left: 1em; diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 8eff80ce7..0bae515f0 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -22,6 +22,8 @@ class PostsController < ApplicationController @post = Post.find(params[:id]) @post_flag = PostFlag.new(:post_id => @post.id) @post_appeal = PostAppeal.new(:post_id => @post.id) + @parent_post_set = PostSets::Post.new("parent:#{@post.id}") + @child_post_set = PostSets::Post.new("parent:#{@post.parent_id}") respond_with(@post) end diff --git a/app/views/posts/partials/show/_notices.html.erb b/app/views/posts/partials/show/_notices.html.erb index 2da5be108..9e894454c 100644 --- a/app/views/posts/partials/show/_notices.html.erb +++ b/app/views/posts/partials/show/_notices.html.erb @@ -48,13 +48,15 @@ <% if post.parent_id %>
- This post belongs to a <%= link_to "parent", post_path(post.parent_id) %> (<%= link_to "learn more", wiki_pages_path(:title => "help:post_relationships") %>) + This post belongs to a <%= link_to "parent", post_path(post.parent_id) %> (<%= link_to "learn more", wiki_pages_path(:title => "help:post_relationships") %>) <%= link_to "show »".html_safe, "#", :id => "child-relationship-preview-link" %> +
<%= @child_post_set.presenter.post_previews_html(self) %>
<% end %> <% if post.has_children? %>
- This post has <%= link_to "children", posts_path(:tags => "parent:#{post.id}") %> (<%= link_to "learn more", wiki_pages_path(:title => "help:post_relationships") %>) + This post has <%= link_to "children", posts_path(:tags => "parent:#{post.id}") %> (<%= link_to "learn more", wiki_pages_path(:title => "help:post_relationships") %>) <%= link_to "show »".html_safe, "#", :id => "parent-relationship-preview-link" %> +
<%= @parent_post_set.presenter.post_previews_html(self) %>
<% end %>