X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/63de62bf04b8813a709aa4d6d05ebb539307cc53..a1cb0f04d476101116087286ff072d3a137355cb:/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 68c8c1266..1be32fd21 100644 --- a/app/views/diary_entry/list.html.erb +++ b/app/views/diary_entry/list.html.erb @@ -1,17 +1,16 @@ -

<%= h(@title) %>

- -<% if @this_user && @this_user.image %> - <%= image_tag url_for_file_column(@this_user, "image") %> +<% if @this_user %> +<%= user_image @this_user, :style => "float: right" %> <% end %> +

<%= h(@title) %>

<% 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', :display_name => @user.display_name}, {:title => t('diary_entry.list.new_title')} %> + <% 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 %> - <% if @user %> - <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => t('diary_entry.list.new_title')} %> + <% 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 %> @@ -23,8 +22,12 @@
- <%= render :partial => 'diary_entry', :collection => @entries %> - + <% 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 %>