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

[rails.git] / app / views / diary_entry / _diary_entry.html.erb

diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb
index c17cf05e6ee0e5c2dffec2aac052d289652d2295..de62e8e1a8255fb2a7373cc8fd07560d16f0f74b 100644 (file)
--- a/app/views/diary_entry/_diary_entry.html.erb
+++ b/app/views/diary_entry/_diary_entry.html.erb
@@ -1,12 +1,18 @@
 <div class='diary_post'>
   <div class='post_heading clearfix'>
 <div class='diary_post'>
   <div class='post_heading clearfix'>

-    <% if !@this_user %>
+    <% if !@user %>

       <%= user_thumbnail diary_entry.user %>
     <% end %>
 
       <%= user_thumbnail diary_entry.user %>
     <% end %>
 

-    <h2><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></h2>
+    <h2><%= link_to h(diary_entry.title), diary_entry_path(diary_entry.user, diary_entry) %></h2>
+
+    <small class='deemphasize'>
+      <%= raw(t '.posted_by', :link_user => (link_to h(diary_entry.user.display_name), user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :display_name => nil, :language => diary_entry.language_code)) %>
+    </small>
+

   </div>
   </div>

-  <div xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">
+
+  <div class="richtext" xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">

     <%= diary_entry.body.to_html %>
   </div>
 
     <%= diary_entry.body.to_html %>
   </div>
 


@@ -14,23 +20,27 @@
     <%= render :partial => "location", :object => diary_entry %>
   <% end %>
 
     <%= render :partial => "location", :object => diary_entry %>
   <% end %>
 

-  <small class='deemphasize'>
-    <%= raw(t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at, :format => :friendly), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :display_name => nil, :language => diary_entry.language_code)) %>
-  </small>
-

   <ul class='secondary-actions clearfix'>
     <% if params[:action] == 'list' %>
   <ul class='secondary-actions clearfix'>
     <% if params[:action] == 'list' %>

-      <li><%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %></li>
-      <li><%= link_to t('diary_entry.diary_entry.reply_link'), :controller => 'message', :action => 'new', :display_name => diary_entry.user.display_name, :title => "Re: #{diary_entry.title}" %></li>
-      <li><%= link_to t('diary_entry.diary_entry.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %></li>
+      <li><%= link_to t('.comment_link'), diary_entry_path(diary_entry.user, diary_entry, :anchor => 'newcomment') %></li>
+      <li><%= link_to t('.reply_link'), new_message_path(diary_entry.user, :message => { :title => "Re: #{diary_entry.title}" }) %></li>
+      <li><%= link_to t('.comment_count', :count => diary_entry.visible_comments.count), diary_entry_path(diary_entry.user, diary_entry, :anchor => 'comments') %></li>
+    <% end %>
+
+    <% if current_user && current_user == diary_entry.user %>
+      <li><%= link_to t('.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></li>

     <% end %>
 
     <% end %>
 

-    <%= if_user(diary_entry.user, :li) do %>
-      <%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>
+    <% if current_user and diary_entry.user != current_user %>
+      <li>
+        <%= report_link(t(".report"), diary_entry) %>
+      </li>

     <% end %>
 
     <% end %>
 

-    <%= if_administrator(:li) do %>
-      <%= link_to t('diary_entry.diary_entry.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('diary_entry.diary_entry.confirm') } %>
+    <% if current_user && current_user.administrator? %>
+      <li>
+        <%= link_to t('.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('.confirm') } %>
+      </li>

     <% end %>
   </ul>
 </div>
     <% end %>
   </ul>
 </div>