Merge branch 'master' into openstreetbugs

[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 9fbb9ca32aba72d812955446cb3ef04ca548b1f4..03a326d16bbf7f9dee36245148f4f84ed09b609b 100644 (file)
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -1,20 +1,19 @@
 <% if @this_user %>
 <% if @this_user %>

-<%= user_image @this_user, :style => "float: right" %>
+  <%= user_image @this_user %>

 <% end %>
 
 <h2><%= h(@title) %></h2>
 
 <% if @this_user %>
 <% end %>
 
 <h2><%= h(@title) %></h2>
 
 <% if @this_user %>

-  <% if @user == @this_user %>
+  <%= 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 @user %>
+  <%= 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 %>
 

-

 <% if @entries.empty? %>
   <p><%= t 'diary_entry.list.no_entries' %></p>
 <% else %>
 <% if @entries.empty? %>
   <p><%= t 'diary_entry.list.no_entries' %></p>
 <% else %>