Merge remote-tracking branch 'upstream/pull/4913'

[rails.git] / app / views / diary_entries / comments.html.erb

diff --git a/app/views/diary_entries/comments.html.erb b/app/views/diary_entries/comments.html.erb
deleted file mode 100644 (file)
index f82373a..0000000
--- a/app/views/diary_entries/comments.html.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-<% content_for :heading do %>
-  <h1><%= t ".heading", :user => @user.display_name %></h1>
-  <p><%= t ".subheading_html", :user => link_to(@user.display_name, user_path(@user)) %></p>
-<% end %>
-
-<% if @comments.empty? %>
-  <h4><%= t ".no_comments" %></h4>
-
-<% else %>
-  <table class="table table-striped" width="100%">
-    <thead>
-      <tr>
-        <th width="25%"><%= t ".post" %></th>
-        <th width="25%"><%= t ".when" %></th>
-        <th width="50%"><%= t ".comment" %></th>
-      </tr>
-    </thead>
-    <% @comments.each do |comment| -%>
-    <tr>
-      <td width="25%" class="<%= "text-muted" unless comment.visible? %>"><%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %></td>
-      <td width="25%" class="<%= "text-muted" unless comment.visible? %>"><span title="<%= l comment.created_at, :format => :friendly %>"><%= time_ago_in_words(comment.created_at, :scope => :"datetime.distance_in_words_ago") %></span></td>
-      <td width="50%" class="richtext text-break<%= " text-muted" unless comment.visible? %>"><%= comment.body.to_html %></td>
-    </tr>
-    <% end -%>
-  </table>
-
-  <%= render "shared/pagination",
-             :newer_key => "diary_entries.comments.newer_comments",
-             :older_key => "diary_entries.comments.older_comments",
-             :newer_id => @newer_comments_id,
-             :older_id => @older_comments_id %>
-<% end -%>