X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0c79686f3cef86330d0ab6bbef2a9e2275ac93ac..928465764e52407884b35e31a08bf9241e651269:/app/views/diary_entries/show.html.erb?ds=sidebyside diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb index 0216aa447..d8f4cd8f5 100644 --- a/app/views/diary_entries/show.html.erb +++ b/app/views/diary_entries/show.html.erb @@ -6,11 +6,11 @@ <% 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 %>
@@ -29,7 +29,7 @@
<%= link_to t("javascripts.changesets.show.subscribe"), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %>
<% end %> <% else %> -

<%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".login"), :controller => "users", :action => "login", :referer => request.fullpath)) %>

+

<%= t(".login_to_leave_a_comment_html", :login_link => link_to(t(".login"), :controller => "users", :action => "login", :referer => request.fullpath)) %>

<% end %>