diff --git a/app/assets/javascripts/blacklists.js b/app/assets/javascripts/blacklists.js index 5213273d0..57e84b5c1 100644 --- a/app/assets/javascripts/blacklists.js +++ b/app/assets/javascripts/blacklists.js @@ -101,7 +101,7 @@ if (previews.length) { return previews; } else { - return $("#image"); + return $("#image-container"); } } diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index 8d97d06c3..98186892a 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -18,7 +18,7 @@ a.blacklisted-active { font-weight: bold; } -.post-preview.blacklisted-active, #image.blacklisted-active { +.post-preview.blacklisted-active, #image-container.blacklisted-active { display: none; } diff --git a/app/views/posts/partials/show/_image.html.erb b/app/views/posts/partials/show/_image.html.erb index 79f482a98..8c5069a58 100644 --- a/app/views/posts/partials/show/_image.html.erb +++ b/app/views/posts/partials/show/_image.html.erb @@ -1,2 +1,2 @@ -<%= image_tag(post.file_url_for(CurrentUser.user), :width => post.image_width_for(CurrentUser.user), :height => post.image_height_for(CurrentUser.user), :id => "image", "data-original-width" => post.image_width, "data-original-height" => post.image_height, "data-large-width" => post.large_image_width, "data-large-height" => post.large_image_height, "data-tags" => post.tag_string, "data-uploader" => post.uploader_name, "data-rating" => post.rating, "data-flags" => post.status_flags, "data-parent-id" => post.parent_id, "data-has-children" => post.has_children?, "data-score" => post.score, "data-fav-count" => post.fav_count) %> +<%= image_tag(post.file_url_for(CurrentUser.user), :width => post.image_width_for(CurrentUser.user), :height => post.image_height_for(CurrentUser.user), :id => "image", "data-original-width" => post.image_width, "data-original-height" => post.image_height, "data-large-width" => post.large_image_width, "data-large-height" => post.large_image_height, "data-tags" => post.tag_string, "data-user" => post.uploader_name, "data-rating" => post.rating, "data-flags" => post.status_flags, "data-parent-id" => post.parent_id, "data-has-children" => post.has_children?, "data-score" => post.score, "data-fav-count" => post.fav_count) %> diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb index 91f560dda..afd9e7972 100644 --- a/app/views/posts/show.html.erb +++ b/app/views/posts/show.html.erb @@ -44,7 +44,7 @@ <%= render_advertisement("horizontal") %> -
+
<%= @post.presenter.image_html(self) %>