X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/89bd91e7d80531e5344427cdf2f98c58e8203737..a693fc9a3c7f35a567dc3dd07b16adf3991c441c:/app/views/diary_entry/view.html.erb

diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb
index 1a8096d13..7073aa740 100644
--- a/app/views/diary_entry/view.html.erb
+++ b/app/views/diary_entry/view.html.erb
@@ -1,4 +1,4 @@
-<%= user_image @entry.user, :style => "float: right" %>
+<%= user_image @entry.user %>
 
 <h2><%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %></h2>
 
@@ -8,12 +8,12 @@
 
 <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
 
-<% if_logged_in(:div) do %>
+<%= if_logged_in(:div) do %>
   <h4 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h4>
 
   <%= error_messages_for 'diary_comment' %>
 
-  <% form_for :diary_comment, @diary_comment, :url => { :action => 'comment' } do |f| %>
+  <%= form_for DiaryComment.new, :url => { :action => 'comment' } do |f| %>
     <%= f.text_area :body, :cols => 80, :rows => 5 %>
     <br />
     <br />
@@ -21,6 +21,6 @@
   <% end %>
 <% end %>
 
-<% if_not_logged_in(:div) do %>
-  <h4 id="newcomment"><%= t("diary_entry.view.login_to_leave_a_comment", :login_link => link_to(t("diary_entry.view.login"), :controller => 'user', :action => 'login', :referer => request.request_uri)) %></h4>
+<%= if_not_logged_in(:div) do %>
+  <h4 id="newcomment"><%= raw t("diary_entry.view.login_to_leave_a_comment", :login_link => link_to(t("diary_entry.view.login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %></h4>
 <% end %>