Simplified common details

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index cd6c7633cd4b74b868bd57174b95ce9564d8f358..66b9f3c4854eb28d6fc3f92cafcc8c14277a46c5 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1000,7 +1000,7 @@ a.donate {
       width: 50%;
       height: 30px;
       float: left;
-      padding: 9px 10px;
+      padding: 6px 10px;
     }
 
     .browse-tag-k {

diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index bea1fbbe0179409eda121e7c708060cb40ae98f9..954c687ea5745da3fcff466d9390c413edbe9e3c 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,39 +1,32 @@
 <div class='browse-section common'>
-  <div class='browse-field'>
+  <div>
     <% if common_details.visible? %>
-      <h4><%= t 'browse.common_details.edited_at' %></h4>
+      <%= t 'browse.common_details.edited' %> 
     <% else %>
-      <h4><%= t 'browse.common_details.deleted_at' %></h4>
+      <%= t 'browse.common_details.deleted' %> 
     <% end %>
-    <p><%= l common_details.timestamp %></p>
-  </div>
-
-  <% if common_details.changeset.user.data_public? %>
-    <div class='browse-field'>
-      <% if common_details.visible? %>
-        <h4><%= t 'browse.common_details.edited_by' %></h4>
-      <% else %>
-        <h4><%= t 'browse.common_details.deleted_by' %></h4>
-      <% end %>
-      <p><%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %></p>
-    </div>
-  <% end %>
+      <abbr><%= distance_of_time_in_words_to_now(common_details.timestamp) %> ago</abbr>
 
-  <div class='browse-field'>
-    <h4><%= t 'browse.common_details.version' %></h4>
-    <p><%= h(common_details.version) %></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 %>
   </div>
 
-  <div class='browse-field'>
-    <h4><%= t 'browse.common_details.in_changeset' %></h4>
-    <p><%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %></p>
+  <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>
 
   <% if common_details.changeset.tags['comment'].present? %>
-    <div class='browse-field'>
-      <h4><%= t 'browse.common_details.changeset_comment' %></h4>
-      <p><%= linkify(h(common_details.changeset.tags['comment'])) %></p>
+    <div>
+      <%= t 'browse.common_details.changeset_comment' %>:
+      <%= linkify(h(common_details.changeset.tags['comment'])) %>
     </div>
   <% end %>
 </div>
+
 <%= render :partial => "tag_details", :object => common_details %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 575db00f6e76724b273290fe577da5e13a3275c9..808234cead846fc6e40ad35b4c68cdd9defc8aff 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -134,10 +134,9 @@ en:
       has_ways: "Ways (%{count})"
       has_relations: "Relations (%{count})"
     common_details:
-      edited_at: "Edited At"
-      edited_by: "Edited By"
-      deleted_at: "Deleted At"
-      deleted_by: "Deleted By"
+      edited: "Edited"
+      deleted: "Deleted"
+      by: "by"
       version: "Version"
       in_changeset: "Changeset"
       changeset_comment: "Comment"