Merge remote-tracking branch 'upstream/pull/1866'

[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 e6e304ead91930d5ccd9b96b3baa569d3b77718f..2d9a4b1671f98e90d4726e2b9669c6e327e9d94d 100644 (file)
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -11,12 +11,16 @@
       <% end -%>
 
       <% if @user %>
-        <%= if_user(@user) do %>
-          <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %></li>
+        <% if @user == current_user %>
+          <div>
+            <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('.new_title')} %></li>
+          </div>
         <% end %>
       <% else %>
-        <%= if_logged_in do %>
-          <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %></li>
+        <% if current_user %>
+          <div>
+            <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('.new_title')} %></li>
+          </div>
         <% end %>
       <% end %>
     </ul>
@@ -24,9 +28,9 @@
 <% end %>
 
 <% if @entries.empty? %>
-  <h4><%= t 'diary_entry.list.no_entries' %></h4>
+  <h4><%= t '.no_entries' %></h4>
 <% else %>
-  <h4><%= t 'diary_entry.list.recent_entries' %></h4>
+  <h4><%= t '.recent_entries' %></h4>
 
   <% if @user %>
     <%= render :partial => 'diary_entry', :collection => @entries %>
@@ -36,17 +40,17 @@
 
   <div class="pagination">
     <% if @entries.size < @page_size -%>
-      <%= t('diary_entry.list.older_entries') %>
+      <%= t('.older_entries') %>
     <% else -%>
-      <%= link_to t('diary_entry.list.older_entries'), @params.merge(:page => @page + 1 ) %>
+      <%= link_to t('.older_entries'), @params.merge(:page => @page + 1 ) %>
     <% end -%>
 
     |
 
     <% if @page > 1 -%>
-      <%= link_to t('diary_entry.list.newer_entries'), @params.merge(:page => @page - 1) %>
+      <%= link_to t('.newer_entries'), @params.merge(:page => @page - 1) %>
     <% else -%>
-      <%= t('diary_entry.list.newer_entries') %>
+      <%= t('.newer_entries') %>
     <% end -%>
   </div>
 <% end %>