X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/61123eaeb4c59fc4a7cc64fad8fe4bc2645da38d..4b17b92da09820dd7bf61a640fd37458b82b06fe:/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 c2f748bf1..9fbb9ca32 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')} %> + <%= 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')} %> + <%= 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,11 +22,15 @@
- <%= render :partial => 'diary_entry', :collection => @entries %> - - <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next } if @entry_pages.current.next %> + <% 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 } if @entry_pages.current.previous %> + <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %>
<% end %> @@ -35,5 +38,5 @@ <%= rss_link_to :action => 'rss', :language => params[:language] %> <% content_for :head do %> -<%= auto_discovery_link_tag :atom, :action => 'rss' %> +<%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %> <% end %>