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

[rails.git] / app / views / browse / _common_details.html.erb

diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 07b44a94a7d1515c537a7d2c1c2bc346115b199a..669e0fe6dee4358452740c2540c041080d4cb0c7 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,38 +1,31 @@
-<tr>
-  <% if common_details.visible? %>
-    <th><%= t 'browse.common_details.edited_at' %></th>
+<h4>
+  <% if common_details.changeset.tags['comment'].present? %>
+    <%= linkify(common_details.changeset.tags["comment"]) %>
   <% else %>
-    <th><%= t 'browse.common_details.deleted_at' %></th>
+    <%= t "browse.no_comment" %>
   <% end %>
-  <td><%= l common_details.timestamp %></td>
-</tr>
+</h4>
 
-<% if common_details.changeset.user.data_public? %>
-  <tr>
-    <% if common_details.visible? %>
-      <th><%= t 'browse.common_details.edited_by' %></th>
-    <% else %>
-      <th><%= t 'browse.common_details.deleted_by' %></th>
-    <% end %>
-    <td><%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %></td>
-  </tr>
-<% end %>
-
-<tr>
-  <th><%= t 'browse.common_details.version' %></th>
-  <td><%= h(common_details.version) %></td>
-</tr>
+<div class="details">
+  <%= t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
+        :time => time_ago_in_words(common_details.timestamp, :scope => :'datetime.distance_in_words_ago'),
+        :user => changeset_user_link(common_details.changeset),
+        :title => l(common_details.timestamp) %>
+</div>
 
-<tr>
-  <th><%= t 'browse.common_details.in_changeset' %></th>
-  <td><%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %></td>
-</tr>
+<div class="details">
+  <%= t "browse.version" %>
+  #<%= common_details.version %>
+  &middot;
+  <%= t "browse.in_changeset" %>
+  #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
+</div>
 
-<% if common_details.changeset.tags['comment'] %>
-  <tr>
-    <th><%= t 'browse.common_details.changeset_comment' %></th>
-    <td><%= linkify(h(common_details.changeset.tags['comment'])) %></td>
-  </tr>
+<% if @type == "node" and common_details.visible? %>
+<div class="details geo">
+  <%= t "browse.location" %>
+  <%= link_to(content_tag(:span, number_with_delimiter(common_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(common_details.lon), :class => "longitude"), :controller => "site", :action => "index", :anchor => "map=18/#{common_details.lat}/#{common_details.lon}") %>
+</div>
 <% end %>
 
-<%= render :partial => "tag_details", :object => common_details %>
+<%= render :partial => "tag_details", :object => common_details.tags %>