X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4755096a720bf4efe35a4eef23da8bb2b8c97658..f0e3a41726ecee0e772269878d1482081cd98c34:/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 d12942a7b..5079074e8 100644 --- a/app/views/diary_entry/view.html.erb +++ b/app/views/diary_entry/view.html.erb @@ -10,7 +10,11 @@
-<%= render :partial => 'diary_comment', :collection => @entry.visible_comments %> + <% if @reported_comment %> + <%= render :partial => 'diary_comment', :collection => @reported_comment %> + <% else %> + <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %> + <% end %>
<%= if_logged_in(:div) do %>

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

@@ -21,6 +25,11 @@ <%= 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_not_logged_in(:div) do %>