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

[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 954c687ea5745da3fcff466d9390c413edbe9e3c..17a5f1f40708867479f07ceb172adbfb4c6ca43c 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,32 +1,33 @@
-<div class='browse-section common'>
-  <div>
-    <% 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>
+<h4>
+  <% if common_details.changeset.tags['comment'].present? %>
+    <%= linkify(h(common_details.changeset.tags['comment'])) %>
+  <% else %>
+    <%= t 'browse.no_comment' %>
+  <% end %>
+</h4>
 
-    <% 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 %>
-  </div>
+<div class="details">
+  <%=
+      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>
-    <%= t 'browse.common_details.version' %> 
-    #<%= h(common_details.version) %>
-    &middot;
-    <%= t 'browse.common_details.in_changeset' %> 
-    #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
-  </div>
+<div class="details">
+  <%= t 'browse.version' %>
+  #<%= h(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'].present? %>
-    <div>
-      <%= t 'browse.common_details.changeset_comment' %>:
-      <%= linkify(h(common_details.changeset.tags['comment'])) %>
-    </div>
-  <% end %>
+<% 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 %>