X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0625c1effb8f5e2871557439c5ebf7c106db6a1f..c192bd0d40aab2bbabf47c1dd726c366ffa51db3:/app/views/diary_entries/index.html.erb?ds=sidebyside

diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index 1f7a35ae3..96c052da6 100644
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -1,62 +1,52 @@
 <% content_for :heading do %>
-  <div <% if @user %> id="userinformation"<% end %> >
+  <div <% if @user %> id="userinformation"<% end %>>
     <% if @user %>
       <%= user_image @user %>
     <% end %>
-    <h1><%= h(@title) %></h1>
+    <h1><%= @title %></h1>
 
     <ul class='secondary-actions clearfix'>
       <% unless params[:friends] or params[:nearby] -%>
-        <li><%= rss_link_to :action => 'rss', :language => params[:language] %></li>
+        <li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
       <% end -%>
 
-      <% if @user %>
-        <% if @user == current_user %>
-          <div>
-            <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t('.new'), diary_new_path, { :title => t('.new_title') } %></li>
-          </div>
-        <% end %>
-      <% else %>
-        <% if current_user %>
-          <div>
-            <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t('.new'), diary_new_path, { :title => t('.new_title') } %></li>
-          </div>
-        <% end %>
+      <% if @user && @user == current_user || !@user && current_user %>
+        <li><%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
+      <% end %>
+
+      <% if !@user && current_user %>
+        <li><%= link_to t(".my_diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %></li>
       <% end %>
     </ul>
   </div>
 <% end %>
 
 <% if @entries.empty? %>
-  <h4><%= t '.no_entries' %></h4>
+  <h4><%= t ".no_entries" %></h4>
 <% else %>
-  <h4><%= t '.recent_entries' %></h4>
+  <h4><%= t ".recent_entries" %></h4>
 
-  <% if @user %>
-    <%= render :partial => 'diary_entry', :collection => @entries %>
-  <% else %>
-    <%= render :partial => 'diary_index_entry', :collection => @entries %>
-  <% end %>
+  <%= render @entries %>
 
   <div class="pagination">
     <% if @entries.size < @page_size -%>
-      <%= t('.older_entries') %>
+      <%= t(".older_entries") %>
     <% else -%>
-      <%= link_to t('.older_entries'), @params.merge(:page => @page + 1) %>
+      <%= link_to t(".older_entries"), @params.merge(:page => @page + 1) %>
     <% end -%>
 
     |
 
     <% if @page > 1 -%>
-      <%= link_to t('.newer_entries'), @params.merge(:page => @page - 1) %>
+      <%= link_to t(".newer_entries"), @params.merge(:page => @page - 1) %>
     <% else -%>
-      <%= t('.newer_entries') %>
+      <%= t(".newer_entries") %>
     <% end -%>
   </div>
 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>
   <% content_for :auto_discovery_link_tag do -%>
-  <%= auto_discovery_link_tag :rss, :action => 'rss', :language => params[:language] %>
+  <%= auto_discovery_link_tag :rss, :action => "rss", :language => params[:language] %>
   <% end -%>
 <% end -%>