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

comments: fix video duration not being shown on thumbnails

Browse Source 
Fix the video duration not being shown on thumbnails on the
https://danbooru.donmai.us/comments page.

BUG: this introduces duplicate HTML ids on the comments page. Post
thumbnails and post comment containers both have the same html ID.
This commit is contained in:
evazion
2021-11-02 02:53:42 -05:00
parent a5ed8c72c9
commit d8a55bd62b
6 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/src/styles/common/messages.scss
View File

@@ -1,9 +1,10 @@
div.list-of-messages { div.list-of-messages {
margin: 1em 0; margin: 1em 0;
> * + * { margin-top: 2em; }
article.message { article.message {
display: flex; display: flex;
margin-top: 2em;
word-wrap: break-word; word-wrap: break-word;
padding: 5px; padding: 5px;

1
app/javascript/src/styles/common/utilities.scss
View File

@@ -68,6 +68,7 @@ $spacer: 0.25rem; /* 4px */
.align-top { vertical-align: top; } .align-top { vertical-align: top; }
.align-middle { vertical-align: middle; } .align-middle { vertical-align: middle; }
.flex-1 { flex: 1 1 0%; }
.flex-auto { flex: 1 1 auto; } .flex-auto { flex: 1 1 auto; }
.items-center { align-items: center; } .items-center { align-items: center; }
.justify-center { justify-content: center; } .justify-center { justify-content: center; }

12
app/javascript/src/styles/specific/comments.scss
View File

@@ -17,18 +17,6 @@ div#c-comments {
div.post { div.post {
display: flex; display: flex;
margin-bottom: 4em; margin-bottom: 4em;
div.preview {
width: 154px;
height: 154px;
margin-right: 30px;
overflow: hidden;
text-align: center;
}
div.comment-section {
flex: 1;
}
} }
} }
} }

10
app/views/comments/_index_by_comment.html.erb
View File

@@ -3,12 +3,10 @@
<% dtext_data = DText.preprocess(@comments.map(&:body)) %> <% dtext_data = DText.preprocess(@comments.map(&:body)) %>
<% @comments.each do |comment| %> <% @comments.each do |comment| %>
<%= tag.div id: "post_#{comment.post.id}", **PostPreviewComponent.new(post: comment.post).article_attrs("post") do %> <%= tag.div id: "post_#{comment.post.id}", **PostPreviewComponent.new(post: comment.post).article_attrs("post space-x-4") do %>
<div class="preview"> <% if policy(comment.post).visible? %>
<% if policy(comment.post).visible? %> <%= post_preview(comment.post, show_deleted: true) %>
<%= link_to(image_tag(comment.post.preview_file_url), post_path(comment.post)) %> <% end %>
<% end %>
</div>
<%= render_comment(comment, dtext_data: dtext_data, context: :index_by_comment, current_user: CurrentUser.user) %> <%= render_comment(comment, dtext_data: dtext_data, context: :index_by_comment, current_user: CurrentUser.user) %>
<% end %> <% end %>

8
app/views/comments/_index_by_post.html.erb
View File

@@ -4,12 +4,10 @@
<% end %> <% end %>
<% @posts.select(&:visible?).each do |post| %> <% @posts.select(&:visible?).each do |post| %>
<%= tag.div id: "post_#{post.id}", **PostPreviewComponent.new(post: post).article_attrs("post") do %> <%= tag.div id: "post_#{post.id}", **PostPreviewComponent.new(post: post).article_attrs("post space-x-4") do %>
<div class="preview"> <%= post_preview(post, show_deleted: true) %>
<%= link_to(image_tag(post.preview_file_url), post_path(post)) %>
</div>
<div class="comment-section"> <div class="flex-1">
<%= render "comments/partials/index/header", post: post %> <%= render "comments/partials/index/header", post: post %>
<%= render_comment_section(post, limit: 6, current_user: CurrentUser.user) %> <%= render_comment_section(post, limit: 6, current_user: CurrentUser.user) %>
</div> </div>

6
test/functional/comments_controller_test.rb
View File

@@ -31,9 +31,9 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
get comments_path(group_by: "post") get comments_path(group_by: "post")
assert_response :success assert_response :success
assert_select "#post_#{@post.id}", 1 assert_select "div#post_#{@post.id}", 1
assert_select "#post_#{@post.id} .comment", 1 assert_select "div#post_#{@post.id} .comment", 1
assert_select "#post_#{@post.id} .show-all-comments-link", 0 assert_select "div#post_#{@post.id} .show-all-comments-link", 0
end end
should "not bump posts with nonbumping comments" do should "not bump posts with nonbumping comments" do