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

[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 054ffbd792f49d99be526f37767a5b924ef281a6..1c8f1c5da4293105c06200e2b29647b8395a7d05 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,32 +1,30 @@
 <h4>
   <% if common_details.changeset.tags['comment'].present? %>
 <h4>
   <% if common_details.changeset.tags['comment'].present? %>

-    <%= linkify(h(common_details.changeset.tags['comment'])) %>
+    <%= linkify(h(common_details.changeset.tags["comment"])) %>

   <% else %>
   <% else %>

-    <%= t 'browse.no_comment' %>
+    <%= t "browse.no_comment" %>

   <% end %>
 </h4>
 
 <div class="details">
   <% end %>
 </h4>
 
 <div class="details">

-  <%=
-      t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
-        :time => distance_of_time_in_words_to_now(common_details.timestamp),
+  <%= 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),
         :user => changeset_user_link(common_details.changeset),

-        :title => l(common_details.timestamp)
-  %>
+        :title => l(common_details.timestamp) %>

 </div>
 
 <div class="details">
 </div>
 
 <div class="details">

-  <%= t 'browse.version' %>
+  <%= t "browse.version" %>

   #<%= h(common_details.version) %>
   &middot;
   #<%= h(common_details.version) %>
   &middot;

-  <%= t 'browse.in_changeset' %>
+  <%= t "browse.in_changeset" %>

   #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
 </div>
 
   #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
 </div>
 

-<% if @type == "node" %>
+<% if @type == "node" and common_details.visible? %>

 <div class="details geo">
 <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', :lat => h(common_details.lat), :lon => h(common_details.lon), :zoom => "18"}) %>
+  <%= 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 %>
 
 </div>
 <% end %>