Link to diary comments using anchors, rather than showing them alone

[rails.git] / 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 8bc2b64693aa34ecb90339c83d54d46ae8c960ea..3c2264d3e58fb849a8793ef1e0aee9da806cd315 100644 (file)
--- a/app/views/diary_entry/view.html.erb
+++ b/app/views/diary_entry/view.html.erb
@@ -10,11 +10,7 @@
 
 <a id="comments"></a>
 <div class='comments'>
-  <% 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 %>
 </div>
 <%= if_logged_in(:div) do %>
   <h3 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h3>
@@ -25,6 +21,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) %>
+    <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.unsubscribe'), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
+  <% elsif current_user %>
+    <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
+  <% end %>
 <% end %>
 
 <%= if_not_logged_in(:div) do %>