X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3e8d8092500a3713e8dfbb4fd61fd8a95d067d20..d8a504d8dbc7262dee96678e98d017d918dfa111:/app/views/diary_entry/view.html.erb?ds=sidebyside

diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb
index 312b7b81a..5735188a7 100644
--- a/app/views/diary_entry/view.html.erb
+++ b/app/views/diary_entry/view.html.erb
@@ -1,26 +1,27 @@
-<%= user_image @entry.user, :style => "float: right" %>
-
-<h2><%= t 'diary_entry.view.user_title', :user => h(@entry.user.display_name) %></h2>
+<% content_for :heading do %>
+  <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>
+<% end %>
 
 <%= render :partial => 'diary_entry', :object => @entry %>
 
 <a id="comments"></a>
-
+<div class='comments'>
 <%= 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>
 
-<% if @user %>
+  <%= error_messages_for 'diary_comment' %>
 
-<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') %>
+  <%= form_for :diary_comment, :url => { :action => 'comment' } do |f| %>
+    <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %>
+    <%= submit_tag t('diary_entry.view.save_button') %>
+  <% end %>
 <% end %>
 
-<% else %>
-
-<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 %>
+<%= 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