Merge branch 'master' into openstreetbugs

[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 312b7b81a75166a2f533f4e7184ba77a15ca8516..3bc9323e3352b006dfbe6670937dfa601130f160 100644 (file)
--- a/app/views/diary_entry/view.html.erb
+++ b/app/views/diary_entry/view.html.erb
@@ -1,6 +1,6 @@
-<%= user_image @entry.user, :style => "float: right" %>
+<%= user_image @entry.user %>

 
 

-<h2><%= t 'diary_entry.view.user_title', :user => h(@entry.user.display_name) %></h2>
+<h2><%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %></h2>

 
 <%= render :partial => 'diary_entry', :object => @entry %>
 
 
 <%= render :partial => 'diary_entry', :object => @entry %>
 


@@ -8,19 +8,19 @@
 
 <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
 
 
 <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
 

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

 
 

-<h4 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h4>
-<%= 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') %>
-<% end %>
-
-<% else %>
+  <%= error_messages_for 'diary_comment' %>

 
 

-<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>
+  <% 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') %>
+  <% 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>

 <% end %>
 <% end %>