X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b8c1bbb4f8d9bacaa7d76b38a974f7f6042523ad..0babf982564e1dd1e096cbae09d62436729f703a:/app/views/diary_entries/_diary_comment.html.erb?ds=sidebyside diff --git a/app/views/diary_entries/_diary_comment.html.erb b/app/views/diary_entries/_diary_comment.html.erb index db4847826..b3e406816 100644 --- a/app/views/diary_entries/_diary_comment.html.erb +++ b/app/views/diary_entries/_diary_comment.html.erb @@ -1,19 +1,23 @@ -
"> - <%= user_thumbnail diary_comment.user %> -

<%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %> - <% if current_user and diary_comment.user.id != current_user.id %> - | <%= report_link(t(".report"), diary_comment) %> - <% end %> -

- -
<%= diary_comment.body.to_html %>
- <% if can? :hidecomment, DiaryEntry %> - - <% if diary_comment.visible? %> - <%= link_to t(".hide_link"), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data => { :confirm => t(".confirm") } %> - <% else %> - <%= link_to t(".unhide_link"), unhide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data => { :confirm => t(".confirm") } %> +
"> +
+ <%= user_thumbnail diary_comment.user %> +
+
+

<%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, diary_comment.user), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %> + <% if current_user and diary_comment.user.id != current_user.id %> + | <%= report_link(t(".report"), diary_comment) %> <% end %> - - <% end %> +

+ +
<%= diary_comment.body.to_html %>
+ <% if can? :hide, DiaryComment %> + + <% if diary_comment.visible? %> + <%= link_to t(".hide_link"), hide_diary_comment_path(diary_comment), :method => :post, :data => { :confirm => t(".confirm") } %> + <% else %> + <%= link_to t(".unhide_link"), unhide_diary_comment_path(diary_comment), :method => :post, :data => { :confirm => t(".confirm") } %> + <% end %> + + <% end %> +