Use flex grid to position changeset discussion subscribe button

[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 0f731875b5148ba4d08476eed7de9c38cf3ad384..5505ee4a9f2db9ebc1cd84df054c8788c3bee44c 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,30 +1,34 @@
-<div class='browse-section common'>
-  <% if common_details.changeset.tags['comment'].present? %>
-    <%= linkify(h(common_details.changeset.tags['comment'])) %>
+<h4 class="details">
+  <%= t "browse.version" %>
+  #<%= common_details.version %>
+</h4>
+
+<p class="font-italic">
+  <% if common_details.changeset.tags["comment"].present? %>
+    <%= linkify(common_details.changeset.tags["comment"]) %>

   <% else %>
   <% else %>

-    (no comment)
+    <%= t "browse.no_comment" %>

   <% end %>
   <% end %>

-  <h4>
-    <% 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>
+</p>

 
 

-    <% 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 %>
-  </h4>
+<p 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) %>
+  &middot;
+  <%= t "browse.in_changeset" %>
+  #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
+</p>

 
 

-  <h4>
-    <%= 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 %>
-  </h4>
+<% if @type == "node" and common_details.visible? %>
+<div class="details geo">
+  <%= t "browse.location" %>
+  <%= link_to(t(".coordinates_html",
+                :latitude => tag.span(number_with_delimiter(common_details.lat), :class => "latitude"),
+                :longitude => tag.span(number_with_delimiter(common_details.lon), :class => "longitude")),
+              root_path(:anchor => "map=18/#{common_details.lat}/#{common_details.lon}")) %>

 </div>
 </div>

+<% end %>

 
 <%= render :partial => "tag_details", :object => common_details.tags %>
 
 <%= render :partial => "tag_details", :object => common_details.tags %>