X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/17a7c69e8dfefb5dda2a9f57d6ea3c879d4568f4..69d02c624fe077cff0c39c3c8c658d8407eac278:/app/views/diary_entry/list.html.erb?ds=sidebyside diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb index 0bc17d2bb..a78b41a4f 100644 --- a/app/views/diary_entry/list.html.erb +++ b/app/views/diary_entry/list.html.erb @@ -1,21 +1,19 @@ -

<%= h(@title) %>

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

<%= h(@title) %>

<% 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 %> - <% 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 %> - <% if @entries.empty? %>

<%= t 'diary_entry.list.no_entries' %>

<% else %> @@ -23,8 +21,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 %>