This simply moves GPS Traces to the left bar

[rails.git] / app / views / diary_entry / list.html.erb

diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb
index a78b41a4f5039f2f7a1e1ddd7086f7595c1334f4..9de2efea541efaa8d068a9154a6acada9897cd51 100644 (file)
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -5,11 +5,11 @@
 <h2><%= h(@title) %></h2>
 
 <% if @this_user %>
 <h2><%= h(@title) %></h2>
 
 <% if @this_user %>

-  <% if_user(@this_user) do %>
+  <%= if_user(@this_user) do %>

     <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %>
   <% end %>
 <% else %>
     <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %>
   <% end %>
 <% else %>

-  <% if_logged_in do %>
+  <%= if_logged_in do %>

     <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %>
   <% end %>
 <% end %>
     <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %>
   <% end %>
 <% end %>


@@ -34,8 +34,10 @@
   <br />
 <% end %>
 
   <br />
 <% end %>
 

+<% unless params[:friends] or params[:nearby] -%>

 <%= rss_link_to :action => 'rss', :language => params[:language] %>
 
 <%= rss_link_to :action => 'rss', :language => params[:language] %>
 

-<% content_for :head do %>
+<% content_for :head do -%>

 <%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>
 <%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>

-<% end %>
+<% end -%>
+<% end -%>