X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/198281ffa9c26d7c18ef0bcf293f2c22dd37fcd2..d075fc4c1f3e7a17b4c71e7a06fd6cf318e0ef2f:/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 9fbb9ca32..e3dac5989 100644
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -1,41 +1,42 @@
-<% if @this_user %>
-<%= user_image @this_user, :style => "float: right" %>
-<% end %>
-
-<h2><%= h(@title) %></h2>
-
-<% if @this_user %>
-  <% if @user == @this_user %>
-    <%= 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 %>
-    <%= 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')} %>
+<div id="diary_list">
+  <% if @this_user %>
+    <%= user_image @this_user %>
   <% end %>
-<% end %>
-
 
-<% if @entries.empty? %>
-  <p><%= t 'diary_entry.list.no_entries' %></p>
-<% else %>
-  <p><%= t 'diary_entry.list.recent_entries' %></p>
-
-  <hr />
+  <h2><%= h(@title) %></h2>
 
   <% if @this_user %>
-    <%= render :partial => 'diary_entry', :collection => @entries %>
+    <% 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 %>
-    <%= render :partial => 'diary_list_entry', :collection => @entries %>
+    <% 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 t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next, :language => params[:language] } if @entry_pages.current.next %>
-  <% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %>
-  <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %>
+  <% if @entries.empty? %>
+    <p><%= t 'diary_entry.list.no_entries' %></p>
+  <% else %>
+    <p><%= t 'diary_entry.list.recent_entries' %></p>
+
+    <hr />
 
-  <br />
-<% end %>
+    <% if @this_user %>
+      <%= render :partial => 'diary_entry', :collection => @entries %>
+    <% else %>
+      <%= render :partial => 'diary_list_entry', :collection => @entries %>
+    <% end %>
+
+    <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next, :language => params[:language] } if @entry_pages.current.next %>
+    <% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %>
+    <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %>
+
+    <br />
+  <% end %>
 
-<%= rss_link_to :action => 'rss', :language => params[:language] %>
+  <%= rss_link_to :action => 'rss', :language => params[:language] %>
+</div>
 
 <% content_for :head do %>
 <%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>