Merge remote-tracking branch 'upstream/pull/1809'

[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 1a8096d134a4b3bd81636eb9ac62eb074126f403..3e8fbe990f54c6ad06ad4ea637b93ab24cc9523b 100644 (file)
--- a/app/views/diary_entry/view.html.erb
+++ b/app/views/diary_entry/view.html.erb
@@ -1,26 +1,37 @@
-<%= user_image @entry.user, :style => "float: right" %>
-
-<h2><%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %></h2>
+<% content_for :heading do %>
+  <div id="userinformation" >
+    <%= user_image @entry.user %>
+    <h2><%= link_to t('.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 %>

 
 <%= render :partial => 'diary_entry', :object => @entry %>
 
 <a id="comments"></a>
 
 <%= render :partial => 'diary_entry', :object => @entry %>
 
 <a id="comments"></a>

-
+<div class='comments'>

 <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
 <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>

-
-<% if_logged_in(:div) do %>
-  <h4 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h4>
+</div>
+<%= if_logged_in(:div) do %>
+  <h3 id="newcomment"><%= t '.leave_a_comment' %></h3>

 
   <%= error_messages_for 'diary_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 %>
-    <br />
-    <br />
-    <%= submit_tag t('diary_entry.view.save_button') %>
+  <%= 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 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 %>
 
   <% end %>
 <% end %>
 

-<% if_not_logged_in(:div) do %>
-  <h4 id="newcomment"><%= 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)) %></h4>
+<%= if_not_logged_in(:div) do %>
+  <h3 id="newcomment"><%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %></h3>

 <% end %>
 <% end %>

+
+<% content_for :auto_discovery_link_tag do -%>
+<%= auto_discovery_link_tag :rss, :action => :rss, :display_name => @entry.user.display_name %>
+<% end -%>