X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f2f3fbb1f19ad3cb26a3623d7af3d90e1f7a7caa..10999cfc5e6f64f1b6d81ddb4a2f751c694bcbc5:/app/views/diary_entries/_diary_entry.html.erb?ds=sidebyside diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb index 50b49c37f..946c6ce17 100644 --- a/app/views/diary_entries/_diary_entry.html.erb +++ b/app/views/diary_entries/_diary_entry.html.erb @@ -1,18 +1,21 @@ -
+
<% if !@user %> <%= user_thumbnail diary_entry.user %> <% end %> -

<%= link_to h(diary_entry.title), diary_entry_path(diary_entry.user, diary_entry) %>

+

<%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %>

- - <%= raw(t(".posted_by", :link_user => (link_to h(diary_entry.user.display_name), user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to h(diary_entry.language.name), :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code))) %> + + <%= t(".posted_by_html", :link_user => (link_to diary_entry.user.display_name, user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to diary_entry.language.name, :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code)) %> + <% if (l(diary_entry.updated_at, :format => :blog) != l(diary_entry.created_at, :format => :blog)) %> + <%= t(".updated_at_html", :updated => l(diary_entry.updated_at, :format => :blog)) %> + <% end %>
-
+
<%= diary_entry.body.to_html %>
@@ -37,7 +40,7 @@ <% end %> - <% if current_user && current_user.administrator? %> + <% if can? :hide, DiaryEntry %>
  • <% if diary_entry.visible %> <%= link_to t(".hide_link"), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t(".confirm") } %>