X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7ce40eeb3813aaba6eabec1e134cbe98e4e6b548..f4239f8fc5d0e89da2eff4132332fdf0efdaf62a:/app/views/diary_entries/index.html.erb
diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index 4e5dc994d..96c052da6 100644
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -3,25 +3,19 @@
<% if @user %>
<%= user_image @user %>
<% end %>
-
<%= h(@title) %>
+ <%= @title %>
<% unless params[:friends] or params[:nearby] -%>
- <%= rss_link_to :action => "rss", :language => params[:language] %>
<% end -%>
- <% if @user %>
- <% if @user == current_user %>
-
-
- <%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t(".new"), diary_new_path, :title => t(".new_title") %>
-
- <% end %>
- <% else %>
- <% if current_user %>
-
-
- <%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t(".new"), diary_new_path, :title => t(".new_title") %>
-
- <% end %>
+ <% if @user && @user == current_user || !@user && current_user %>
+ - <%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %>
+ <% end %>
+
+ <% if !@user && current_user %>
+ - <%= link_to t(".my_diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %>
<% end %>
@@ -32,11 +26,7 @@
<% else %>
<%= t ".recent_entries" %>
- <% if @user %>
- <%= render :partial => "diary_entry", :collection => @entries %>
- <% else %>
- <%= render :partial => "diary_index_entry", :collection => @entries %>
- <% end %>
+ <%= render @entries %>