Don't try and fix the height of the search box

[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 e3dac598955f03659d7faa56c3e0a84f4ad58cd9..9de2efea541efaa8d068a9154a6acada9897cd51 100644 (file)
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -1,43 +1,43 @@
-<div id="diary_list">
-  <% if @this_user %>
-    <%= user_image @this_user %>
-  <% end %>
+<% if @this_user %>
+  <%= user_image @this_user %>
+<% end %>
 
-  <h2><%= h(@title) %></h2>
+<h2><%= h(@title) %></h2>
 
-  <% if @this_user %>
-    <% 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 %>
-    <% 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 %>
+<% if @this_user %>
+  <%= 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 %>
+  <%= 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 %>
 
-  <% if @entries.empty? %>
-    <p><%= t 'diary_entry.list.no_entries' %></p>
-  <% else %>
-    <p><%= t 'diary_entry.list.recent_entries' %></p>
+<% if @entries.empty? %>
+  <p><%= t 'diary_entry.list.no_entries' %></p>
+<% else %>
+  <p><%= t 'diary_entry.list.recent_entries' %></p>
 
-    <hr />
+  <hr />
 
-    <% if @this_user %>
-      <%= render :partial => 'diary_entry', :collection => @entries %>
-    <% else %>
-      <%= render :partial => 'diary_list_entry', :collection => @entries %>
-    <% end %>
+  <% 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 %>
-    <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %>
+  <%= 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 %>
+  <%= 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 %>
 
-  <%= rss_link_to :action => 'rss', :language => params[:language] %>
-</div>
+<% unless params[:friends] or params[:nearby] -%>
+<%= rss_link_to :action => 'rss', :language => params[:language] %>
 
-<% content_for :head do %>
+<% content_for :head do -%>
 <%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>
-<% end %>
+<% end -%>
+<% end -%>