X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/03f733c4f4091dc53e391aa74a020681af98a4ff..4d91fe3dd95c1058cb8d24fd4c900223e30b9059:/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 9fbb9ca32..9de2efea5 100644 --- a/app/views/diary_entry/list.html.erb +++ b/app/views/diary_entry/list.html.erb @@ -1,20 +1,19 @@ <% if @this_user %> -<%= user_image @this_user, :style => "float: right" %> + <%= 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 %> @@ -35,8 +34,10 @@
<% end %> +<% unless params[:friends] or params[:nearby] -%> <%= rss_link_to :action => 'rss', :language => params[:language] %> -<% content_for :head do %> +<% content_for :head do -%> <%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %> -<% end %> +<% end -%> +<% end -%>