X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/88ba316abeecffccd1cb51c63ce5594c95023624..0b7435ab32b3271ae000894f6798cc087b3c058c:/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 6616417a1..d4ee530d7 100644
--- a/app/views/diary_entries/_diary_entry.html.erb
+++ b/app/views/diary_entries/_diary_entry.html.erb
@@ -1,21 +1,7 @@
-
-
- <% if !@user %>
- <%= user_thumbnail diary_entry.user %>
- <% end %>
+
+ <%= render :partial => "diary_entry_heading", :object => diary_entry, :as => "diary_entry" %>
- <%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %>
-
-
- <%= 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 %>
@@ -23,31 +9,39 @@
<%= render :partial => "location", :object => diary_entry %>
<% end %>
-
- <% if params[:action] == 'index' %>
- - <%= link_to t(".comment_link"), diary_entry_path(diary_entry.user, diary_entry, :anchor => "newcomment") %>
- - <%= link_to t(".reply_link"), new_message_path(diary_entry.user, :message => { :title => "Re: #{diary_entry.title}" }) %>
- - <%= link_to t(".comment_count", :count => diary_entry.visible_comments.count), diary_entry_path(diary_entry.user, diary_entry, :anchor => "comments") %>
- <% end %>
+
+ <% if can? :hide, DiaryEntry %>
+
+ <% if diary_entry.visible %>
+ <%= link_to t(".hide_link"), hide_diary_entry_path(diary_entry.user, diary_entry), :method => :post, :data => { :confirm => t(".confirm") } %>
+ <% else %>
+ <%= link_to t(".unhide_link"), unhide_diary_entry_path(diary_entry.user, diary_entry), :method => :post, :data => { :confirm => t(".confirm") } %>
+ <% end %>
+
+ <% end %>
+
+
+