Merge remote-tracking branch 'jfirebaugh/legacy-params'

[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 593215f2953ed7a653b60c2e35f7bd10eb0045e1..ede9e14c5b3b515d2c23acf532e779123b59a5f5 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -2,31 +2,32 @@
   <% if common_details.changeset.tags['comment'].present? %>
     <%= linkify(h(common_details.changeset.tags['comment'])) %>
   <% else %>
-    (no comment)
+    <%= t 'browse.no_comment' %>
   <% end %>
 </h4>
 
 <div class="details">
-  <% if common_details.visible? %>
-    <%= t 'browse.common_details.edited' %>
-  <% else %>
-    <%= t 'browse.common_details.deleted' %>
-  <% end %>
-
-  <abbr><%= distance_of_time_in_words_to_now(common_details.timestamp) %> ago</abbr>
-
-  <% if common_details.changeset.user.data_public? %>
-    <%= t 'browse.common_details.by' %>
-    <%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %>
-  <% end %>
+  <%=
+      t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
+        :time => distance_of_time_in_words_to_now(common_details.timestamp),
+        :user => changeset_user_link(common_details.changeset),
+        :title => l(common_details.timestamp)
+  %>
 </div>
 
 <div class="details">
-  <%= t 'browse.common_details.version' %>
+  <%= t 'browse.version' %>
   #<%= h(common_details.version) %>
   &middot;
-  <%= t 'browse.common_details.in_changeset' %>
+  <%= t 'browse.in_changeset' %>
   #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
 </div>
 
+<% if @type == "node" %>
+<div class="details geo">
+  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', :lat => h(common_details.lat), :lon => h(common_details.lon), :zoom => "18"}) %>
+</div>
+<% end %>
+
 <%= render :partial => "tag_details", :object => common_details.tags %>