X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/12c1d5e6c05813a0697724277b4d8529a1a7c240..8a020b3ec727b8c9fa4d819855469dd348e58ee7:/app/views/diary_entries/_diary_entry.html.erb?ds=inline diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb index 68b0a265a..62e701d14 100644 --- a/app/views/diary_entries/_diary_entry.html.erb +++ b/app/views/diary_entries/_diary_entry.html.erb @@ -1,26 +1,5 @@ -
-
- <% if @user %> -

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

- <% else %> -
-
- <%= user_thumbnail diary_entry.user %> -
-
-

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

-
-
- <% end %> - - - <%= 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 %> - - -
+
+ <%= render :partial => "diary_entry_heading", :object => diary_entry, :as => "diary_entry" %>
<%= diary_entry.body.to_html %> @@ -35,11 +14,17 @@ <% 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") %>
  • +
  • + <% if diary_entry.visible_comments.count > 0 %> + <%= link_to t(".comment_count", :count => diary_entry.visible_comments.count), diary_entry_path(diary_entry.user, diary_entry, :anchor => "comments") %> + <% else %> + <%= link_to t(".no_comments"), diary_entry_path(diary_entry.user, diary_entry, :anchor => "comments") %> + <% end %> +
  • <% end %> - <% if current_user && current_user == diary_entry.user %> -
  • <%= link_to t(".edit_link"), :action => "edit", :display_name => diary_entry.user.display_name, :id => diary_entry.id %>
  • + <% if can?(:edit, diary_entry) %> +
  • <%= link_to t(".edit_link"), edit_diary_entry_path(diary_entry.user, diary_entry) %>
  • <% end %> <% if current_user and diary_entry.user != current_user %> @@ -51,12 +36,12 @@ <% 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") } %> + <%= 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(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t(".confirm") } %> + <%= link_to t(".unhide_link"), unhide_diary_entry_path(diary_entry.user, diary_entry), :method => :post, :data => { :confirm => t(".confirm") } %> <% end %>
  • <% end %> -
    +