X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d36fab2913d10bef4eae2cee7c34875f20311af9..dcb25f0c07ef0252fb411be35030ead67f5da5d1:/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 312b7b81a..1bce441b4 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,19 +8,19 @@ <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %> -<% if @user %> +<%= if_logged_in(:div) do %> +

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

-

<%= t 'diary_entry.view.leave_a_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') %> -<% end %> - -<% else %> + <%= error_messages_for 'diary_comment' %> -

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

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