This simply moves GPS Traces to the left bar

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

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


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

-<% if_logged_in(:div) do %>
+<%= if_logged_in(:div) do %>

   <h4 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h4>
 
   <%= 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 %>
+  <%= form_for :diary_comment, :url => { :action => 'comment' } do |f| %>
+    <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %>

     <br />
     <br />
     <%= submit_tag t('diary_entry.view.save_button') %>
   <% end %>
 <% end %>
 
     <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>
+<%= if_not_logged_in(:div) do %>
+  <h4 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)) %></h4>

 <% end %>
 <% end %>