X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/02ad2f5a5192404185d00ec1b53ae2982760c0ea..8bd001f1282b7a33a71c0565504e160dbe567d5d:/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 8991e1d54..37e70f06d 100644
--- a/app/views/diary_entry/_diary_entry.html.erb
+++ b/app/views/diary_entry/_diary_entry.html.erb
@@ -1,25 +1,38 @@
-<b><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></b><br />
-<div xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">
-<%= htmlize(diary_entry.body) %>
+<div class='diary_post'>
+  <div class='post_heading clearfix'>
+    <% if !@user %>
+      <%= 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>
+
+    <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 class="richtext" xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">
+    <%= diary_entry.body.to_html %>
+  </div>
+
+  <% if diary_entry.latitude and diary_entry.longitude %>
+    <%= render :partial => "location", :object => diary_entry %>
+  <% end %>
+
+  <ul class='secondary-actions clearfix'>
+    <% if params[:action] == 'list' %>
+      <li><%= link_to t('.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %></li>
+      <li><%= link_to t('.reply_link'), :controller => 'message', :action => 'new', :display_name => diary_entry.user.display_name, :message => { :title => "Re: #{diary_entry.title}" } %></li>
+      <li><%= 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' %></li>
+    <% end %>
+
+    <%= if_user(diary_entry.user, :li) do %>
+      <%= link_to t('.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>
+    <% end %>
+
+    <%= if_administrator(:li) do %>
+      <%= 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 %>
+  </ul>
 </div>
-<% if diary_entry.latitude and diary_entry.longitude %>
-<%= render :partial => "location", :object => diary_entry %>
-<br />
-<% end %>
-<%= 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' %>
-<br />
-<%= 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 %> 
-| <%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => @user.display_name, :id => diary_entry.id %>
-<% end %>
-<% if @user && @user.administrator? %> 
-| <%= link_to t('diary_entry.diary_entry.hide_link'), {:action => 'hide', :display_name => @user.display_name, :id => diary_entry.id}, {:confirm => t('diary_entry.diary_entry.confirm')} %>
-<% end %>
-<br />
-<hr />