X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cb87f02642d0097ebc067ca1f9371dde274a41e3..5bed2178231b783176551d21734d23b7a32f0d16:/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 d6af432fb..8dda82b19 100644 --- a/app/views/diary_entry/list.html.erb +++ b/app/views/diary_entry/list.html.erb @@ -1,7 +1,7 @@ <% content_for :heading do %> -
id="userinformation"<% end %> > - <% if @this_user %> - <%= user_image @this_user %> +
id="userinformation"<% end %> > + <% if @user %> + <%= user_image @user %> <% end %>

<%= h(@title) %>

@@ -10,13 +10,13 @@
  • <%= rss_link_to :action => 'rss', :language => params[:language] %>
  • <% end -%> - <% if @this_user %> - <%= if_user(@this_user) do %> -
  • <%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %>
  • + <% if @user %> + <%= if_user(@user) do %> +
  • <%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('.new_title')} %>
  • <% end %> <% else %> <%= if_logged_in do %> -
  • <%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %>
  • +
  • <%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('.new_title')} %>
  • <% end %> <% end %> @@ -24,11 +24,11 @@ <% end %> <% if @entries.empty? %> -

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

    +

    <%= t '.no_entries' %>

    <% else %> -

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

    +

    <%= t '.recent_entries' %>

    - <% if @this_user %> + <% if @user %> <%= render :partial => 'diary_entry', :collection => @entries %> <% else %> <%= render :partial => 'diary_list_entry', :collection => @entries %> @@ -36,17 +36,17 @@ <% end %>