X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ae4487921350e141efed42fdf7cd3fd70d72bc97..d66b4b3d2f379ed61ef2b33bb2b0507267827f98:/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 5079074e8..9871da8cc 100644 --- a/app/views/diary_entry/view.html.erb +++ b/app/views/diary_entry/view.html.erb @@ -1,7 +1,7 @@ <% content_for :heading do %>
<%= user_image @entry.user %> -

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

+

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

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

<% end %> @@ -10,31 +10,29 @@
- <% if @reported_comment %> - <%= render :partial => 'diary_comment', :collection => @reported_comment %> - <% else %> - <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %> - <% end %> +<%= 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 %> - <% if current_user and @entry.subscribers.exists?(current_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 current_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 current_user %> +

<%= t '.leave_a_comment' %>

-<%= 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 %> + <%= 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('.save_button') %> + <% end %> + <% if @entry.subscribers.exists?(current_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 %>
+ <% else %> +
<%= 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 %> + <% else %> +

<%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".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 %>