diff --git a/app/views/moderation/_discussion.haml b/app/views/moderation/_discussion.haml deleted file mode 100644 index 86ebc108..00000000 --- a/app/views/moderation/_discussion.haml +++ /dev/null @@ -1,29 +0,0 @@ -- if report.moderation_comments.all.count.zero? - = t 'views.answerbox.no_comment' -- else - %ul.comment__container - - report.moderation_comments.order(:created_at).each do |comment| - %li.comment{ data: { comment_id: comment.id } } - .media - .pull-left - %img.comment__user-avatar.avatar-sm{ src: comment.user.profile_picture.url(:medium) } - .media-body - %h6.media-heading.comment__user - = user_screen_name comment.user - %span.text-muted{ title: comment.created_at, data: { toggle: :tooltip, placement: :right } } - = time_ago_in_words(comment.created_at) - ago - - if comment.user == current_user - .pull-right - .btn-group - %button.btn.btn-link.btn-sm.dropdown-toggle{ data: { toggle: :dropdown }, aria: { expanded: false } } - %span.caret - .dropdown-menu.dropdown-menu-right{ role: :menu } - %a.dropdown-item.text-danger{ href: '#', tabindex: -1, data: { action: 'mod-comment-destroy', id: comment.id } } - %i.fa.fa-trash-o - = t 'views.actions.delete' - .comment__content - = comment.content -.form-group.has-feedback{ name: 'mod-comment-new-group', data: { id: report.id } } - %input.form-control.comments--box{ type: :text, placeholder: t('views.placeholder.comment'), name: 'mod-comment-new', data: { id: report.id } } - %span.text-muted.form-control-feedback.comments--count{ id: "mod-comment-charcount-#{report.id}" } 160 diff --git a/app/views/moderation/_moderationbox.haml b/app/views/moderation/_moderationbox.haml index f6d851aa..03d09c6b 100644 --- a/app/views/moderation/_moderationbox.haml +++ b/app/views/moderation/_moderationbox.haml @@ -33,10 +33,5 @@ %a.btn.btn-primary{ href: moderation_ip_path(report.target.user.id) } IP .col-md-4.col-sm-4.col-xs-4.text-right - %button.btn.btn-primary.btn-sm{ type: :button, name: 'mod-comments', data: { id: report.id, state: :hidden } } - %i.fa.fa-comments - %span{ id: "mod-comment-count-#{report.id}" }= report.moderation_comments.all.count %button.btn.btn-default.btn-sm{ type: :button, name: 'mod-delete-report', data: { id: report.id } } %i.fa.fa-trash-o - .card-footer.d-none{ id: "mod-comments-section-#{report.id}" } - %div{ id: "mod-comments-#{report.id}" }= render 'moderation/discussion', report: report