id="userinformation"<% end %>>
<% if @user %>
<%= user_image @user %>
<% end %>
-
<%= h(@title) %>
+
<%= @title %>
<% unless params[:friends] or params[:nearby] -%>
@@ -12,15 +12,11 @@
<% 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") %>
-
+ - <%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_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") %>
-
+ - <%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %>
<% end %>
<% end %>
@@ -32,11 +28,7 @@
<% else %>
<%= t ".recent_entries" %>
- <% if @user %>
- <%= render :partial => "diary_entry", :collection => @entries %>
- <% else %>
- <%= render :partial => "diary_index_entry", :collection => @entries %>
- <% end %>
+ <%= render @entries %>