X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ed54379218d21b9bd52933903e8cb504a15dfe7e..80d27a7fae408e22300723b746666540da0360b8:/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 63d43158d..6a2a21abc 100644 --- a/app/views/diary_entry/view.html.erb +++ b/app/views/diary_entry/view.html.erb @@ -1,26 +1,37 @@ -<%= user_image @entry.user %> - -

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

+<% 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.visible_comments %> - +
<%= 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 %> -
-
+ <%= 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 %> + <% if @user and @entry.subscribers.exists?(@user.id) %> +
<%= link_to t('javascripts.changesets.show.unsubscribe'), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %>
+ <% elsif @user %> +
<%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %>
+ <% 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)) %>

+

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