X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6234436cb8b0439e042a7963e8d45f5313bc437f..d075fc4c1f3e7a17b4c71e7a06fd6cf318e0ef2f:/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..451d849c2 100644 --- a/app/views/diary_entry/view.html.erb +++ b/app/views/diary_entry/view.html.erb @@ -1,26 +1,28 @@ -<%= user_image @entry.user, :style => "float: right" %> +
+ <%= user_image @entry.user %> -

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

+

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

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

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

+ <% if_logged_in(:div) do %> +

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

- <%= error_messages_for 'diary_comment' %> + <%= error_messages_for 'diary_comment' %> - <% form_for :diary_comment, @diary_comment, :url => { :action => 'comment' } do |f| %> - <%= f.text_area :body, :cols => 80, :rows => 5 %> -
-
- <%= submit_tag t('diary_entry.view.save_button') %> + <% form_for :diary_comment, @diary_comment, :url => { :action => 'comment' } do |f| %> + <%= f.text_area :body, :cols => 80, :rows => 5 %> +
+
+ <%= submit_tag t('diary_entry.view.save_button') %> + <% end %> <% 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)) %>

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

+ <% end %> +