+<%= subtree_html %>
diff --git a/app/views/comments/_comment_quality_marker.html.erb b/app/views/comments/_comment_quality_marker.html.erb
new file mode 100644
index 000000000..f5910bf92
--- /dev/null
+++ b/app/views/comments/_comment_quality_marker.html.erb
@@ -0,0 +1,14 @@
+<% if decorated_comment.low_quality %>
+
+ <%= inline_svg_tag("info.svg", aria: true, class: "crayons-icon mr-2", title: "Info") %>
+ Comment marked as low quality/non-constructive by the community.
+ View code of conduct
+
+<% end %>
+
+<% if comment.hidden_by_commentable_user %>
+
+ <%= inline_svg_tag("info.svg", aria: true, class: "crayons-icon mr-2", title: "Info") %>
+ Comment hidden by post author - thread only visible in this permalink
+
+<% end %>
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index 506e84192..8e1f23687 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -1,4 +1,4 @@
-
+
<%= javascript_packs_with_chunks_tag "validateFileInputs", "responseTemplates", defer: true %>
<% if @comment.errors.any? %>
@@ -28,8 +28,8 @@
<%= f.hidden_field :parent_id, value: @parent_comment.id if @parent_comment %>
<% end %>
-
-
+
+
diff --git a/app/views/podcast_episodes/show.html.erb b/app/views/podcast_episodes/show.html.erb
index ed9618bdb..7f81f51be 100644
--- a/app/views/podcast_episodes/show.html.erb
+++ b/app/views/podcast_episodes/show.html.erb
@@ -73,34 +73,37 @@
<% end %>
-
-
- <% if @episode.podcast.feed_url.include?("soundcloud") %>
- <%= simple_format((@episode.processed_html || @episode.body), sanitize: true) %>
- <% else %>
- <%= sanitize (@episode.processed_html || ""),
- tags: %w[strong br em a table tbody thead tfoot th tr td col colgroup del p h1 h2 h3 h4 h5 h6 blockquote time div span i em u b ul ol li dd dl dt q code pre img sup cite center small],
- attributes: %w[href strong em class ref rel src title alt colspan height width size rowspan span value start data-conversation data-lang id] %>
- <% end %>
-
- <% Comment.tree_for(@episode, 12).each do |comment, sub_comments| %>
- <% cache ["comment_root_#{user_signed_in?}", comment] do %>
- <%= tree_for(comment, sub_comments, @episode) %>
- <% end %>
+
+
+
+
+ <% if @episode.podcast.feed_url.include?("soundcloud") %>
+ <%= simple_format((@episode.processed_html || @episode.body), sanitize: true) %>
+ <% else %>
+ <%= sanitize (@episode.processed_html || ""),
+ tags: %w[strong br em a table tbody thead tfoot th tr td col colgroup del p h1 h2 h3 h4 h5 h6 blockquote time div span i em u b ul ol li dd dl dt q code pre img sup cite center small],
+ attributes: %w[href strong em class ref rel src title alt colspan height width size rowspan span value start data-conversation data-lang id] %>
<% end %>
+
+
' - detailsFinishHTML = '+ + ${ iconCollaspe } + ${ iconExpand } + + +
+ `; + detailsEndHTML = `+- Copy link
+ - Settings
+ - Report abuse
+ - Edit
+ - Delete
+
+Read next
+Read next
<% articles.each do |article| %>Discussion
+Discussion
<%= @article.title %>
-Are you sure you want to delete this article?
+Are you sure you want to delete this article?
++ You cannot undo this action, perhaps you just want to + + <%= @article.published ? "unpublish" : "edit" %> + + instead? +
-- You cannot undo this action, perhaps you just want to - - <%= @article.published ? "unpublish" : "edit" %> - - instead? -
- <%= form_tag "/articles/#{@article.id}", method: :delete do %> - - <% end %> + <%= form_tag "/articles/#{@article.id}", method: :delete do %> + + + <%= @article.published ? "Unpublish" : "Edit" %> + + Dismiss + <% end %> +
- <%= render("comments/comment_proper", - comment: comment, - commentable: commentable, - is_view_root: is_view_root, - is_childless: is_childless, - subtree_html: subtree_html) %> +<% if comment && comment.user && !should_be_hidden?(comment, @root_comment) %> + <% if comment.depth < 3 %> ++ + <%= inline_svg_tag("collapse.svg", aria: true, class: "crayons-icon expanded", title: "Collapse") %> + <%= inline_svg_tag("expand.svg", aria: true, class: "crayons-icon collapsed", title: "Expand") %> + + +
+ <% end %> ++- Copy link
+
+ <% action = comment.hidden_by_commentable_user ? "Unhide" : "Hide" %>
+ -
+
+ <%= action %>
+
+
+
+
+
+
+<%= truncate(sanitize(@comment.processed_html, tags: []), length: 80) %>
-Are you sure you want to delete this comment?
-You cannot undo this action, perhaps you just want to - EDIT instead?
- - <%= form_tag "/comments/#{@comment.id}", method: :delete do %> - - <% end %> +Are you sure you want to delete this comment?
++ You cannot undo this action, perhaps you just want to + Edit instead? +
+ <%= form_tag "/comments/#{@comment.id}", method: :delete do %> + + Edit + Dismiss + <% end %> +Comment from a deleted article or podcast
Editing comment
- <%= render "form", - commentable: @commentable, - commentable_type: @comment.commentable_type %> +Editing comment
+ <%= render "form", + commentable: @commentable, + commentable_type: @comment.commentable_type %> +<%= @commentable.title %>
-- <%= @commentable.is_a?(PodcastEpisode) ? @commentable.podcast.name : @commentable.user.name %> - <%= "on #{@commentable.published_at.strftime('%B %d, %Y')}" if @commentable.published_at %> -
- - <% if @commentable.processed_html.present? %> - <% if @commentable.processed_html.size < 350 %> -re: <%= @commentable.title %> VIEW POST
- - <% unless @root_comment.is_root? %> - TOP OF THREAD - <% end %> - comments">FULL DISCUSSION - -+ <%= @commentable.title %> +
++ <%= @commentable.is_a?(PodcastEpisode) ? @commentable.podcast.name : @commentable.user.name %> + <%= "on #{@commentable.published_at.strftime('%B %d, %Y')}" if @commentable.published_at %> +
+- Some comments have been hidden by the post's author - find out more -
+ + <% else %> + + <%= javascript_packs_with_chunks_tag "responseTemplates", defer: true %> ++ Discussion on: + <%= @commentable.title %> +
++ + Replies for: <%= parent.title(150) %> + +
+ Some comments have been hidden by the post's author - find out more +
+ <% end %> +- Comment Settings -
+Comment Settings
-- Showing thread notifications -
-- You will receive all notifications for this comment and any of your comments in this chain. -
-- Muting thread notifications -
-- All notifications for this comment and any of your comments in the thread are currently muted. -
-Showing thread notifications
+You will receive all notifications for this comment and any of your comments in this chain.
+ <% else %> +Muting thread notifications
+All notifications for this comment and any of your comments in the thread are currently muted.
+ <% end %> +- You are still subscribed to all comments in the broader thread, which will mean you will still receive notifications for replies to this comment. -
- <%= form_for(@notification_subscription, url: "/notification_subscriptions/Article/#{@comment.commentable_id}", method: "post", html: { class: "mute-form" }) do |f| %> - - <%= f.submit "Unsubscribe from parent post", class: "crayons-btn crayons-btn--secondary" %> - <% end %> +Subscription
+You are still subscribed to all comments in the broader thread, which will mean you will still receive notifications for replies to this comment.
+<%= @listing.title %>
-Are you sure you want to delete this listing?
+Are you sure you want to delete this listing?
++ You cannot undo this action, perhaps you just want to + + <%= @listing.published ? "unpublish" : "edit" %> + + instead? +
-- You cannot undo this action, perhaps you just want to - - <%= @listing.published ? "unpublish" : "edit" %> - - instead? -
- - <%= form_tag "/listings/#{@listing.id}", method: :delete do %> - - <% end %> + <%= form_tag "/listings/#{@listing.id}", method: :delete do %> + + + <%= @article.published ? "Unpublish" : "Edit" %> + + <% end %> +- Episode source -
-Episode source