Fix stubbing of hostip requests

[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 451d849c2d847e67576e95facdd603ad1af85794..9871da8ccfa09b5d9d8a8273e105302be5ccb521 100644 (file)
--- a/app/views/diary_entry/view.html.erb
+++ b/app/views/diary_entry/view.html.erb
@@ -1,28 +1,39 @@
-<div id="diary_entry">
-  <%= user_image @entry.user %>
-
-  <h2><%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %></h2>
-
-  <%= render :partial => 'diary_entry', :object => @entry %>
-
-  <a id="comments"></a>
+<% 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>
+<div class='comments'>
+<%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
+</div>
 
-  <%= 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 current_user %>
+    <h3 id="newcomment"><%= t '.leave_a_comment' %></h3>
 
     <%= 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 %>
-  <% 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 @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>
+    <% else %>
+      <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 %>
+  <% else %>
+    <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 %>
 </div>
+
+<% content_for :auto_discovery_link_tag do -%>
+<%= auto_discovery_link_tag :rss, :action => :rss, :display_name => @entry.user.display_name %>
+<% end -%>