X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6f73468f188630be503cdb19b00be7d1ea888785..c6710bba542d3c4d9d83967049fa9bccdc3f9fbf:/app/views/diary_entry/view.html.erb?ds=sidebyside diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb index c3e49a227..7073aa740 100644 --- a/app/views/diary_entry/view.html.erb +++ b/app/views/diary_entry/view.html.erb @@ -1,6 +1,6 @@ -<%= user_image @entry.user, :style => "float: right" %> +<%= user_image @entry.user %> -

<%= t 'diary_entry.view.user_title', :user => h(@entry.user.display_name) %>

+

<%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %>

<%= render :partial => 'diary_entry', :object => @entry %> @@ -8,12 +8,12 @@ <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %> -<% if_logged_in(:div) do %> +<%= if_logged_in(:div) do %>

<%= t 'diary_entry.view.leave_a_comment' %>

<%= 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 %>

@@ -21,6 +21,6 @@ <% end %> <% end %> -<% if_not_logged_in(:div) do %> -

<%= 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)) %>

+<%= if_not_logged_in(:div) do %> +

<%= 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)) %>

<% end %>