Allow (un)subscribing discussions also when changeset still open

[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 5735188a7473ac6014cec17d1f6cfbbbd9e2961b..3c2264d3e58fb849a8793ef1e0aee9da806cd315 100644 (file)
--- a/app/views/diary_entry/view.html.erb
+++ b/app/views/diary_entry/view.html.erb
@@ -2,6 +2,7 @@
   <div id="userinformation" >
     <%= user_image @entry.user %>
     <h2><%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %></h2>
   <div id="userinformation" >
     <%= user_image @entry.user %>
     <h2><%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %></h2>

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

   </div>
 <% end %>
 
   </div>
 <% end %>
 


@@ -20,8 +21,17 @@
     <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %>
     <%= submit_tag t('diary_entry.view.save_button') %>
   <% end %>
     <%= 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 %>
   <h3 id="newcomment"><%= 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)) %></h3>
 <% end %>
 
 <%= if_not_logged_in(:div) do %>
   <h3 id="newcomment"><%= 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)) %></h3>

-<% end %>
\ No newline at end of file
+<% end %>
+
+<% content_for :auto_discovery_link_tag do -%>
+<%= auto_discovery_link_tag :rss, :action => :rss, :display_name => @entry.user.display_name %>
+<% end -%>