Update some print styles for Leaflet

[rails.git] / 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 c2f748bf124c28600e81a492be4437e13a85e758..9de2efea541efaa8d068a9154a6acada9897cd51 100644 (file)
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -1,21 +1,19 @@
-<h2><%= h(@title) %></h2>
-
-<% if @this_user && @this_user.image %>
- <%= image_tag url_for_file_column(@this_user, "image") %>
+<% if @this_user %>
+  <%= user_image @this_user %>

 <% end %>
 
 <% end %>
 

+<h2><%= h(@title) %></h2>

 
 <% if @this_user %>
 
 <% if @this_user %>

-  <% if @user == @this_user %>
-    <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => t('diary_entry.list.new_title')} %>
+  <%= 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 %>
   <% end %>
 <% else %>

-  <% if @user %>
-    <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => t('diary_entry.list.new_title')} %>
+  <%= 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 %>
 
   <% end %>
 <% end %>
 

-

 <% if @entries.empty? %>
   <p><%= t 'diary_entry.list.no_entries' %></p>
 <% else %>
 <% if @entries.empty? %>
   <p><%= t 'diary_entry.list.no_entries' %></p>
 <% else %>


@@ -23,17 +21,23 @@
 
   <hr />
 
 
   <hr />
 

-  <%= render :partial => 'diary_entry', :collection => @entries %>
-       
-  <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next } if @entry_pages.current.next %>
+  <% if @this_user %>
+    <%= render :partial => 'diary_entry', :collection => @entries %>
+  <% else %>
+    <%= render :partial => 'diary_list_entry', :collection => @entries %>
+  <% end %>
+
+  <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next, :language => params[:language] } if @entry_pages.current.next %>

   <% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %>
   <% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %>

-  <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous } if @entry_pages.current.previous %>
+  <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %>

 
   <br />
 <% end %>
 
 
   <br />
 <% end %>
 

+<% unless params[:friends] or params[:nearby] -%>

 <%= rss_link_to :action => 'rss', :language => params[:language] %>
 
 <%= rss_link_to :action => 'rss', :language => params[:language] %>
 

-<% content_for :head do %>
-<%= auto_discovery_link_tag :atom, :action => 'rss' %>
-<% end %>
+<% content_for :head do -%>
+<%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>
+<% end -%>
+<% end -%>