X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3af16f6337b52546297e7e09a1aba9b0e1df7e15..c5fc9f0e7e93088c599ae0d8540ee0117f277d6d:/app/views/diary_entries/show.html.erb diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb index 57bd967b4..1cc1e1c53 100644 --- a/app/views/diary_entries/show.html.erb +++ b/app/views/diary_entries/show.html.erb @@ -1,16 +1,16 @@ <% content_for :heading do %> -
+
<%= user_image @entry.user %>

<%= link_to t(".user_title", :user => h(@entry.user.display_name)), :action => :index %>

<%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %>

<% end %> -<%= render :partial => "diary_entry", :object => @entry %> +<%= render @entry %>
-<%= render :partial => "diary_comment", :collection => @entry.visible_comments %> +<%= render :partial => "diary_comment", :collection => @comments %>
@@ -19,9 +19,9 @@ <%= error_messages_for "diary_comment" %> - <%= form_for :diary_comment, :url => { :action => "comment" } do |f| %> + <%= form_for @entry.comments.new, :url => { :action => "comment" } do |f| %> <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %> - <%= submit_tag t(".save_button") %> + <%= f.submit %> <% end %> <% if @entry.subscribers.exists?(current_user.id) %>
<%= link_to t("javascripts.changesets.show.unsubscribe"), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %>