cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add user images to lists of diary entries.

Browse source
This commit is contained in:
Tom Hughes 2010-02-28 09:01:19 +00:00
parent 6758efb10f
commit 198281ffa9
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/diary_entry/_diary_list_entry.html.erb Normal file
View file

@ -0,0 +1,2 @@
<%= user_thumbnail diary_list_entry.user, :style => "float: right" %>
<%= render :partial => "diary_entry", :object => diary_list_entry %>

15
app/views/diary_entry/list.html.erb
View file

@ -1,9 +1,8 @@
<h2><%= h(@title) %></h2> <% if @this_user %>
<%= user_image @this_user, :style => "float: right" %>
<% if @this_user && @this_user.image %>
<%= image_tag url_for_file_column(@this_user, "image") %>
<% end %> <% end %>
<h2><%= h(@title) %></h2>
<% if @this_user %> <% if @this_user %>
<% if @user == @this_user %> <% if @user == @this_user %>
@ -23,8 +22,12 @@
<hr /> <hr />
<%= 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 %> <%= 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 %> <% 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 %> <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %>