X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3b237dc3dabda181ed68dc587b1befc678a03706..8a6c34fa78cf4fa52332d90448dae50087f2b510:/app/views/diary_entries/comments.html.erb?ds=sidebyside
diff --git a/app/views/diary_entries/comments.html.erb b/app/views/diary_entries/comments.html.erb
index 63df5f9c6..61ceccdc0 100644
--- a/app/views/diary_entries/comments.html.erb
+++ b/app/views/diary_entries/comments.html.erb
@@ -1,24 +1,34 @@
<% content_for :heading do %>
- <%= t('.has_commented_on', :display_name => @user.display_name) %>
+ <%= t ".heading", :user => @user.display_name %>
+ <%= t ".subheading_html", :user => link_to(@user.display_name, user_path(@user)) %>
<% end %>
-
-
- | <%= t '.post' %> |
- <%= t '.when' %> |
- <%= t '.comment' %> |
-
- <% @comments.each do |comment| -%>
- <% cl = cycle('table0', 'table1') %>
-
- | <%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %> |
- <%= t '.ago', :ago => time_ago_in_words(comment.created_at) %> |
- <%= comment.body.to_html %> |
-
- <% end -%>
-
+<% if @comments.empty? %>
+ <%= t ".no_comments" %>
-
- <%= link_to t('.older_comments'), :page => @comment_pages.current.next if @comment_pages.current.next %>
- <%= link_to t('.newer_comments'), :page => @comment_pages.current.previous if @comment_pages.current.previous %>
-
+<% else %>
+
+
+
+ | <%= t ".post" %> |
+ <%= t ".when" %> |
+ <%= t ".comment" %> |
+
+
+ <% @comments.each do |comment| -%>
+
+ | "><%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %> |
+ ">
+ <%= friendly_date_ago(comment.created_at) %>
+ |
+ "><%= comment.body.to_html %> |
+
+ <% end -%>
+
+
+ <%= 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 -%>