X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/edaddbedaec78a252e988e2271962407e64483fd..e3de1c457205e281fcae31e42fd8651b37a4c214:/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 7ff35b494..d12942a7b 100644 --- a/app/views/diary_entry/view.html.erb +++ b/app/views/diary_entry/view.html.erb @@ -1,24 +1,32 @@ -

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

+<% content_for :heading do %> +
+ <%= user_image @entry.user %> +

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

+

<%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %>

+
+<% end %> <%= render :partial => 'diary_entry', :object => @entry %> - -<%= render :partial => 'diary_comment', :collection => @entry.diary_comments %> - -<% if @user %> - -

<%= 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') %> +
+<%= render :partial => 'diary_comment', :collection => @entry.visible_comments %> +
+<%= if_logged_in(:div) do %> +

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

+ + <%= error_messages_for 'diary_comment' %> + + <%= 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 %> -<% else %> - -

<%= 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 %> + +<% content_for :auto_discovery_link_tag do -%> +<%= auto_discovery_link_tag :rss, :action => :rss, :display_name => @entry.user.display_name %> +<% end -%>