X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ed54379218d21b9bd52933903e8cb504a15dfe7e..7377cb63939f8743ca31e67ea3965c2b15d20057:/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 6ab7aaf48..930f20e5e 100644
--- a/app/views/diary_entry/_diary_entry.html.erb
+++ b/app/views/diary_entry/_diary_entry.html.erb
@@ -1,30 +1,46 @@
-<%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>
+
+
+ <% if !@user %>
+ <%= user_thumbnail diary_entry.user %>
+ <% end %>
-
- <%= raw(htmlize(diary_entry.body)) %>
-
+
<%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>
+
+
+ <%= 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)) %>
+
+
+
+
+
+ <%= diary_entry.body.to_html %>
+
+
+ <% if diary_entry.latitude and diary_entry.longitude %>
+ <%= render :partial => "location", :object => diary_entry %>
+ <% end %>
-<% if diary_entry.latitude and diary_entry.longitude %>
- <%= render :partial => "location", :object => diary_entry %>
-
-<% end %>
-
-<%= 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', :language => diary_entry.language_code)) %>
-
-<% if params[:action] == 'list' %>
-
- <%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %>
- |
- <%= 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}" %>
- |
- <%= 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' %>
-<% end %>
-<%= if_user(diary_entry.user, :span) do %>
- | <%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>
-<% end %>
-<%= if_administrator(:span) do %>
- | <%= link_to t('diary_entry.diary_entry.hide_link'), {:action => 'hide', :display_name => diary_entry.user.display_name, :id => diary_entry.id}, {:confirm => t('diary_entry.diary_entry.confirm')} %>
-<% end %>
-
-
-
+
+ <% if params[:action] == 'list' %>
+ - <%= link_to t('.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %>
+ - <%= link_to t('.reply_link'), new_message_path(diary_entry.user, :message => { :title => "Re: #{diary_entry.title}" }) %>
+ - <%= link_to t('.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %>
+ <% end %>
+
+ <% if current_user && current_user == diary_entry.user %>
+ - <%= link_to t('.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>
+ <% end %>
+
+ <% if current_user and diary_entry.user != current_user %>
+ -
+ <%= report_link(t(".report"), diary_entry) %>
+
+ <% end %>
+
+ <% if current_user && current_user.administrator? %>
+ -
+ <%= 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') } %>
+
+ <% end %>
+
+